diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38a21642cdad651c263bd5e4b1fdcedf848aa23c..38970cc3c98096c1263e4fb0a8289f879f25b001 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
---
+## [1.18.1-bb.0] - 2025-01-15
+
+### Updated
+
+- Updated tempo: `2.6.1` -> `2.7.0`
+- Updated tempo-query `2.6.1` -> `2.7.0`
+
## [1.16.0-bb.1] - 2025-01-15
### Removed
diff --git a/README.md b/README.md
index 5e55a241f7cc9e1cf9152ad679cc5940b5dfd6e6..86bda9280e58c45b41107e5d84d4fda05d470e0d 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
<!-- Warning: Do not manually edit this file. See notes on gluon + helm-docs at the end of this file for more information. -->
# tempo
-   
+   
Grafana Tempo Single Binary Mode
## Upstream References
-- <https://grafana.net>
+- <https://grafana.net>
- <https://github.com/grafana/tempo>
## Upstream Release Notes
@@ -50,7 +50,7 @@ helm install tempo chart/
| labels | object | `{}` | labels for tempo |
| annotations | object | `{}` | Annotations for the StatefulSet |
| tempo.repository | string | `"registry1.dso.mil/ironbank/opensource/grafana/tempo"` | Docker image repository |
-| tempo.tag | string | `"2.6.1"` | Docker image tag |
+| tempo.tag | string | `"2.7.0"` | Docker image tag |
| tempo.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
| tempo.updateStrategy | string | `"RollingUpdate"` | |
| tempo.resources.limits.cpu | string | `"500m"` | |
@@ -64,7 +64,7 @@ helm install tempo chart/
| tempo.metricsGenerator.remoteWriteUrl | string | `"http://prometheus.monitoring:9090/api/v1/write"` | |
| tempo.ingester | object | `{"max_block_bytes":1000000,"max_block_duration":"5m","trace_idle_period":"10s"}` | Configuration options for the ingester |
| tempo.querier | object | `{}` | Configuration options for the querier |
-| tempo.queryFrontend | object | `{}` | Configuration options for the query-fronted |
+| tempo.queryFrontend | object | `{}` | Configuration options for the query-fronted. Refers to: https://grafana.com/docs/tempo/latest/configuration/#query-frontend |
| tempo.retention | string | `"336h"` | |
| tempo.global_overrides.per_tenant_override_config | string | `"/conf/overrides.yaml"` | |
| tempo.overrides | object | `{}` | |
@@ -101,7 +101,7 @@ helm install tempo chart/
| tempo.extraVolumeMounts | list | `[]` | Volume mounts to add |
| config | string | Dynamically generated tempo configmap | Tempo configuration file contents |
| tempoQuery.repository | string | `"registry1.dso.mil/ironbank/opensource/grafana/tempo-query"` | Docker image repository |
-| tempoQuery.tag | string | `"2.6.1"` | Docker image tag |
+| tempoQuery.tag | string | `"2.7.0"` | Docker image tag |
| tempoQuery.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
| tempoQuery.enabled | bool | `false` | if False the tempo-query container is not deployed |
| tempoQuery.service.port | int | `16686` | |
@@ -150,6 +150,7 @@ helm install tempo chart/
| tolerations | list | `[]` | Tolerations for pod assignment. See: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ |
| affinity | object | `{}` | Affinity for pod assignment. See: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity |
| priorityClassName | string | `nil` | The name of the PriorityClass |
+| hostAliases | list | `[]` | hostAliases to add |
| networkPolicy.enabled | bool | `false` | |
| networkPolicy.ingress | bool | `true` | |
| networkPolicy.allowExternal | bool | `true` | |
diff --git a/chart/Chart.lock b/chart/Chart.lock
index 7f3b301e7f18db5ae6f1dcdc2e232e3b6ebe27ed..dbbedc085f8c5f05cf6eba2315082d577dbb8394 100644
--- a/chart/Chart.lock
+++ b/chart/Chart.lock
@@ -1,6 +1,6 @@
dependencies:
- name: gluon
repository: oci://registry1.dso.mil/bigbang
- version: 0.5.12
-digest: sha256:23ae84928f9f951a0376b933f631acac3d59b386a3e77bf5c64860e2d0b74bff
-generated: "2024-11-26T07:16:25.34441368Z"
+ version: 0.5.14
+digest: sha256:ca97065348736cfb1457f4d0e53021d2329c81bd34d3a489fd122493be4fa875
+generated: "2025-01-16T07:17:18.459944175Z"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index b87fff3816ce0fe4aabc784215e9862c703dc6da..b709a7a0d160cd8d8c310e5c1e6b0e3f44785eb5 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
name: tempo
description: Grafana Tempo Single Binary Mode
type: application
-version: 1.16.0-bb.1
-appVersion: 2.6.1
+version: 1.18.1-bb.0
+appVersion: 2.7.0
engine: gotpl
home: https://grafana.net
icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png
@@ -22,18 +22,18 @@ maintainers:
email: sheikhabubaker761@gmail.com
dependencies:
- name: gluon
- version: "0.5.12"
+ version: "0.5.14"
repository: oci://registry1.dso.mil/bigbang
annotations:
bigbang.dev/maintenanceTrack: bb_integrated
bigbang.dev/applicationVersions: |
- - Tempo: 2.6.1
- - Tempo Query: 2.6.1
+ - Tempo: 2.7.0
+ - Tempo Query: 2.7.0
bigbang.dev/upstreamReleaseNotesMarkdown: |
- [Find upstream chart's release notes and CHANGELOG here](https://github.com/grafana/helm-charts/releases?q=tempo&expanded=true)
- [Find upstream applications's release notes and CHANGELOG here](https://grafana.com/docs/tempo/latest/release-notes/)
helm.sh/images: |
- name: tempo
- image: registry1.dso.mil/ironbank/opensource/grafana/tempo:2.6.1
+ image: registry1.dso.mil/ironbank/opensource/grafana/tempo:2.7.0
- name: tempo-query
- image: registry1.dso.mil/ironbank/opensource/grafana/tempo-query:2.6.1
+ image: registry1.dso.mil/ironbank/opensource/grafana/tempo-query:2.7.0
diff --git a/chart/Kptfile b/chart/Kptfile
index c2aa45656c6ae54438f45494f725ae958ff17267..c13ad34489fd267d43eda5e99ed47fb8605caac2 100644
--- a/chart/Kptfile
+++ b/chart/Kptfile
@@ -5,7 +5,7 @@ metadata:
upstream:
type: git
git:
- commit: 27953cb5e65e76782cce44a20caf206bacd6579c
+ commit: be5bfb9eefa1ac1323c15d116e0429030560c5bd
repo: https://github.com/grafana/helm-charts
directory: /charts/tempo
- ref: tempo-1.16.0
+ ref: tempo-1.18.1
diff --git a/chart/README.md b/chart/README.md
index 9a9947c722d0e0381b8cc6e17ff9158c99b65acd..674ab4521c54f28e6172fbbc315a64af8c4ca108 100644
--- a/chart/README.md
+++ b/chart/README.md
@@ -1,6 +1,6 @@
# tempo
-  
+  
Grafana Tempo Single Binary Mode
@@ -19,6 +19,7 @@ Grafana Tempo Single Binary Mode
| extraVolumes | list | `[]` | Volumes to add |
| fullnameOverride | string | `""` | Overrides the chart's computed fullname |
| global.commonLabels | object | `{}` | Common labels for all object directly managed by this chart. |
+| hostAliases | list | `[]` | hostAliases to add |
| labels | object | `{}` | labels for tempo |
| nameOverride | string | `""` | Overrides the chart's name |
| networkPolicy.allowExternal | bool | `true` | |
@@ -61,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` | |
@@ -75,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` | |
@@ -152,6 +153,11 @@ The command removes all the Kubernetes components associated with the chart and
A major chart version change indicates that there is an incompatible breaking change needing manual actions.
+### From Chart versions < 1.17.0
+
+Please be aware that we've updated the Tempo version to 2.7, which includes some breaking changes
+We recommend reviewing the [release notes](https://grafana.com/docs/tempo/latest/release-notes/v2-7/) before upgrading.
+
### From Chart versions < 1.12.0
Upgrading to chart 1.12.0 will set the memberlist cluster_label config option. During rollout your cluster will temporarilly be split into two memberlist clusters until all components are rolled out.
diff --git a/chart/charts/gluon-0.5.12.tgz b/chart/charts/gluon-0.5.12.tgz
deleted file mode 100644
index 002bdc40c2d4eb3144041bde2fab7d61a60c84d4..0000000000000000000000000000000000000000
Binary files a/chart/charts/gluon-0.5.12.tgz and /dev/null differ
diff --git a/chart/charts/gluon-0.5.14.tgz b/chart/charts/gluon-0.5.14.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..c99d9e0f44b4d35311fda2b49ee005cbbea4fb67
Binary files /dev/null and b/chart/charts/gluon-0.5.14.tgz differ
diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml
index b7e332a012bae36ef2dba8d8320cd668d9cfd68c..5f20cd75fbe4e13c00ac59c89d5f89a24c9c192c 100644
--- a/chart/templates/service.yaml
+++ b/chart/templates/service.yaml
@@ -1,4 +1,3 @@
-
apiVersion: v1
kind: Service
metadata:
diff --git a/chart/templates/servicemonitor.yaml b/chart/templates/servicemonitor.yaml
index 96ec8589e3ef3785344a403a3f3996c4688e77d5..203fcaac9d15f37ff9f1fa877aae426221d78331 100644
--- a/chart/templates/servicemonitor.yaml
+++ b/chart/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" . }}
diff --git a/chart/templates/statefulset.yaml b/chart/templates/statefulset.yaml
index e6ab736b84364ace98cc8f0cc8761d7f7d1fd247..aa6756b3c71b3190f24593da1a08f3689ca7d5fc 100644
--- a/chart/templates/statefulset.yaml
+++ b/chart/templates/statefulset.yaml
@@ -52,6 +52,10 @@ spec:
{{- end }}
{{- end }}
{{- end }}
+ {{- with .Values.hostAliases }}
+ hostAliases:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
containers:
- args:
- -config.file=/conf/tempo.yaml
diff --git a/chart/values.yaml b/chart/values.yaml
index b7bd325a0df20b263b20cae0efd25e9be72be8f2..8d53bd884e3532bcec6cf2cf1710c3aa927cb04b 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -24,7 +24,7 @@ tempo:
# -- Docker image repository
repository: registry1.dso.mil/ironbank/opensource/grafana/tempo
# -- Docker image tag
- tag: 2.6.1
+ tag: 2.7.0
# -- Docker image pull policy
pullPolicy: IfNotPresent
@@ -59,7 +59,9 @@ tempo:
max_block_duration: 5m
# -- Configuration options for the 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: {}
retention: 336h # 2 weeks retention
# Global overrides
@@ -67,8 +69,8 @@ tempo:
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
@@ -93,8 +95,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
@@ -195,12 +197,12 @@ tempoQuery:
# -- Docker image repository
repository: registry1.dso.mil/ironbank/opensource/grafana/tempo-query
# -- Docker image tag
- tag: 2.6.1
+ tag: 2.7.0
# -- Docker image pull policy
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
@@ -356,7 +358,11 @@ affinity: {}
# -- The name of the PriorityClass
priorityClassName: null
-
+# -- hostAliases to add
+hostAliases: []
+# - ip: 1.2.3.4
+# hostnames:
+# - domain.tld
networkPolicy:
## @param networkPolicy.enabled Enable creation of NetworkPolicy resources. Only Ingress traffic is filtered for now.
##
diff --git a/renovate.json b/renovate.json
index 0c5d7e0964addbcae45072ca2a318bffd1623b29..cf9fb1d0dbad27c14a51937089055b7d2deafa3f 100644
--- a/renovate.json
+++ b/renovate.json
@@ -7,7 +7,6 @@
"enabledManagers": ["helm-values","regex","helmv3"],
"ignorePaths": ["chart/charts/**"],
"labels": ["tempo","renovate"],
- "commitMessagePrefix": "SKIP UPDATE CHECK",
"packageRules": [
{
"matchDatasources": ["docker"],
@@ -58,6 +57,18 @@
"datasourceTemplate": "docker"
}
],
+ "customManagers": [
+ {
+ "customType": "regex",
+ "description": "Update chart version",
+ "fileMatch": ["^chart/Chart\\.yaml$"],
+ "matchStrings": ["version:\\s+(?<currentValue>.+)-bb\\.\\d+"],
+ "autoReplaceStringTemplate": "version: {{newValue}}-bb.0",
+ "depNameTemplate": "tempo",
+ "datasourceTemplate": "helm",
+ "registryUrlTemplate": "https://grafana.github.io/helm-charts"
+ }
+ ],
"separateMajorMinor": false,
"postUpdateOptions": ["helmUpdateSubChartArchives"]
}