[GitHub] dubeejw closed pull request #3043: Fix kamon env vars

[GitBox <gi...@apache.org>]

dubeejw closed pull request #3043: Fix kamon env vars
URL: https://github.com/apache/incubator-openwhisk/pull/3043
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ansible/roles/controller/tasks/deploy.yml b/ansible/roles/controller/tasks/deploy.yml
index 2aa0b56b73..a0cdc72d30 100644
--- a/ansible/roles/controller/tasks/deploy.yml
+++ b/ansible/roles/controller/tasks/deploy.yml
@@ -79,8 +79,6 @@
       "RUNTIMES_MANIFEST": "{{ runtimesManifest | to_json }}"
       "CONTROLLER_LOCALBOOKKEEPING": "{{ controller.localBookkeeping }}"
       "AKKA_CLUSTER_SEED_NODES": "{{seed_nodes_list | join(' ') }}"
-      "METRICS_KAMON": "{{ metrics.kamon.enabled }}"
-      "METRICS_LOG": "{{ metrics.log.enabled }}"
       "CONTROLLER_HA": "{{ controller.ha }}"
 
       "METRICS_KAMON": "{{ metrics.kamon.enabled }}"
diff --git a/ansible/roles/invoker/tasks/deploy.yml b/ansible/roles/invoker/tasks/deploy.yml
index 56b810015f..0aa0d5d451 100644
--- a/ansible/roles/invoker/tasks/deploy.yml
+++ b/ansible/roles/invoker/tasks/deploy.yml
@@ -151,8 +151,8 @@
         -e WHISK_LOGS_DIR='{{ whisk_logs_dir }}'
         -e METRICS_KAMON='{{ metrics.kamon.enabled }}'
         -e METRICS_LOG='{{ metrics.log.enabled }}'
-        -e METRICS_KAMON_HOST='{{ metrics.kamon.host }}'
-        -e METRICS_KAMON_PORT='{{ metrics.kamon.port }}'
+        -e CONFIG_kamon_statsd_hostname='{{ metrics.kamon.host }}'
+        -e CONFIG_kamon_statsd_port='{{ metrics.kamon.port }}'
         -v /sys/fs/cgroup:/sys/fs/cgroup
         -v /run/runc:/run/runc
         -v {{ whisk_logs_dir }}/invoker{{ groups['invokers'].index(inventory_hostname) }}:/logs


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services