From 8b2e85d32b955260206d384e8419936318efa74e Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Wed, 10 Jul 2024 18:01:59 +0300
Subject: [PATCH 01/11] add option to deploy podmonitor and add option to
 remove svc

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/README.md                | 14 ++++++--
 .../tempo-vulture/templates/podmonitor.yaml   | 36 +++++++++++++++++++
 charts/tempo-vulture/templates/service.yaml   |  2 ++
 charts/tempo-vulture/values.yaml              | 23 ++++++++++--
 4 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 charts/tempo-vulture/templates/podmonitor.yaml

diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md
index def08a3b5d..00a4e0453b 100644
--- a/charts/tempo-vulture/README.md
+++ b/charts/tempo-vulture/README.md
@@ -64,9 +64,17 @@ tempoAddress:
 | nodeSelector | object | `{}` | Node selector for vulture pods |
 | podAnnotations | object | `{}` | Common annotations for all pods |
 | podLabels | object | `{}` | Common labels for all pods |
+| podMonitor.annotations | object | `{}` | PodMonitor annotations |
+| podMonitor.enabled | bool | `false` | If enabled, PodMonitor resources for Prometheus Operator are created |
+| podMonitor.interval | string | `nil` | PodMonitor scrape interval |
+| podMonitor.labels | object | `{}` | Additional PodMonitor labels |
+| podMonitor.namespace | string | `nil` | Alternative namespace for PodMonitor resources |
+| podMonitor.namespaceSelector | object | `{}` | Namespace selector for PodMonitor resources |
+| podMonitor.scrapeTimeout | string | `nil` | PodMonitor scrape timeout in Go duration format (e.g. 15s) |
 | replicas | int | `1` | Number of replicas of Tempo Vulture |
 | resources | object | `{}` | Resource requests and limits for the vulture |
 | revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback |
+| service.enabled | bool | `true` |  |
 | serviceAccount.annotations | object | `{}` | Annotations for the service account |
 | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created |
 | serviceAccount.imagePullSecrets | list | `[]` | Image pull secrets for the service account |
@@ -78,6 +86,6 @@ tempoAddress:
 | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources |
 | serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources |
 | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) |
-| tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor |
-| tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
-| tolerations | list | `[]` | Tolerations for vulture pods |
\ No newline at end of file
+| tempoAddress.push | string | `"loo"` | the url towards your Tempo distributor, e.g. http://distributor |
+| tempoAddress.query | string | `";ll"` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
+| tolerations | list | `[]` | Tolerations for vulture pods |
diff --git a/charts/tempo-vulture/templates/podmonitor.yaml b/charts/tempo-vulture/templates/podmonitor.yaml
new file mode 100644
index 0000000000..96bca1c2c8
--- /dev/null
+++ b/charts/tempo-vulture/templates/podmonitor.yaml
@@ -0,0 +1,36 @@
+{{- with .Values.podMonitor}}
+{{- if .enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ include "tempo-vulture.fullname" $ }}
+  {{- with .namespace }}
+  namespace: {{ . }}
+  {{- end }}
+  {{- with .annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "tempo-vulture.labels" $ | nindent 4 }}
+    {{- with .labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- with .namespaceSelector }}
+  namespaceSelector:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "tempo-vulture.selectorLabels" $ | nindent 6 }}
+  podMetricsEndpoints:
+    - port: prom-metrics
+      {{- with .interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/tempo-vulture/templates/service.yaml b/charts/tempo-vulture/templates/service.yaml
index 706ca0b8be..e481f0a600 100644
--- a/charts/tempo-vulture/templates/service.yaml
+++ b/charts/tempo-vulture/templates/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.service.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -17,3 +18,4 @@ spec:
       name: prom-metrics
   selector:
     {{- include "tempo-vulture.selectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml
index def34f9d1c..5fb0d63f52 100644
--- a/charts/tempo-vulture/values.yaml
+++ b/charts/tempo-vulture/values.yaml
@@ -46,6 +46,8 @@ nodeSelector: {}
 # -- Tolerations for vulture pods
 tolerations: []
 
+service:
+  enabled: true
 
 serviceAccount:
   # -- Specifies whether a ServiceAccount should be created
@@ -75,8 +77,25 @@ serviceMonitor:
   # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s)
   scrapeTimeout: null
 
+# ServiceMonitor configuration
+podMonitor:
+  # -- If enabled, PodMonitor resources for Prometheus Operator are created
+  enabled: false
+  # -- Alternative namespace for PodMonitor resources
+  namespace: null
+  # -- Namespace selector for PodMonitor resources
+  namespaceSelector: {}
+  # -- PodMonitor annotations
+  annotations: {}
+  # -- Additional PodMonitor labels
+  labels: {}
+  # -- PodMonitor scrape interval
+  interval: null
+  # -- PodMonitor scrape timeout in Go duration format (e.g. 15s)
+  scrapeTimeout: null
+
 tempoAddress:
   # -- the url towards your Tempo distributor, e.g. http://distributor
-  push:
+  push: "loo"
   # -- the url towards your Tempo query-frontend, e.g. http://query-frontend:3100
-  query:
+  query: ";ll"

From 740f78636f29b7cf3b52dd39175105bd56ce3fe2 Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Thu, 11 Jul 2024 20:43:58 +0300
Subject: [PATCH 02/11] fix values.yaml

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml
index 5fb0d63f52..0e0a26b0f0 100644
--- a/charts/tempo-vulture/values.yaml
+++ b/charts/tempo-vulture/values.yaml
@@ -96,6 +96,6 @@ podMonitor:
 
 tempoAddress:
   # -- the url towards your Tempo distributor, e.g. http://distributor
-  push: "loo"
+  push: ""
   # -- the url towards your Tempo query-frontend, e.g. http://query-frontend:3100
-  query: ";ll"
+  query: ""

From eaa51fe669e333c98c4d28bfe94ca5a025bd84a6 Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Thu, 11 Jul 2024 20:46:07 +0300
Subject: [PATCH 03/11] fix docs

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md
index 00a4e0453b..b0c5a825ee 100644
--- a/charts/tempo-vulture/README.md
+++ b/charts/tempo-vulture/README.md
@@ -86,6 +86,6 @@ tempoAddress:
 | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources |
 | serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources |
 | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) |
-| tempoAddress.push | string | `"loo"` | the url towards your Tempo distributor, e.g. http://distributor |
-| tempoAddress.query | string | `";ll"` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
+| tempoAddress.push | string | `""` | the url towards your Tempo distributor, e.g. http://distributor |
+| tempoAddress.query | string | `""` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
 | tolerations | list | `[]` | Tolerations for vulture pods |

From d649384b8d5df273c2d414b890180d7cca307eef Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Thu, 11 Jul 2024 21:09:48 +0300
Subject: [PATCH 04/11] fix docs and values

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/README.md   | 6 +++---
 charts/tempo-vulture/values.yaml | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md
index b0c5a825ee..fdb428f5b8 100644
--- a/charts/tempo-vulture/README.md
+++ b/charts/tempo-vulture/README.md
@@ -74,7 +74,7 @@ tempoAddress:
 | replicas | int | `1` | Number of replicas of Tempo Vulture |
 | resources | object | `{}` | Resource requests and limits for the vulture |
 | revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback |
-| service.enabled | bool | `true` |  |
+| service.enabled | bool | `true` | Specifies whether a Service should be created |
 | serviceAccount.annotations | object | `{}` | Annotations for the service account |
 | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created |
 | serviceAccount.imagePullSecrets | list | `[]` | Image pull secrets for the service account |
@@ -86,6 +86,6 @@ tempoAddress:
 | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources |
 | serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources |
 | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) |
-| tempoAddress.push | string | `""` | the url towards your Tempo distributor, e.g. http://distributor |
-| tempoAddress.query | string | `""` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
+| tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor |
+| tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
 | tolerations | list | `[]` | Tolerations for vulture pods |
diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml
index 0e0a26b0f0..4838d14198 100644
--- a/charts/tempo-vulture/values.yaml
+++ b/charts/tempo-vulture/values.yaml
@@ -46,7 +46,9 @@ nodeSelector: {}
 # -- Tolerations for vulture pods
 tolerations: []
 
+
 service:
+  # -- Specifies whether a Service should be created
   enabled: true
 
 serviceAccount:
@@ -96,6 +98,6 @@ podMonitor:
 
 tempoAddress:
   # -- the url towards your Tempo distributor, e.g. http://distributor
-  push: ""
+  push:
   # -- the url towards your Tempo query-frontend, e.g. http://query-frontend:3100
-  query: ""
+  query:

From 49749fd73787729f3e941eeaf5210ca95e628a36 Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Sun, 14 Jul 2024 09:50:22 +0300
Subject: [PATCH 05/11] fix values.yaml

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml
index 4838d14198..3a38f4187d 100644
--- a/charts/tempo-vulture/values.yaml
+++ b/charts/tempo-vulture/values.yaml
@@ -79,7 +79,7 @@ serviceMonitor:
   # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s)
   scrapeTimeout: null
 
-# ServiceMonitor configuration
+# PodMonitor configuration
 podMonitor:
   # -- If enabled, PodMonitor resources for Prometheus Operator are created
   enabled: false

From e705438eb87484087b39b4e331432b7b2ee9071c Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Mon, 11 Nov 2024 19:37:55 +0200
Subject: [PATCH 06/11] bump chart version

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/Chart.yaml | 2 +-
 charts/tempo-vulture/README.md  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml
index d17e98aa08..b63938015d 100644
--- a/charts/tempo-vulture/Chart.yaml
+++ b/charts/tempo-vulture/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-vulture
 description: Grafana Tempo Vulture - A tool to monitor Tempo performance.
 type: application
-version: 0.7.0
+version: 0.7.1
 appVersion: 2.6.1
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md
index fdb428f5b8..484c0ba454 100644
--- a/charts/tempo-vulture/README.md
+++ b/charts/tempo-vulture/README.md
@@ -1,6 +1,6 @@
 # tempo-vulture
 
-![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
+![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
 
 Grafana Tempo Vulture - A tool to monitor Tempo performance.
 
@@ -88,4 +88,4 @@ tempoAddress:
 | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) |
 | tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor |
 | tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
-| tolerations | list | `[]` | Tolerations for vulture pods |
+| tolerations | list | `[]` | Tolerations for vulture pods |
\ No newline at end of file

From f2ef7bb52c7fc8abe1675af07e9a55d3c72ac410 Mon Sep 17 00:00:00 2001
From: javiermolinar <javiermolinar@live.com>
Date: Tue, 3 Dec 2024 10:17:01 +0100
Subject: [PATCH 07/11] fix multiline template for
 ingester.zoneAwareReplicationMap helper

Signed-off-by: javiermolinar <javiermolinar@live.com>
---
 .../templates/ingester/_helpers-ingester.tpl           | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl
index 4d417ada2c..f7018f507c 100644
--- a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl
+++ b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl
@@ -13,12 +13,10 @@
 {{- $requestedReplicas := .ctx.Values.ingester.replicas -}}
 {{- $replicaPerZone := div (add $requestedReplicas $numberOfZones -1) $numberOfZones -}}
 {{- range $idx, $rolloutZone := .ctx.Values.ingester.zoneAwareReplication.zones -}}
-{{- $_ := set $zonesMap $rolloutZone.name (dict
-"affinity" (($rolloutZone.extraAffinity | default (dict)) | mergeOverwrite (include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml))
-"nodeSelector" ($rolloutZone.nodeSelector | default (dict) )
-"replicas" $replicaPerZone
-"storageClass" $rolloutZone.storageClass
-) -}}
+{{- $extraAffinity := $rolloutZone.extraAffinity | default (dict) -}}
+{{- $zoneAntiAffinity := include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml -}}
+{{- $mergedAffinity := mergeOverwrite $extraAffinity $zoneAntiAffinity -}}
+{{- $_ := set $zonesMap $rolloutZone.name (dict "affinity" $mergedAffinity "nodeSelector" ($rolloutZone.nodeSelector | default (dict)) "replicas" $replicaPerZone  "storageClass" $rolloutZone.storageClass) -}}
 {{- end -}}
 {{- else -}}
 {{- $_ := set $zonesMap "" $defaultZone -}}

From 8e1c4ce63a404a3997cd3168c6eee4b70cb0f24e Mon Sep 17 00:00:00 2001
From: javiermolinar <javiermolinar@live.com>
Date: Tue, 3 Dec 2024 10:25:59 +0100
Subject: [PATCH 08/11] bump version

Signed-off-by: javiermolinar <javiermolinar@live.com>
---
 charts/tempo-distributed/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 72e1e2b51e..af2a1860b6 100644
--- a/charts/tempo-distributed/Chart.yaml
+++ b/charts/tempo-distributed/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.22.1
+version: 1.23.2
 appVersion: 2.6.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/

From df7f21053e1e9b51ea56fc38180aa1bd7adaa912 Mon Sep 17 00:00:00 2001
From: javiermolinar <javiermolinar@live.com>
Date: Tue, 3 Dec 2024 10:31:28 +0100
Subject: [PATCH 09/11] docs

Signed-off-by: javiermolinar <javiermolinar@live.com>
---
 charts/tempo-distributed/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index ef5fb9f82b..9e88500824 100755
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.23.1](https://img.shields.io/badge/Version-1.23.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)
+![Version: 1.23.2](https://img.shields.io/badge/Version-1.23.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

From c95bb23bc9725e0db8b0398e2ff1f5d34ab1ccf0 Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Tue, 3 Dec 2024 15:14:40 +0200
Subject: [PATCH 10/11] remove service

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/templates/service.yaml   | 21 -----------
 .../templates/servicemonitor.yaml             | 36 -------------------
 charts/tempo-vulture/values.yaml              | 21 -----------
 3 files changed, 78 deletions(-)
 delete mode 100644 charts/tempo-vulture/templates/service.yaml
 delete mode 100644 charts/tempo-vulture/templates/servicemonitor.yaml

diff --git a/charts/tempo-vulture/templates/service.yaml b/charts/tempo-vulture/templates/service.yaml
deleted file mode 100644
index e481f0a600..0000000000
--- a/charts/tempo-vulture/templates/service.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- if .Values.service.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "tempo-vulture.fullname" . }}
-  labels:
-    {{- include "tempo-vulture.labels" . | nindent 4 }}
-  {{- with .Values.annotations }}
-  annotations:
-    {{- toYaml . | indent 4 }}
-  {{- end }}
-spec:
-  type: ClusterIP
-  ports:
-    - port: 8080
-      targetPort: prom-metrics
-      protocol: TCP
-      name: prom-metrics
-  selector:
-    {{- include "tempo-vulture.selectorLabels" . | nindent 4 }}
-{{- end }}
diff --git a/charts/tempo-vulture/templates/servicemonitor.yaml b/charts/tempo-vulture/templates/servicemonitor.yaml
deleted file mode 100644
index 2a4dfe20e7..0000000000
--- a/charts/tempo-vulture/templates/servicemonitor.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-{{- with .Values.serviceMonitor }}
-{{- if .enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ include "tempo-vulture.fullname" $ }}
-  {{- with .namespace }}
-  namespace: {{ . }}
-  {{- end }}
-  {{- with .annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    {{- include "tempo-vulture.labels" $ | nindent 4 }}
-    {{- with .labels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  {{- with .namespaceSelector }}
-  namespaceSelector:
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "tempo-vulture.selectorLabels" $ | nindent 6 }}
-  endpoints:
-    - port: prom-metrics
-      {{- with .interval }}
-      interval: {{ . }}
-      {{- end }}
-      {{- with .scrapeTimeout }}
-      scrapeTimeout: {{ . }}
-      {{- end }}
-{{- end }}
-{{- end }}
diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml
index 3a38f4187d..cf9904ad9b 100644
--- a/charts/tempo-vulture/values.yaml
+++ b/charts/tempo-vulture/values.yaml
@@ -47,10 +47,6 @@ nodeSelector: {}
 tolerations: []
 
 
-service:
-  # -- Specifies whether a Service should be created
-  enabled: true
-
 serviceAccount:
   # -- Specifies whether a ServiceAccount should be created
   create: true
@@ -62,23 +58,6 @@ serviceAccount:
   # -- Annotations for the service account
   annotations: {}
 
-# ServiceMonitor configuration
-serviceMonitor:
-  # -- If enabled, ServiceMonitor resources for Prometheus Operator are created
-  enabled: false
-  # -- Alternative namespace for ServiceMonitor resources
-  namespace: null
-  # -- Namespace selector for ServiceMonitor resources
-  namespaceSelector: {}
-  # -- ServiceMonitor annotations
-  annotations: {}
-  # -- Additional ServiceMonitor labels
-  labels: {}
-  # -- ServiceMonitor scrape interval
-  interval: null
-  # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s)
-  scrapeTimeout: null
-
 # PodMonitor configuration
 podMonitor:
   # -- If enabled, PodMonitor resources for Prometheus Operator are created

From d37364f2c204c133ab4bf06876b32dcb3bd55955 Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Tue, 3 Dec 2024 15:17:00 +0200
Subject: [PATCH 11/11] update readme

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md
index 484c0ba454..d685f1eff4 100644
--- a/charts/tempo-vulture/README.md
+++ b/charts/tempo-vulture/README.md
@@ -74,18 +74,10 @@ tempoAddress:
 | replicas | int | `1` | Number of replicas of Tempo Vulture |
 | resources | object | `{}` | Resource requests and limits for the vulture |
 | revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback |
-| service.enabled | bool | `true` | Specifies whether a Service should be created |
 | serviceAccount.annotations | object | `{}` | Annotations for the service account |
 | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created |
 | serviceAccount.imagePullSecrets | list | `[]` | Image pull secrets for the service account |
 | serviceAccount.name | string | `nil` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template |
-| serviceMonitor.annotations | object | `{}` | ServiceMonitor annotations |
-| serviceMonitor.enabled | bool | `false` | If enabled, ServiceMonitor resources for Prometheus Operator are created |
-| serviceMonitor.interval | string | `nil` | ServiceMonitor scrape interval |
-| serviceMonitor.labels | object | `{}` | Additional ServiceMonitor labels |
-| serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources |
-| serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources |
-| serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) |
 | tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor |
 | tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
 | tolerations | list | `[]` | Tolerations for vulture pods |
\ No newline at end of file