From bc50792ae30303373ed2a7c457314f749c1170c4 Mon Sep 17 00:00:00 2001
From: drfaust92 <ilia.lazebnik@gmail.com>
Date: Sun, 10 Sep 2023 17:57:22 +0300
Subject: [PATCH] bump to 0.68.0

Signed-off-by: drfaust92 <ilia.lazebnik@gmail.com>
---
 charts/kube-prometheus-stack/values.yaml | 359 +++++++++++------------
 1 file changed, 174 insertions(+), 185 deletions(-)

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
index 1f0c9504203b..99cc16186356 100644
--- a/charts/kube-prometheus-stack/values.yaml
+++ b/charts/kube-prometheus-stack/values.yaml
@@ -178,8 +178,7 @@ global:
     ## Ref: https://kubernetes.io/docs/reference/access-authn-authz/rbac/#aggregated-clusterroles
     createAggregateClusterRoles: false
     pspEnabled: false
-    pspAnnotations:
-      {}
+    pspAnnotations: {}
       ## Specify pod annotations
       ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#apparmor
       ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#seccomp
@@ -211,6 +210,7 @@ windowsMonitoring:
 ## ref: https://prometheus.io/docs/alerting/alertmanager/
 ##
 alertmanager:
+
   ## Deploy alertmanager
   ##
   enabled: true
@@ -251,39 +251,39 @@ alertmanager:
       resolve_timeout: 5m
     inhibit_rules:
       - source_matchers:
-          - "severity = critical"
+          - 'severity = critical'
         target_matchers:
-          - "severity =~ warning|info"
+          - 'severity =~ warning|info'
         equal:
-          - "namespace"
-          - "alertname"
+          - 'namespace'
+          - 'alertname'
       - source_matchers:
-          - "severity = warning"
+          - 'severity = warning'
         target_matchers:
-          - "severity = info"
+          - 'severity = info'
         equal:
-          - "namespace"
-          - "alertname"
+          - 'namespace'
+          - 'alertname'
       - source_matchers:
-          - "alertname = InfoInhibitor"
+          - 'alertname = InfoInhibitor'
         target_matchers:
-          - "severity = info"
+          - 'severity = info'
         equal:
-          - "namespace"
+          - 'namespace'
     route:
-      group_by: ["namespace"]
+      group_by: ['namespace']
       group_wait: 30s
       group_interval: 5m
       repeat_interval: 12h
-      receiver: "null"
+      receiver: 'null'
       routes:
-        - receiver: "null"
-          matchers:
-            - alertname =~ "InfoInhibitor|Watchdog"
+      - receiver: 'null'
+        matchers:
+          - alertname =~ "InfoInhibitor|Watchdog"
     receivers:
-      - name: "null"
+    - name: 'null'
     templates:
-      - "/etc/alertmanager/config/*.tmpl"
+    - '/etc/alertmanager/config/*.tmpl'
 
   ## Alertmanager configuration directives (as string type, preferred over the config hash map)
   ## stringConfig will be used only, if tplConfig is true
@@ -349,8 +349,7 @@ alertmanager:
 
     ## Hosts must be provided if Ingress is enabled.
     ##
-    hosts:
-      []
+    hosts: []
       # - alertmanager.domain.com
 
     ## Paths to use for ingress rules - one path should match the alertmanagerSpec.routePrefix
@@ -683,6 +682,7 @@ alertmanager:
     #         storage: 50Gi
     #     selector: {}
 
+
     ## The external URL the Alertmanager instances will be available under. This is necessary to generate correct URLs. This is necessary if Alertmanager is not served from root of a DNS name. string  false
     ##
     externalUrl:
@@ -893,8 +893,7 @@ grafana:
 
     ## Annotations for Grafana Ingress
     ##
-    annotations:
-      {}
+    annotations: {}
       # kubernetes.io/ingress.class: nginx
       # kubernetes.io/tls-acme: "true"
 
@@ -972,8 +971,7 @@ grafana:
 
       ## Field with internal link pointing to existing data source in Grafana.
       ## Can be provisioned via additionalDataSources
