Merge pull request #281 from mindwm/chore/promtail-6.x

chore: bump promtail version to 1.17.0
closes mindwm/dependencies#55

Author: metacoma

config.k

@@ -2,13 +2,13 @@ mindwm_domain = "mindwm.local"
 
 
 sources = {
-  mindwm_ns = "org.mindwm" 
+  mindwm_ns = "org.mindwm"
   func_ns = "knfunc"
   knfunc_action = lambda user_name host_name {
     hostname = "%" if host_name == "" else host_name
     "${sources.mindwm_ns}.${sources.func_ns}.%.%.{{ user_name }}.{{ host_name }}.tmux.%.%.action"
-  } 
-} 
+  }
+}
 
 kafka = {
     cluster_name = "neo4j-cdc"
@@ -28,8 +28,8 @@ argocd = {
   virtual_service = "argocd-vs"
   destination = lambda {
     "${argocd.release_name}-server.${argocd.namespace}.svc.cluster.local"
-  } 
-} 
+  }
+}
 
 knativeBroker = {
     deadLetterImage = "gcr.io/knative-releases/knative.dev/eventing/cmd/event_display"
@@ -104,7 +104,7 @@ Mindwm = {
     context = {
         istio_gateway = lambda context_name : str - >str {
           "context-${context_name}-gateway"
-        } 
+        }
         neo4j_vs_name = lambda context_name : str -> str {
           "${context_name}-neo4j-ui"
         }
@@ -146,7 +146,7 @@ knative = {
 
 node_red = {
   helm_chart_version = "0.34.0"
-} 
+}
 
 cert_manager = {
   helm_chart_version = "1.17.2"
@@ -202,7 +202,7 @@ monitoring = {
     destination = lambda {
       "${monitoring.victoria_metrics.release_name}-grafana"
     }
-  } 
+  }
   victoria_metrics = {
     release_name = "vm-aio"
     url = "vm.${mindwm_domain}"
@@ -214,6 +214,7 @@ monitoring = {
   }
   promtail = {
     release_name = "promtail"
+    chart_version = "6.17.0"
   }
   zipkin_endpoint = lambda tempo_release_name : str, monitoring_ns : str {
     "http://${tempo_release_name}.${monitoring_ns}:9411/api/v2/spans"

main.k

@@ -211,15 +211,15 @@ mindwm_app = ArgoCdOrder.make({
                 namespace = config.monitoring.namespace
                 name = config.monitoring.promtail.release_name
                 chart = charts.promtail
-                version = "6.16.6"
+                version = config.monitoring.promtail.chart_version
                 values = {
                   config.clients = [{
                     url = "http://${config.monitoring.loki.release_name}.${config.monitoring.namespace}:3100/loki/api/v1/push"
                     tenant_id = 1
                   }]
                 }
             })
-            
+
 
 
             argocdSchema.argoHelmRelease({
@@ -478,8 +478,8 @@ mindwm_app = ArgoCdOrder.make({
                   ]
                 }]
               }
-            } 
-            istio_virtual_service.VirtualService {            
+            }
+            istio_virtual_service.VirtualService {
               metadata.name = config.monitoring.grafana.virtual_service
               metadata.namespace = config.monitoring.namespace
               metadata.annotations = {
@@ -490,7 +490,7 @@ mindwm_app = ArgoCdOrder.make({
                 gateways = [ config.monitoring.gateway_name ]
                 http = [{
                   match = [{ uri.prefix = "/", port = 80}]
-                  route = [{ 
+                  route = [{
                     destination.host = config.monitoring.grafana.destination()
                     destination.port.number = 80 # TODO(@metacoma) hardcode
                   }]
@@ -500,7 +500,7 @@ mindwm_app = ArgoCdOrder.make({
             }
 
 
-            istio_virtual_service.VirtualService {            
+            istio_virtual_service.VirtualService {
               metadata.name = config.monitoring.loki.virtual_service
               metadata.namespace = config.monitoring.namespace
               metadata.annotations = {
@@ -511,7 +511,7 @@ mindwm_app = ArgoCdOrder.make({
                 gateways = [ config.monitoring.gateway_name ]
                 http = [{
                   match = [{ uri.prefix = "/", port = 80}]
-                  route = [{ 
+                  route = [{
                     destination.host = config.monitoring.loki.destination()
                     destination.port.number = 80 # TODO(@metacoma) hardcode
                   }]
@@ -551,7 +551,7 @@ mindwm_app = ArgoCdOrder.make({
                 gateways = [ config.monitoring.gateway_name ]
                 http = [{
                   match = [{ uri.prefix = "/", port = 80}]
-                  route = [{ 
+                  route = [{
                     destination.host = config.monitoring.victoria_metrics.destination()
                     destination.port.number = 8429 # TODO(@metacoma) hardcode
                   }]
@@ -580,7 +580,7 @@ mindwm_app = ArgoCdOrder.make({
                   ]
                 }]
               }
-            } 
+            }
 
             istio_virtual_service.VirtualService {
               metadata.name = config.argocd.virtual_service
@@ -593,7 +593,7 @@ mindwm_app = ArgoCdOrder.make({
                 gateways = [ config.argocd.gateway_name ]
                 http = [{
                   match = [{ uri.prefix = "/", port = 80}]
-                  route = [{ 
+                  route = [{
                     destination.host = config.argocd.destination()
                     destination.port.number = 38080 # TODO(@metacoma) hardcode
                   }]
@@ -608,5 +608,3 @@ mindwm_app = ArgoCdOrder.make({
 manifests.yaml_stream([
     mindwm_app
 ])
-
-