From a4c09e7366cf91bf0db4362b46581b79e978c2a6 Mon Sep 17 00:00:00 2001 From: Kevin W Monroe Date: Wed, 7 Jun 2017 16:24:18 +0000 Subject: [PATCH 1/3] close namenode port --- .../src/charm/hadoop/layer-hadoop-namenode/layer.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml index 2709e8d47a..16b5e43105 100644 --- a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml +++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml @@ -22,7 +22,6 @@ options: ports: namenode: port: 8020 - exposed_on: 'namenode' nn_webapp_http: port: 50070 exposed_on: 'namenode' From 20e82d73f7b139917ed29f502d221c26ea077284 Mon Sep 17 00:00:00 2001 From: Kevin W Monroe Date: Thu, 8 Jun 2017 03:21:52 +0000 Subject: [PATCH 2/3] do not collect metrics until the app is ready --- .../src/charm/hadoop/layer-hadoop-namenode/metrics.yaml | 6 +++--- .../charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml index f091b6741f..40c752a80b 100644 --- a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml +++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml @@ -2,12 +2,12 @@ metrics: namenodes: type: gauge description: number of namenodes in the cluster - command: hdfs getconf -namenodes 2>/dev/null | wc -l + command: charms.reactive is_state 'apache-bigtop-namenode.ready' && hdfs getconf -namenodes 2>/dev/null | wc -l offlinedatanodes: type: gauge description: number of dead datanodes in the cluster (must be run as hdfs) - command: su hdfs -c 'hdfs dfsadmin -report -dead 2>/dev/null | grep -i datanodes | grep -o [0-9] || echo 0' + command: charms.reactive is_state 'apache-bigtop-namenode.ready' && su hdfs -c 'hdfs dfsadmin -report -dead 2>/dev/null | grep -i datanodes | grep -o [0-9] || echo 0' onlinedatanodes: type: gauge description: number of live datanodes in the cluster (must be run as hdfs) - command: su hdfs -c 'hdfs dfsadmin -report -live 2>/dev/null | grep -i datanodes | grep -o [0-9] || echo 0' + command: charms.reactive is_state 'apache-bigtop-namenode.ready' && su hdfs -c 'hdfs dfsadmin -report -live 2>/dev/null | grep -i datanodes | grep -o [0-9] || echo 0' diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml index 137e07e146..54f54d1ef4 100644 --- a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml +++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml @@ -2,4 +2,4 @@ metrics: nodemanagers: type: gauge description: number of running node managers in the cluster - command: yarn node -list -all 2>/dev/null | grep RUNNING | wc -l + command: charms.reactive is_state 'apache-bigtop-resourcemanager.ready' && yarn node -list -all 2>/dev/null | grep RUNNING | wc -l From a7477e9921be6a3c1b9add622750c9b5be4d7700 Mon Sep 17 00:00:00 2001 From: Kevin W Monroe Date: Thu, 8 Jun 2017 04:50:05 +0000 Subject: [PATCH 3/3] tweak command quotes --- .../src/charm/hadoop/layer-hadoop-namenode/metrics.yaml | 6 +++--- .../charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml index 40c752a80b..cb7d2462e8 100644 --- a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml +++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml @@ -2,12 +2,12 @@ metrics: namenodes: type: gauge description: number of namenodes in the cluster - command: charms.reactive is_state 'apache-bigtop-namenode.ready' && hdfs getconf -namenodes 2>/dev/null | wc -l + command: "charms.reactive is_state apache-bigtop-namenode.ready && hdfs getconf -namenodes 2>/dev/null | wc -l" offlinedatanodes: type: gauge description: number of dead datanodes in the cluster (must be run as hdfs) - command: charms.reactive is_state 'apache-bigtop-namenode.ready' && su hdfs -c 'hdfs dfsadmin -report -dead 2>/dev/null | grep -i datanodes | grep -o [0-9] || echo 0' + command: "charms.reactive is_state apache-bigtop-namenode.ready && su hdfs -c 'hdfs dfsadmin -report -dead 2>/dev/null | grep -i datanodes | grep -o [0-9] || echo 0'" onlinedatanodes: type: gauge description: number of live datanodes in the cluster (must be run as hdfs) - command: charms.reactive is_state 'apache-bigtop-namenode.ready' && su hdfs -c 'hdfs dfsadmin -report -live 2>/dev/null | grep -i datanodes | grep -o [0-9] || echo 0' + command: "charms.reactive is_state apache-bigtop-namenode.ready && su hdfs -c 'hdfs dfsadmin -report -live 2>/dev/null | grep -i datanodes | grep -o [0-9] || echo 0'" diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml index 54f54d1ef4..08fbea05c3 100644 --- a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml +++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml @@ -2,4 +2,4 @@ metrics: nodemanagers: type: gauge description: number of running node managers in the cluster - command: charms.reactive is_state 'apache-bigtop-resourcemanager.ready' && yarn node -list -all 2>/dev/null | grep RUNNING | wc -l + command: "charms.reactive is_state apache-bigtop-resourcemanager.ready && yarn node -list -all 2>/dev/null | grep RUNNING | wc -l"