-      exemplarTraceIdDestinations:
-        {}
+      exemplarTraceIdDestinations: {}
         # datasourceUid: Jaeger
         # traceIdLabelName: trace_id
       alertmanager:
@@ -1187,27 +1185,27 @@ kubelet:
       # Drop less useful container CPU metrics.
       - sourceLabels: [__name__]
         action: drop
-        regex: "container_cpu_(cfs_throttled_seconds_total|load_average_10s|system_seconds_total|user_seconds_total)"
+        regex: 'container_cpu_(cfs_throttled_seconds_total|load_average_10s|system_seconds_total|user_seconds_total)'
       # Drop less useful container / always zero filesystem metrics.
       - sourceLabels: [__name__]
         action: drop
-        regex: "container_fs_(io_current|io_time_seconds_total|io_time_weighted_seconds_total|reads_merged_total|sector_reads_total|sector_writes_total|writes_merged_total)"
+        regex: 'container_fs_(io_current|io_time_seconds_total|io_time_weighted_seconds_total|reads_merged_total|sector_reads_total|sector_writes_total|writes_merged_total)'
       # Drop less useful / always zero container memory metrics.
       - sourceLabels: [__name__]
         action: drop
-        regex: "container_memory_(mapped_file|swap)"
+        regex: 'container_memory_(mapped_file|swap)'
       # Drop less useful container process metrics.
       - sourceLabels: [__name__]
         action: drop
-        regex: "container_(file_descriptors|tasks_state|threads_max)"
+        regex: 'container_(file_descriptors|tasks_state|threads_max)'
       # Drop container spec metrics that overlap with kube-state-metrics.
       - sourceLabels: [__name__]
         action: drop
-        regex: "container_spec.*"
+        regex: 'container_spec.*'
       # Drop cgroup metrics with no pod.
       - sourceLabels: [id, pod]
         action: drop
-        regex: ".+;"
+        regex: '.+;'
     # - sourceLabels: [__name__, image]
     #   separator: ;
     #   regex: container_([a-z_]+);
@@ -2036,7 +2034,7 @@ prometheusOperator:
         readOnlyRootFilesystem: true
         capabilities:
           drop:
-            - ALL
+          - ALL
 
       # Security context for patch job container
     patchWebhookJob:
@@ -2045,16 +2043,16 @@ prometheusOperator:
         readOnlyRootFilesystem: true
         capabilities:
           drop:
-            - ALL
+          - ALL
 
     # Use certmanager to generate webhook certs
     certManager:
       enabled: false
       # self-signed root certificate
       rootCert:
-        duration: "" # default to be 5y
+        duration: ""  # default to be 5y
       admissionCert:
-        duration: "" # default to be 1y
+        duration: ""  # default to be 1y
       # issuerRef:
       #   name: "issuer"
       #   kind: "ClusterIssuer"
@@ -2062,8 +2060,7 @@ prometheusOperator:
   ## Namespaces to scope the interaction of the Prometheus Operator and the apiserver (allow list).
   ## This is mutually exclusive with denyNamespaces. Setting this to an empty object will disable the configuration
   ##
-  namespaces:
-    {}
+  namespaces: {}
     # releaseNamespace: true
     # additional:
     # - kube-system
@@ -2116,21 +2113,21 @@ prometheusOperator:
     labels: {}
     clusterIP: ""
 
-    ## Port to expose on each node
-    ## Only used if service.type is 'NodePort'
-    ##
+  ## Port to expose on each node
+  ## Only used if service.type is 'NodePort'
+  ##
     nodePort: 30080
 
     nodePortTls: 30443
 
-    ## Additional ports to open for Prometheus service
-    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#multi-port-services
-    ##
+  ## Additional ports to open for Prometheus service
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#multi-port-services
+  ##
     additionalPorts: []
 
-    ## Loadbalancer IP
-    ## Only use if service.type is "LoadBalancer"
-    ##
+  ## Loadbalancer IP
+  ## Only use if service.type is "LoadBalancer"
+  ##
     loadBalancerIP: ""
     loadBalancerSourceRanges: []
 
