[incubator-openwhisk] branch master updated: Fix kamon env vars (#3043)

[dubeejw]

This is an automated email from the ASF dual-hosted git repository.

dubeejw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new cb955f6  Fix kamon env vars (#3043)
cb955f6 is described below

commit cb955f6da7cf4e3ea4c8450b52865076e7885fc5
Author: Vadim Raskin <raskinva...@gmail.com>
AuthorDate: Fri Dec 1 21:27:25 2017 +0100

    Fix kamon env vars (#3043)
---
 ansible/roles/controller/tasks/deploy.yml | 2 --
 ansible/roles/invoker/tasks/deploy.yml    | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/controller/tasks/deploy.yml 
b/ansible/roles/controller/tasks/deploy.yml
index 2aa0b56..a0cdc72 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 56b8100..0aa0d5d 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

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].