Merge branch 'main' into SRE-3078-memcached-readiness-probes

charts/grafana/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 8.8.3
+version: 8.8.5
 appVersion: 11.4.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

charts/grafana/README.md

@@ -255,7 +255,7 @@ need to instead set `global.imageRegistry`.
 | `downloadDashboards.resources`            | Resources of `download-dashboards` container  | `{}`                                                    |
 | `downloadDashboardsImage.registry`        | Curl docker image registry                    | `docker.io`                                       |
 | `downloadDashboardsImage.repository`      | Curl docker image repository                  | `curlimages/curl`                                       |
-| `downloadDashboardsImage.tag`             | Curl docker image tag                         | `7.73.0`                                                |
+| `downloadDashboardsImage.tag`             | Curl docker image tag                         | `8.9.1`                                                 |
 | `downloadDashboardsImage.sha`             | Curl docker image sha (optional)              | `""`                                                    |
 | `downloadDashboardsImage.pullPolicy`      | Curl docker image pull policy                 | `IfNotPresent`                                          |
 | `namespaceOverride`                       | Override the deployment namespace             | `""` (`Release.Namespace`)                              |

charts/grafana/templates/service.yaml

@@ -48,7 +48,7 @@ spec:
   {{- with .Values.service.externalTrafficPolicy }}
   externalTrafficPolicy: {{ . }}
   {{- end }}
-  {{- with .Values.service.seessionAffinity }}
+  {{- with .Values.service.sessionAffinity }}
   sessionAffinity: {{ . }}
   {{- end }}
   ports:

charts/grafana/values.yaml

@@ -186,7 +186,7 @@ downloadDashboardsImage:
   # -- The Docker registry
   registry: docker.io
   repository: curlimages/curl
-  tag: 7.85.0
+  tag: 8.9.1
   sha: ""
   pullPolicy: IfNotPresent
 

charts/tempo/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo
 description: Grafana Tempo Single Binary Mode
 type: application
-version: 1.18.0
+version: 1.18.1
 appVersion: 2.7.0
 engine: gotpl
 home: https://grafana.net

charts/tempo/README.md

@@ -1,6 +1,6 @@
 # tempo
 
-![Version: 1.18.0](https://img.shields.io/badge/Version-1.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square)
+![Version: 1.18.1](https://img.shields.io/badge/Version-1.18.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square)
 
 Grafana Tempo Single Binary Mode
 
@@ -62,7 +62,7 @@ Grafana Tempo Single Binary Mode
 | tempo.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the ingester pods |
 | tempo.extraVolumeMounts | list | `[]` | Volume mounts to add |
 | tempo.global_overrides.per_tenant_override_config | string | `"/conf/overrides.yaml"` |  |
-| tempo.ingester | object | `{}` | Configuration options for the ingester |
+| tempo.ingester | object | `{}` | Configuration options for the ingester. Refers to: https://grafana.com/docs/tempo/latest/configuration/#ingester |
 | tempo.livenessProbe.failureThreshold | int | `3` |  |
 | tempo.livenessProbe.httpGet.path | string | `"/ready"` |  |
 | tempo.livenessProbe.httpGet.port | int | `3100` |  |
@@ -76,8 +76,8 @@ Grafana Tempo Single Binary Mode
 | tempo.multitenancyEnabled | bool | `false` |  |
 | tempo.overrides | object | `{}` |  |
 | tempo.pullPolicy | string | `"IfNotPresent"` |  |
-| tempo.querier | object | `{}` | Configuration options for the querier |
-| tempo.queryFrontend | object | `{}` | Configuration options for the query-fronted |
+| tempo.querier | object | `{}` | Configuration options for the querier. Refers to: https://grafana.com/docs/tempo/latest/configuration/#querier |
+| tempo.queryFrontend | object | `{}` | Configuration options for the query-fronted. Refers to: https://grafana.com/docs/tempo/latest/configuration/#query-frontend |
 | tempo.readinessProbe.failureThreshold | int | `3` |  |
 | tempo.readinessProbe.httpGet.path | string | `"/ready"` |  |
 | tempo.readinessProbe.httpGet.port | int | `3100` |  |

charts/tempo/templates/service.yaml

@@ -1,4 +1,3 @@
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -47,6 +46,3 @@ spec:
   {{- end }}
   selector:
     {{- include "tempo.selectorLabels" . | nindent 4 }}
-
-
-

charts/tempo/templates/servicemonitor.yaml

@@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "tempo.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "tempo.name" . }}
     chart: {{ template "tempo.chart" . }}

charts/tempo/values.yaml

@@ -48,20 +48,30 @@ tempo:
     # -- If true, enables Tempo's metrics generator (https://grafana.com/docs/tempo/next/metrics-generator/)
     enabled: false
     remoteWriteUrl: "http://prometheus.monitoring:9090/api/v1/write"
-  # -- Configuration options for the ingester
+  # -- Configuration options for the ingester.
+  # Refers to: https://grafana.com/docs/tempo/latest/configuration/#ingester
   ingester: {}
-  # -- Configuration options for the querier
+  #  flush_check_period: 10s
+  #  trace_idle_period: 10s
+  #  max_block_duration: 30m
+  #  complete_block_timeout: 1h
+  # -- Configuration options for the querier.
+  # Refers to: https://grafana.com/docs/tempo/latest/configuration/#querier
   querier: {}
-  # -- Configuration options for the query-fronted
+  #  max_concurrent_queries: 20
+  # -- Configuration options for the query-fronted.
+  # Refers to: https://grafana.com/docs/tempo/latest/configuration/#query-frontend
   queryFrontend: {}
+  #  search:
+  #    concurrent_jobs: 2000
   retention: 24h
   # Global overrides
   global_overrides:
     per_tenant_override_config: /conf/overrides.yaml
   overrides: {}
 
-  # Tempo server configuration
-  # Refers to https://grafana.com/docs/tempo/latest/configuration/#server
+  # Tempo server configuration.
+  # Refers to: https://grafana.com/docs/tempo/latest/configuration/#server
   server:
     # -- HTTP server listen port
     http_listen_port: 3100
@@ -86,8 +96,8 @@ tempo:
     successThreshold: 1
   storage:
     trace:
-      # tempo storage backend
-      # refer https://grafana.com/docs/tempo/latest/configuration/
+      # tempo storage backend.
+      # Refers to: https://grafana.com/docs/tempo/latest/configuration/#storage
       ## Use s3 for example
       # backend: s3
       # store traces in s3
@@ -185,7 +195,7 @@ tempoQuery:
   pullPolicy: IfNotPresent
   ## Optionally specify an array of imagePullSecrets.
   ## Secrets must be manually created in the namespace.
-  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  ## Refers to: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
   ##
   # pullSecrets:
   #   - myRegistryKeySecretName