@@ -2138,9 +2135,9 @@ prometheusOperator:
     ##
     externalTrafficPolicy: Cluster
 
-    ## Service type
-    ## NodePort, ClusterIP, LoadBalancer
-    ##
+  ## Service type
+  ## NodePort, ClusterIP, LoadBalancer
+  ##
     type: ClusterIP
 
     ## List of IP addresses at which the Prometheus server service is available
@@ -2266,8 +2263,7 @@ prometheusOperator:
   ## Assign custom affinity rules to the prometheus operator
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
   ##
-  affinity:
-    {}
+  affinity: {}
     # nodeAffinity:
     #   requiredDuringSchedulingIgnoredDuringExecution:
     #     nodeSelectorTerms:
@@ -2277,8 +2273,7 @@ prometheusOperator:
     #         values:
     #         - e2e-az1
     #         - e2e-az2
-  dnsConfig:
-    {}
+  dnsConfig: {}
     # nameservers:
     #   - 1.2.3.4
     # searches:
@@ -2304,7 +2299,7 @@ prometheusOperator:
     readOnlyRootFilesystem: true
     capabilities:
       drop:
-        - ALL
+      - ALL
 
   # Enable vertical pod autoscaler support for prometheus-operator
   verticalPodAutoscaler:
@@ -2657,8 +2652,7 @@ prometheus:
 
     ## Hosts must be provided if Ingress is enabled.
     ##
-    hosts:
-      []
+    hosts: []
       # - thanos-gateway.domain.com
 
     ## Paths to use for ingress rules
@@ -2722,8 +2716,7 @@ prometheus:
     ## TLS configuration for Prometheus Ingress
     ## Secret must be manually created in the namespace
     ##
-    tls:
-      []
+    tls: []
       # - secretName: prometheus-general-tls
       #   hosts:
       #     - prometheus.example.com
@@ -2885,8 +2878,7 @@ prometheus:
 
     ## Exemplars related settings that are runtime reloadable.
     ## It requires to enable the exemplar storage feature to be effective.
-    exemplars:
-      ""
+    exemplars: ""
       ## Maximum number of exemplars stored in memory for all series.
       ## If not set, Prometheus uses its default value.
       ## A value of zero or less than zero disables the storage.
@@ -3295,11 +3287,11 @@ prometheus:
     #    relabel_configs:
     #    ...
 
+
     ## If additional scrape configurations are already deployed in a single secret file you can use this section.
     ## Expected values are the secret name and key
     ## Cannot be used with additionalScrapeConfigs
-    additionalScrapeConfigsSecret:
-      {}
+    additionalScrapeConfigsSecret: {}
       # enabled: false
       # name:
       # key:
@@ -3328,8 +3320,7 @@ prometheus:
     ## them separately from the helm deployment, you can use this section.
     ## Expected values are the secret name and key
     ## Cannot be used with additionalAlertManagerConfigs
-    additionalAlertManagerConfigsSecret:
-      {}
+    additionalAlertManagerConfigsSecret: {}
       # name:
       # key:
       # optional: false
@@ -3351,8 +3342,7 @@ prometheus:
     ## them separately from the helm deployment, you can use this section.
     ## Expected values are the secret name and key
     ## Cannot be used with additionalAlertRelabelConfigs
-    additionalAlertRelabelConfigsSecret:
-      {}
+    additionalAlertRelabelConfigsSecret: {}
       # name:
       # key:
 
@@ -3377,8 +3367,7 @@ prometheus:
     ## This is experimental and may change significantly without backward compatibility in any release.
     ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#thanosspec
     ##
-    thanos:
-      {}
+    thanos: {}
       # secretProviderClass:
       #   provider: gcp
       #   parameters:
@@ -3459,6 +3448,7 @@ prometheus:
     ## if either value is zero, in which case the non-zero value will be used. If both values are zero, no limit is enforced.
     enforcedTargetLimit: false
 
+
     ## Per-scrape limit on number of labels that will be accepted for a sample. If more than this number of labels are present
     ## post metric-relabeling, the entire scrape will be treated as failed. 0 means no limit. Only valid in Prometheus versions
     ## 2.27.0 and newer.
