Merge pull request #48 from Jahia/PAAS-1228

PAAS-1228: fix datadog hostname for ES nodes
Jahia · Oct 6, 2020 · 8c49628 · 8c49628
2 parents 57f36e2 + 6b6b896
commit 8c49628
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/unomi.yml b/unomi.yml
@@ -303,7 +303,7 @@ actions:
   setupDatadogAgentEs:
     cmd[${this}]: |-
       DD_API_KEY=$(sed -n 's/DATADOGAPIKEY=\(.*\)/\1/p' < /.jelenv) bash -c "$(curl -L https://raw.githubusercontent.com/DataDog/datadog-agent/master/cmd/agent/install_script.sh)"
-      echo "hostname: es.${this}" >> /etc/datadog-agent/datadog.yaml
+      echo "hostname: es.$(hostname | sed 's/node\([0-9]*\).*/\1/g')" >> /etc/datadog-agent/datadog.yaml
       sed -i 's/# logs_enabled: false/logs_enabled: true/' /etc/datadog-agent/datadog.yaml
       echo "tags:" >> /etc/datadog-agent/datadog.yaml
       echo " - product:unomi" >> /etc/datadog-agent/datadog.yaml

diff --git a/update.yml b/update.yml
@@ -210,7 +210,7 @@ actions:
   setupDatadogAgentEs:
     cmd[${this}]: |-
       DD_API_KEY=$(sed -n 's/DATADOGAPIKEY=\(.*\)/\1/p' < /.jelenv) bash -c "$(curl -L https://raw.githubusercontent.com/DataDog/datadog-agent/master/cmd/agent/install_script.sh)"
-      echo "hostname: es.${this}" >> /etc/datadog-agent/datadog.yaml
+      echo "hostname: es.$(hostname | sed 's/node\([0-9]*\).*/\1/g')" >> /etc/datadog-agent/datadog.yaml
       sed -i 's/# logs_enabled: false/logs_enabled: true/' /etc/datadog-agent/datadog.yaml
       echo "tags:" >> /etc/datadog-agent/datadog.yaml
       echo " - product:unomi" >> /etc/datadog-agent/datadog.yaml