chore: upgrade setup image to v3.4.0

SumoLogic · Aug 22, 2022 · de514db · de514db
1 parent e4ce5ce
commit de514db
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -95,7 +95,7 @@ sumologic:
     job:
       image:
         repository: public.ecr.aws/sumologic/kubernetes-setup
-        tag: 3.3.0
+        tag: 3.4.0
         pullPolicy: IfNotPresent
       ## Optionally specify an array of pullSecrets.
       ## They will be added to serviceaccount that is used for Sumo Logic's
@@ -1928,6 +1928,19 @@ kube-prometheus-stack:
               action: replace
 
       remoteWrite:
+        ## service metrics from kube-state-metrics
+        ## kube_service_info
+        ## kube_service_spec_external_ip
+        ## kube_service_spec_type
+        ## kube_service_status_load_balancer_ingress
+        - url: http://$(FLUENTD_METRICS_SVC).$(NAMESPACE).svc.cluster.local:9888/prometheus.metrics.state
+          remoteTimeout: 5s
+          writeRelabelConfigs:
+            - action: keep
+              regex: kube-state-metrics;(?:kube_service_info|kube_service_spec_external_ip|kube_service_spec_type|kube_service_status_load_balancer_ingress)
+              sourceLabels: [job, __name__]
+            - action: labeldrop
+              regex: (container|pod)
         ## kube non pod state metrics
         ## kube_daemonset_status_current_number_scheduled
         ## kube_daemonset_status_desired_number_scheduled
@@ -1949,15 +1962,11 @@ kube-prometheus-stack:
         ## kube_hpa_status_condition
         ## kube_hpa_status_current_replicas
         ## kube_hpa_status_desired_replicas
-        ## kube_service_info
-        ## kube_service_spec_external_ip
-        ## kube_service_spec_type
-        ## kube_service_status_load_balancer_ingress
         - url: http://$(FLUENTD_METRICS_SVC).$(NAMESPACE).svc.cluster.local:9888/prometheus.metrics.state
           remoteTimeout: 5s
           writeRelabelConfigs:
             - action: keep
-              regex: kube-state-metrics;(?:kube_statefulset_status_observed_generation|kube_statefulset_status_replicas|kube_statefulset_replicas|kube_statefulset_metadata_generation|kube_daemonset_status_current_number_scheduled|kube_daemonset_status_desired_number_scheduled|kube_daemonset_status_number_misscheduled|kube_daemonset_status_number_unavailable|kube_deployment_spec_replicas|kube_deployment_status_replicas_available|kube_deployment_status_replicas_unavailable|kube_node_info|kube_node_status_allocatable|kube_node_status_capacity|kube_node_status_condition|kube_hpa_spec_max_replicas|kube_hpa_spec_min_replicas|kube_hpa_status_(condition|(current|desired)_replicas)|kube_service_info|kube_service_spec_external_ip|kube_service_spec_type|kube_service_status_load_balancer_ingress)
+              regex: kube-state-metrics;(?:kube_statefulset_status_observed_generation|kube_statefulset_status_replicas|kube_statefulset_replicas|kube_statefulset_metadata_generation|kube_daemonset_status_current_number_scheduled|kube_daemonset_status_desired_number_scheduled|kube_daemonset_status_number_misscheduled|kube_daemonset_status_number_unavailable|kube_deployment_spec_replicas|kube_deployment_status_replicas_available|kube_deployment_status_replicas_unavailable|kube_node_info|kube_node_status_allocatable|kube_node_status_capacity|kube_node_status_condition|kube_hpa_spec_max_replicas|kube_hpa_spec_min_replicas|kube_hpa_status_(condition|(current|desired)_replicas))
               sourceLabels: [job, __name__]
             - action: labelmap
               regex: (pod|service)