From 9938131dfd0bcb8325d0d3a1a1454a8728da47d4 Mon Sep 17 00:00:00 2001 From: Kevin W Monroe Date: Sat, 5 May 2018 13:39:31 +0000 Subject: [PATCH] BIGTOP-3060: juju bundle refresh (august 2018) - Bump charm revisions to latest - A few lint fixes in layer-zookeeper --- bigtop-deploy/juju/hadoop-hbase/bundle.yaml | 14 +++++++------- bigtop-deploy/juju/hadoop-kafka/bundle.yaml | 14 +++++++------- bigtop-deploy/juju/hadoop-processing/bundle.yaml | 10 +++++----- bigtop-deploy/juju/hadoop-spark/bundle.yaml | 12 ++++++------ bigtop-deploy/juju/spark-processing/bundle.yaml | 4 ++-- .../layer-zookeeper/reactive/zookeeper.py | 14 +++++++------- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/bigtop-deploy/juju/hadoop-hbase/bundle.yaml b/bigtop-deploy/juju/hadoop-hbase/bundle.yaml index fbc2015a87..f1d42ef6c1 100644 --- a/bigtop-deploy/juju/hadoop-hbase/bundle.yaml +++ b/bigtop-deploy/juju/hadoop-hbase/bundle.yaml @@ -6,7 +6,7 @@ description: > your cloud. services: namenode: - charm: "cs:xenial/hadoop-namenode-35" + charm: "cs:xenial/hadoop-namenode-46" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -15,7 +15,7 @@ services: to: - "0" resourcemanager: - charm: "cs:xenial/hadoop-resourcemanager-37" + charm: "cs:xenial/hadoop-resourcemanager-48" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -24,7 +24,7 @@ services: to: - "0" slave: - charm: "cs:xenial/hadoop-slave-36" + charm: "cs:xenial/hadoop-slave-47" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -35,12 +35,12 @@ services: - "2" - "3" plugin: - charm: "cs:xenial/hadoop-plugin-35" + charm: "cs:xenial/hadoop-plugin-46" annotations: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-9" + charm: "cs:xenial/hadoop-client-12" constraints: "mem=3G" num_units: 1 annotations: @@ -49,7 +49,7 @@ services: to: - "4" hbase: - charm: "cs:xenial/hbase-36" + charm: "cs:xenial/hbase-47" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -60,7 +60,7 @@ services: - "2" - "3" zookeeper: - charm: "cs:xenial/zookeeper-42" + charm: "cs:xenial/zookeeper-53" constraints: "mem=3G root-disk=32G" num_units: 3 annotations: diff --git a/bigtop-deploy/juju/hadoop-kafka/bundle.yaml b/bigtop-deploy/juju/hadoop-kafka/bundle.yaml index c86dc4bd97..65c243227e 100644 --- a/bigtop-deploy/juju/hadoop-kafka/bundle.yaml +++ b/bigtop-deploy/juju/hadoop-kafka/bundle.yaml @@ -5,7 +5,7 @@ description: > for future analysis with MapReduce. It will run on 9 machines in your cloud. services: namenode: - charm: "cs:xenial/hadoop-namenode-35" + charm: "cs:xenial/hadoop-namenode-46" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -14,7 +14,7 @@ services: to: - "0" resourcemanager: - charm: "cs:xenial/hadoop-resourcemanager-37" + charm: "cs:xenial/hadoop-resourcemanager-48" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -23,7 +23,7 @@ services: to: - "0" slave: - charm: "cs:xenial/hadoop-slave-36" + charm: "cs:xenial/hadoop-slave-47" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -34,12 +34,12 @@ services: - "2" - "3" plugin: - charm: "cs:xenial/hadoop-plugin-35" + charm: "cs:xenial/hadoop-plugin-46" annotations: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-9" + charm: "cs:xenial/hadoop-client-12" constraints: "mem=3G" num_units: 1 annotations: @@ -57,7 +57,7 @@ services: to: - "4" zookeeper: - charm: "cs:xenial/zookeeper-42" + charm: "cs:xenial/zookeeper-53" constraints: "mem=3G root-disk=32G" num_units: 3 annotations: @@ -68,7 +68,7 @@ services: - "6" - "7" kafka: - charm: "cs:xenial/kafka-40" + charm: "cs:xenial/kafka-51" constraints: "mem=3G" num_units: 1 annotations: diff --git a/bigtop-deploy/juju/hadoop-processing/bundle.yaml b/bigtop-deploy/juju/hadoop-processing/bundle.yaml index 23ca061119..d92d47eb2d 100644 --- a/bigtop-deploy/juju/hadoop-processing/bundle.yaml +++ b/bigtop-deploy/juju/hadoop-processing/bundle.yaml @@ -5,7 +5,7 @@ description: > will run on 5 machines in your cloud. services: namenode: - charm: "cs:xenial/hadoop-namenode-35" + charm: "cs:xenial/hadoop-namenode-46" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -14,7 +14,7 @@ services: to: - "0" resourcemanager: - charm: "cs:xenial/hadoop-resourcemanager-37" + charm: "cs:xenial/hadoop-resourcemanager-48" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -23,7 +23,7 @@ services: to: - "0" slave: - charm: "cs:xenial/hadoop-slave-36" + charm: "cs:xenial/hadoop-slave-47" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -34,12 +34,12 @@ services: - "2" - "3" plugin: - charm: "cs:xenial/hadoop-plugin-35" + charm: "cs:xenial/hadoop-plugin-46" annotations: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-9" + charm: "cs:xenial/hadoop-client-12" constraints: "mem=3G" num_units: 1 annotations: diff --git a/bigtop-deploy/juju/hadoop-spark/bundle.yaml b/bigtop-deploy/juju/hadoop-spark/bundle.yaml index ed8a1a62b5..a01d2d8a61 100644 --- a/bigtop-deploy/juju/hadoop-spark/bundle.yaml +++ b/bigtop-deploy/juju/hadoop-spark/bundle.yaml @@ -5,7 +5,7 @@ description: > data with Spark. It will run on 5 machines in your cloud. services: namenode: - charm: "cs:xenial/hadoop-namenode-35" + charm: "cs:xenial/hadoop-namenode-46" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -14,7 +14,7 @@ services: to: - "0" resourcemanager: - charm: "cs:xenial/hadoop-resourcemanager-37" + charm: "cs:xenial/hadoop-resourcemanager-48" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -23,7 +23,7 @@ services: to: - "0" slave: - charm: "cs:xenial/hadoop-slave-36" + charm: "cs:xenial/hadoop-slave-47" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -34,12 +34,12 @@ services: - "2" - "3" plugin: - charm: "cs:xenial/hadoop-plugin-35" + charm: "cs:xenial/hadoop-plugin-46" annotations: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-9" + charm: "cs:xenial/hadoop-client-12" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -48,7 +48,7 @@ services: to: - "4" spark: - charm: "cs:xenial/spark-60" + charm: "cs:xenial/spark-71" constraints: "mem=7G root-disk=32G" num_units: 1 options: diff --git a/bigtop-deploy/juju/spark-processing/bundle.yaml b/bigtop-deploy/juju/spark-processing/bundle.yaml index 8d0c5b4959..0f9d40fd84 100644 --- a/bigtop-deploy/juju/spark-processing/bundle.yaml +++ b/bigtop-deploy/juju/spark-processing/bundle.yaml @@ -5,7 +5,7 @@ description: > from the spark-shell. It will run on 6 machines in your cloud. services: spark: - charm: "cs:xenial/spark-60" + charm: "cs:xenial/spark-71" constraints: "mem=7G root-disk=32G" num_units: 2 options: @@ -18,7 +18,7 @@ services: - "0" - "1" zookeeper: - charm: "cs:xenial/zookeeper-42" + charm: "cs:xenial/zookeeper-53" constraints: "mem=3G root-disk=32G" num_units: 3 annotations: diff --git a/bigtop-packages/src/charm/zookeeper/layer-zookeeper/reactive/zookeeper.py b/bigtop-packages/src/charm/zookeeper/layer-zookeeper/reactive/zookeeper.py index 5af4c5d5c3..5e0741d90e 100644 --- a/bigtop-packages/src/charm/zookeeper/layer-zookeeper/reactive/zookeeper.py +++ b/bigtop-packages/src/charm/zookeeper/layer-zookeeper/reactive/zookeeper.py @@ -51,43 +51,43 @@ def setup_nagios(nagios): 'description': 'ZK_Open_File_Descriptors_Count', 'warn': 500, 'crit': 800 - }, + }, { 'name': 'zk_ephemerals_count', 'description': 'ZK_Ephemerals_Count', 'warn': 10000, 'crit': 100000 - }, + }, { 'name': 'zk_avg_latency', 'description': 'ZK_Avg_Latency', 'warn': 500, 'crit': 1000 - }, + }, { 'name': 'zk_max_latency', 'description': 'ZK_Max_Latency', 'warn': 1000, 'crit': 2000 - }, + }, { 'name': 'zk_min_latency', 'description': 'ZK_Min_Latency', 'warn': 500, 'crit': 1000 - }, + }, { 'name': 'zk_outstanding_requests', 'description': 'ZK_Outstanding_Requests', 'warn': 20, 'crit': 50 - }, + }, { 'name': 'zk_watch_count', 'description': 'ZK_Watch_Count', 'warn': 100, 'crit': 500 - }, + }, ] check_cmd = ['/usr/local/lib/nagios/plugins/check_zookeeper.py', '-o', 'nagios', '-s', 'localhost:2181']