@@ -3511,156 +3501,157 @@ prometheus:
   ##
   # - name: ""
 
-  ## Additional labels to set used for the ServiceMonitorSelector. Together with standard labels from
-  ## the chart
-  ##
-  # additionalLabels: {}
+    ## Additional labels to set used for the ServiceMonitorSelector. Together with standard labels from
+    ## the chart
+    ##
+    # additionalLabels: {}
 
-  ## Service label for use in assembling a job name of the form <label value>-<port>
-  ## If no label is specified, the service name is used.
-  ##
-  # jobLabel: ""
+    ## Service label for use in assembling a job name of the form <label value>-<port>
+    ## If no label is specified, the service name is used.
+    ##
+    # jobLabel: ""
 
-  ## labels to transfer from the kubernetes service to the target
-  ##
-  # targetLabels: []
+    ## labels to transfer from the kubernetes service to the target
+    ##
+    # targetLabels: []
 
-  ## labels to transfer from the kubernetes pods to the target
-  ##
-  # podTargetLabels: []
+    ## labels to transfer from the kubernetes pods to the target
+    ##
+    # podTargetLabels: []
 
-  ## Label selector for services to which this ServiceMonitor applies
-  ##
-  # selector: {}
+    ## Label selector for services to which this ServiceMonitor applies
+    ##
+    # selector: {}
 
-  ## Namespaces from which services are selected
-  ##
-  # namespaceSelector:
-  ## Match any namespace
-  ##
-  # any: false
+    ## Namespaces from which services are selected
+    ##
+    # namespaceSelector:
+      ## Match any namespace
+      ##
+      # any: false
 
-  ## Explicit list of namespace names to select
-  ##
-  # matchNames: []
+      ## Explicit list of namespace names to select
+      ##
+      # matchNames: []
 
-  ## Endpoints of the selected service to be monitored
-  ##
-  # endpoints: []
-  ## Name of the endpoint's service port
-  ## Mutually exclusive with targetPort
-  # - port: ""
+    ## Endpoints of the selected service to be monitored
+    ##
+    # endpoints: []
+      ## Name of the endpoint's service port
+      ## Mutually exclusive with targetPort
+      # - port: ""
 
-  ## Name or number of the endpoint's target port
-  ## Mutually exclusive with port
-  # - targetPort: ""
+      ## Name or number of the endpoint's target port
+      ## Mutually exclusive with port
+      # - targetPort: ""
 
-  ## File containing bearer token to be used when scraping targets
-  ##
-  #   bearerTokenFile: ""
+      ## File containing bearer token to be used when scraping targets
+      ##
+      #   bearerTokenFile: ""
 
-  ## Interval at which metrics should be scraped
-  ##
-  #   interval: 30s
+      ## Interval at which metrics should be scraped
+      ##
+      #   interval: 30s
 
-  ## HTTP path to scrape for metrics
-  ##
-  #   path: /metrics
+      ## HTTP path to scrape for metrics
+      ##
+      #   path: /metrics
 
-  ## HTTP scheme to use for scraping
-  ##
-  #   scheme: http
+      ## HTTP scheme to use for scraping
+      ##
+      #   scheme: http
 
-  ## TLS configuration to use when scraping the endpoint
-  ##
-  #   tlsConfig:
+      ## TLS configuration to use when scraping the endpoint
+      ##
+      #   tlsConfig:
 
-  ## Path to the CA file
-  ##
-  # caFile: ""
+          ## Path to the CA file
+          ##
+          # caFile: ""
 
-  ## Path to client certificate file
-  ##
-  # certFile: ""
+          ## Path to client certificate file
+          ##
+          # certFile: ""
 
-  ## Skip certificate verification
-  ##
-  # insecureSkipVerify: false
+          ## Skip certificate verification
+          ##
+          # insecureSkipVerify: false
 
-  ## Path to client key file
-  ##
-  # keyFile: ""
+          ## Path to client key file
+          ##
+          # keyFile: ""
 
