From 82a3bc8b08f1caaf3d6c0e4b45fbb74abcd3b1d0 Mon Sep 17 00:00:00 2001 From: Jaume Devesa Date: Wed, 15 Nov 2023 08:49:50 +0100 Subject: [PATCH 1/3] Add datadog tags Use the datadog tags to send telemetry to datadog. --- helm/thingsboard/templates/node.yaml | 2 ++ helm/thingsboard/templates/web-ui.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/helm/thingsboard/templates/node.yaml b/helm/thingsboard/templates/node.yaml index c4e4dd4d..a8f33b7c 100644 --- a/helm/thingsboard/templates/node.yaml +++ b/helm/thingsboard/templates/node.yaml @@ -19,6 +19,8 @@ kind: {{ .Values.node.kind }} metadata: name: {{ .Release.Name }}-node labels: + tags.datadoghq.com/service: tb-node + tags.datadoghq.com/version: {{ .appVersion }} {{- include "thingsboard.labels" . | nindent 4 }} spec: {{- if not .Values.node.autoscaling.enabled }} diff --git a/helm/thingsboard/templates/web-ui.yaml b/helm/thingsboard/templates/web-ui.yaml index a22022d0..459ab732 100644 --- a/helm/thingsboard/templates/web-ui.yaml +++ b/helm/thingsboard/templates/web-ui.yaml @@ -19,6 +19,8 @@ kind: {{ .Values.webui.kind }} metadata: name: {{ .Release.Name }}-web-ui labels: + tags.datadoghq.com/service: tb-ui + tags.datadoghq.com/version: {{ .appVersion }} {{- include "thingsboard.labels" . | nindent 4 }} spec: {{- if not .Values.webui.autoscaling.enabled }} From 1da342508e344fca60ed1e75eba73f13d70b8a8a Mon Sep 17 00:00:00 2001 From: Jaume Devesa Date: Wed, 15 Nov 2023 09:18:53 +0100 Subject: [PATCH 2/3] Addressing @sturgeluse commits --- helm/thingsboard/templates/node.yaml | 2 ++ helm/thingsboard/templates/web-ui.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/helm/thingsboard/templates/node.yaml b/helm/thingsboard/templates/node.yaml index a8f33b7c..3c748455 100644 --- a/helm/thingsboard/templates/node.yaml +++ b/helm/thingsboard/templates/node.yaml @@ -21,6 +21,7 @@ metadata: labels: tags.datadoghq.com/service: tb-node tags.datadoghq.com/version: {{ .appVersion }} + admission.datadoghq.com/enabled: "true" {{- include "thingsboard.labels" . | nindent 4 }} spec: {{- if not .Values.node.autoscaling.enabled }} @@ -38,6 +39,7 @@ spec: {{- with .Values.node.podAnnotations }} annotations: {{- toYaml . | nindent 8 }} + admission.datadoghq.com/java-lib.version: latest {{- end }} labels: {{- include "thingsboard.selectorLabels-node" . | nindent 8 }} diff --git a/helm/thingsboard/templates/web-ui.yaml b/helm/thingsboard/templates/web-ui.yaml index 459ab732..3ecd0435 100644 --- a/helm/thingsboard/templates/web-ui.yaml +++ b/helm/thingsboard/templates/web-ui.yaml @@ -21,6 +21,7 @@ metadata: labels: tags.datadoghq.com/service: tb-ui tags.datadoghq.com/version: {{ .appVersion }} + admission.datadoghq.com/enabled: "true" {{- include "thingsboard.labels" . | nindent 4 }} spec: {{- if not .Values.webui.autoscaling.enabled }} @@ -38,6 +39,7 @@ spec: {{- with .Values.webui.podAnnotations }} annotations: {{- toYaml . | nindent 8 }} + admission.datadoghq.com/java-lib.version: latest {{- end }} labels: {{- include "thingsboard.selectorLabels-webui" . | nindent 8 }} From 8183ac2ae41e50486e3768670377859783951ff3 Mon Sep 17 00:00:00 2001 From: Jaume Devesa Date: Wed, 15 Nov 2023 09:39:14 +0100 Subject: [PATCH 3/3] Adding mqtt-transport --- helm/thingsboard/templates/mqtt-transport.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/helm/thingsboard/templates/mqtt-transport.yaml b/helm/thingsboard/templates/mqtt-transport.yaml index e1a89a60..cf4d5baa 100644 --- a/helm/thingsboard/templates/mqtt-transport.yaml +++ b/helm/thingsboard/templates/mqtt-transport.yaml @@ -19,6 +19,9 @@ kind: {{ .Values.mqtt.kind }} metadata: name: {{ .Release.Name }}-mqtt-transport labels: + tags.datadoghq.com/service: tb-mqtt-transport + tags.datadoghq.com/version: {{ .appVersion }} + admission.datadoghq.com/enabled: "true" {{- include "thingsboard.labels" . | nindent 4 }} spec: {{- $podLabels := include "thingsboard.selectorLabels-mqtt" . }} @@ -37,6 +40,7 @@ spec: {{- with .Values.mqtt.podAnnotations }} annotations: {{- toYaml . | nindent 8 }} + admission.datadoghq.com/java-lib.version: latest {{- end }} labels: {{- include "thingsboard.selectorLabels-mqtt" . | nindent 8 }}