-  ## Server name used to verify host name
-  ##
-  # serverName: ""
+          ## Server name used to verify host name
+          ##
+          # serverName: ""
 
-  ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
-  ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#relabelconfig
-  ##
-  # metricRelabelings: []
-  # - action: keep
-  #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
-  #   sourceLabels: [__name__]
+    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
+    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#relabelconfig
+    ##
+    # metricRelabelings: []
+    # - action: keep
+    #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+    #   sourceLabels: [__name__]
 
-  ## RelabelConfigs to apply to samples before scraping
-  ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#relabelconfig
-  ##
-  # relabelings: []
-  # - sourceLabels: [__meta_kubernetes_pod_node_name]
-  #   separator: ;
-  #   regex: ^(.*)$
-  #   targetLabel: nodename
-  #   replacement: $1
-  #   action: replace
+    ## RelabelConfigs to apply to samples before scraping
+    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#relabelconfig
+    ##
+    # relabelings: []
+    # - sourceLabels: [__meta_kubernetes_pod_node_name]
+    #   separator: ;
+    #   regex: ^(.*)$
+    #   targetLabel: nodename
+    #   replacement: $1
+    #   action: replace
 
   additionalPodMonitors: []
   ## Name of the PodMonitor to create
   ##
   # - name: ""
 
-  ## Additional labels to set used for the PodMonitorSelector. Together with standard labels from
-  ## the chart
-  ##
-  # additionalLabels: {}
+    ## Additional labels to set used for the PodMonitorSelector. Together with standard labels from
+    ## the chart
+    ##
+    # additionalLabels: {}
 
-  ## Pod label for use in assembling a job name of the form <label value>-<port>
-  ## If no label is specified, the pod endpoint name is used.
-  ##
-  # jobLabel: ""
+    ## Pod label for use in assembling a job name of the form <label value>-<port>
+    ## If no label is specified, the pod endpoint name is used.
+    ##
+    # jobLabel: ""
 
-  ## Label selector for pods to which this PodMonitor applies
-  ##
-  # selector: {}
+    ## Label selector for pods to which this PodMonitor applies
+    ##
+    # selector: {}
 
-  ## PodTargetLabels transfers labels on the Kubernetes Pod onto the target.
-  ##
-  # podTargetLabels: {}
+    ## PodTargetLabels transfers labels on the Kubernetes Pod onto the target.
+    ##
+    # podTargetLabels: {}
 
-  ## SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
-  ##
-  # sampleLimit: 0
+    ## SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
+    ##
+    # sampleLimit: 0
 
-  ## Namespaces from which pods are selected
-  ##
-  # namespaceSelector:
-  ## Match any namespace
-  ##
-  # any: false
+    ## Namespaces from which pods are selected
+    ##
+    # namespaceSelector:
+      ## Match any namespace
+      ##
+      # any: false
 
-  ## Explicit list of namespace names to select
-  ##
-  # matchNames: []
+      ## Explicit list of namespace names to select
+      ##
+      # matchNames: []
 
-  ## Endpoints of the selected pods to be monitored
-  ## https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#podmetricsendpoint
-  ##
-  # podMetricsEndpoints: []
+    ## Endpoints of the selected pods to be monitored
+    ## https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#podmetricsendpoint
+    ##
+    # podMetricsEndpoints: []
 
 ## Configuration for thanosRuler
 ## ref: https://thanos.io/tip/components/rule.md/
 ##
 thanosRuler:
+
   ## Deploy thanosRuler
   ##
   enabled: false
@@ -3700,8 +3691,7 @@ thanosRuler:
 
     ## Hosts must be provided if Ingress is enabled.
     ##
-    hosts:
-      []
+    hosts: []
       # - thanosruler.domain.com
 
     ## Paths to use for ingress rules - one path should match the thanosruler.routePrefix
@@ -4067,8 +4057,7 @@ thanosRuler:
 cleanPrometheusOperatorObjectNames: false
 
 ## Extra manifests to deploy as an array
-extraManifests:
-  []
+extraManifests: []
   # - apiVersion: v1
   #   kind: ConfigMap
   #   metadata: