From 5f26b36076b20f424f173c8f142d7eecc463b270 Mon Sep 17 00:00:00 2001 From: Kevin W Monroe Date: Thu, 11 May 2017 17:28:27 +0000 Subject: [PATCH 1/5] juju charm revision updates - new icons for hbase/kafka/spark - adjust hadoop-spark test (no longer includes zookeeper) - bump charm revs in all bundles: - layer-apache-bigtop-base: doc updates - layer-apache-bigtop-base: restricted network support --- .../juju/hadoop-hbase/bundle-dev.yaml | 2 +- .../juju/hadoop-hbase/bundle-local.yaml | 2 +- bigtop-deploy/juju/hadoop-hbase/bundle.yaml | 14 +- .../juju/hadoop-kafka/bundle-dev.yaml | 2 +- .../juju/hadoop-kafka/bundle-local.yaml | 2 +- bigtop-deploy/juju/hadoop-kafka/bundle.yaml | 14 +- .../juju/hadoop-processing/bundle-dev.yaml | 2 +- .../juju/hadoop-processing/bundle-local.yaml | 2 +- .../juju/hadoop-processing/bundle.yaml | 10 +- .../juju/hadoop-spark/bundle-dev.yaml | 34 +- .../juju/hadoop-spark/bundle-local.yaml | 34 +- bigtop-deploy/juju/hadoop-spark/bundle.yaml | 12 +- .../juju/hadoop-spark/tests/01-bundle.py | 1 - .../juju/spark-processing/bundle.yaml | 4 +- .../src/charm/hbase/layer-hbase/icon.svg | 293 +----- .../src/charm/kafka/layer-kafka/icon.svg | 107 +-- .../src/charm/spark/layer-spark/icon.svg | 850 +----------------- 17 files changed, 89 insertions(+), 1296 deletions(-) diff --git a/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml index 064b84d465..f7bcf56199 100644 --- a/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml +++ b/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml @@ -34,7 +34,7 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: diff --git a/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml b/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml index 34d3cb7b0b..26e0f3eaf4 100644 --- a/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml +++ b/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml @@ -34,7 +34,7 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: diff --git a/bigtop-deploy/juju/hadoop-hbase/bundle.yaml b/bigtop-deploy/juju/hadoop-hbase/bundle.yaml index 618b196a40..274e7b84eb 100644 --- a/bigtop-deploy/juju/hadoop-hbase/bundle.yaml +++ b/bigtop-deploy/juju/hadoop-hbase/bundle.yaml @@ -1,6 +1,6 @@ services: namenode: - charm: "cs:xenial/hadoop-namenode-14" + charm: "cs:xenial/hadoop-namenode-18" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -9,7 +9,7 @@ services: to: - "0" resourcemanager: - charm: "cs:xenial/hadoop-resourcemanager-16" + charm: "cs:xenial/hadoop-resourcemanager-20" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -18,7 +18,7 @@ services: to: - "0" slave: - charm: "cs:xenial/hadoop-slave-15" + charm: "cs:xenial/hadoop-slave-19" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -29,12 +29,12 @@ services: - "2" - "3" plugin: - charm: "cs:xenial/hadoop-plugin-14" + charm: "cs:xenial/hadoop-plugin-18" annotations: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: @@ -43,7 +43,7 @@ services: to: - "4" hbase: - charm: "cs:xenial/hbase-14" + charm: "cs:xenial/hbase-18" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -54,7 +54,7 @@ services: - "2" - "3" zookeeper: - charm: "cs:xenial/zookeeper-19" + charm: "cs:xenial/zookeeper-23" constraints: "mem=3G root-disk=32G" num_units: 3 annotations: diff --git a/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml index 0ea56fabf9..f715f78882 100644 --- a/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml +++ b/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml @@ -34,7 +34,7 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: diff --git a/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml b/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml index 0f26d33e7b..82bfb1644f 100644 --- a/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml +++ b/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml @@ -34,7 +34,7 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: diff --git a/bigtop-deploy/juju/hadoop-kafka/bundle.yaml b/bigtop-deploy/juju/hadoop-kafka/bundle.yaml index abf74bba80..a6a511650d 100644 --- a/bigtop-deploy/juju/hadoop-kafka/bundle.yaml +++ b/bigtop-deploy/juju/hadoop-kafka/bundle.yaml @@ -1,6 +1,6 @@ services: namenode: - charm: "cs:xenial/hadoop-namenode-14" + charm: "cs:xenial/hadoop-namenode-18" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -9,7 +9,7 @@ services: to: - "0" resourcemanager: - charm: "cs:xenial/hadoop-resourcemanager-16" + charm: "cs:xenial/hadoop-resourcemanager-20" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -18,7 +18,7 @@ services: to: - "0" slave: - charm: "cs:xenial/hadoop-slave-15" + charm: "cs:xenial/hadoop-slave-19" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -29,12 +29,12 @@ services: - "2" - "3" plugin: - charm: "cs:xenial/hadoop-plugin-14" + charm: "cs:xenial/hadoop-plugin-18" annotations: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: @@ -52,7 +52,7 @@ services: to: - "4" zookeeper: - charm: "cs:xenial/zookeeper-19" + charm: "cs:xenial/zookeeper-23" constraints: "mem=3G root-disk=32G" num_units: 3 annotations: @@ -63,7 +63,7 @@ services: - "6" - "7" kafka: - charm: "cs:xenial/kafka-15" + charm: "cs:xenial/kafka-19" constraints: "mem=3G" num_units: 1 annotations: diff --git a/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml index 265e69fd06..42b5f3838a 100644 --- a/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml +++ b/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml @@ -34,7 +34,7 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: diff --git a/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml b/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml index a6dd892ef9..736f73bd32 100644 --- a/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml +++ b/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml @@ -34,7 +34,7 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" 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 ef5195aeeb..2e5b9b8bdd 100644 --- a/bigtop-deploy/juju/hadoop-processing/bundle.yaml +++ b/bigtop-deploy/juju/hadoop-processing/bundle.yaml @@ -1,6 +1,6 @@ services: namenode: - charm: "cs:xenial/hadoop-namenode-14" + charm: "cs:xenial/hadoop-namenode-18" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -9,7 +9,7 @@ services: to: - "0" resourcemanager: - charm: "cs:xenial/hadoop-resourcemanager-16" + charm: "cs:xenial/hadoop-resourcemanager-20" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -18,7 +18,7 @@ services: to: - "0" slave: - charm: "cs:xenial/hadoop-slave-15" + charm: "cs:xenial/hadoop-slave-19" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -29,12 +29,12 @@ services: - "2" - "3" plugin: - charm: "cs:xenial/hadoop-plugin-14" + charm: "cs:xenial/hadoop-plugin-18" annotations: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=3G" num_units: 1 annotations: diff --git a/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml index 847cebd742..66136c618b 100644 --- a/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml +++ b/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml @@ -34,8 +34,8 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" - constraints: "mem=3G" + charm: "cs:xenial/hadoop-client-8" + constraints: "mem=7G root-disk=32G" num_units: 1 annotations: gui-x: "1250" @@ -52,18 +52,7 @@ services: gui-x: "1000" gui-y: "0" to: - - "5" - zookeeper: - charm: "cs:~bigdata-dev/xenial/zookeeper" - constraints: "mem=3G root-disk=32G" - num_units: 3 - annotations: - gui-x: "500" - gui-y: "400" - to: - - "6" - - "7" - - "8" + - "4" ganglia: charm: "cs:xenial/ganglia-12" num_units: 1 @@ -97,20 +86,17 @@ relations: - [resourcemanager, slave] - [plugin, namenode] - [plugin, resourcemanager] - - [client, plugin] - [spark, plugin] - - [spark, zookeeper] + - [client, plugin] - ["ganglia-node:juju-info", "namenode:juju-info"] - ["ganglia-node:juju-info", "resourcemanager:juju-info"] - ["ganglia-node:juju-info", "slave:juju-info"] - ["ganglia-node:juju-info", "spark:juju-info"] - - ["ganglia-node:juju-info", "zookeeper:juju-info"] - ["ganglia:node", "ganglia-node:node"] - ["rsyslog-forwarder-ha:juju-info", "namenode:juju-info"] - ["rsyslog-forwarder-ha:juju-info", "resourcemanager:juju-info"] - ["rsyslog-forwarder-ha:juju-info", "slave:juju-info"] - ["rsyslog-forwarder-ha:juju-info", "spark:juju-info"] - - ["rsyslog-forwarder-ha:juju-info", "zookeeper:juju-info"] - ["rsyslog:aggregator", "rsyslog-forwarder-ha:syslog"] machines: "0": @@ -126,17 +112,5 @@ machines: series: "xenial" constraints: "mem=7G root-disk=32G" "4": - series: "xenial" - constraints: "mem=3G" - "5": series: "xenial" constraints: "mem=7G root-disk=32G" - "6": - series: "xenial" - constraints: "mem=3G root-disk=32G" - "7": - series: "xenial" - constraints: "mem=3G root-disk=32G" - "8": - series: "xenial" - constraints: "mem=3G root-disk=32G" diff --git a/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml b/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml index 61b7ecf3ed..6e08871d54 100644 --- a/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml +++ b/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml @@ -34,8 +34,8 @@ services: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" - constraints: "mem=3G" + charm: "cs:xenial/hadoop-client-8" + constraints: "mem=7G root-disk=32G" num_units: 1 annotations: gui-x: "1250" @@ -52,18 +52,7 @@ services: gui-x: "1000" gui-y: "0" to: - - "5" - zookeeper: - charm: "/home/ubuntu/charms/xenial/zookeeper" - constraints: "mem=3G root-disk=32G" - num_units: 3 - annotations: - gui-x: "500" - gui-y: "400" - to: - - "6" - - "7" - - "8" + - "4" ganglia: charm: "cs:xenial/ganglia-12" num_units: 1 @@ -97,20 +86,17 @@ relations: - [resourcemanager, slave] - [plugin, namenode] - [plugin, resourcemanager] - - [client, plugin] - [spark, plugin] - - [spark, zookeeper] + - [client, plugin] - ["ganglia-node:juju-info", "namenode:juju-info"] - ["ganglia-node:juju-info", "resourcemanager:juju-info"] - ["ganglia-node:juju-info", "slave:juju-info"] - ["ganglia-node:juju-info", "spark:juju-info"] - - ["ganglia-node:juju-info", "zookeeper:juju-info"] - ["ganglia:node", "ganglia-node:node"] - ["rsyslog-forwarder-ha:juju-info", "namenode:juju-info"] - ["rsyslog-forwarder-ha:juju-info", "resourcemanager:juju-info"] - ["rsyslog-forwarder-ha:juju-info", "slave:juju-info"] - ["rsyslog-forwarder-ha:juju-info", "spark:juju-info"] - - ["rsyslog-forwarder-ha:juju-info", "zookeeper:juju-info"] - ["rsyslog:aggregator", "rsyslog-forwarder-ha:syslog"] machines: "0": @@ -126,17 +112,5 @@ machines: series: "xenial" constraints: "mem=7G root-disk=32G" "4": - series: "xenial" - constraints: "mem=3G" - "5": series: "xenial" constraints: "mem=7G root-disk=32G" - "6": - series: "xenial" - constraints: "mem=3G root-disk=32G" - "7": - series: "xenial" - constraints: "mem=3G root-disk=32G" - "8": - series: "xenial" - constraints: "mem=3G root-disk=32G" diff --git a/bigtop-deploy/juju/hadoop-spark/bundle.yaml b/bigtop-deploy/juju/hadoop-spark/bundle.yaml index 06114957e7..691b9f9032 100644 --- a/bigtop-deploy/juju/hadoop-spark/bundle.yaml +++ b/bigtop-deploy/juju/hadoop-spark/bundle.yaml @@ -1,6 +1,6 @@ services: namenode: - charm: "cs:xenial/hadoop-namenode-14" + charm: "cs:xenial/hadoop-namenode-18" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -9,7 +9,7 @@ services: to: - "0" resourcemanager: - charm: "cs:xenial/hadoop-resourcemanager-16" + charm: "cs:xenial/hadoop-resourcemanager-20" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -18,7 +18,7 @@ services: to: - "0" slave: - charm: "cs:xenial/hadoop-slave-15" + charm: "cs:xenial/hadoop-slave-19" constraints: "mem=7G root-disk=32G" num_units: 3 annotations: @@ -29,12 +29,12 @@ services: - "2" - "3" plugin: - charm: "cs:xenial/hadoop-plugin-14" + charm: "cs:xenial/hadoop-plugin-18" annotations: gui-x: "1000" gui-y: "400" client: - charm: "cs:xenial/hadoop-client-3" + charm: "cs:xenial/hadoop-client-8" constraints: "mem=7G root-disk=32G" num_units: 1 annotations: @@ -43,7 +43,7 @@ services: to: - "4" spark: - charm: "cs:xenial/spark-34" + charm: "cs:xenial/spark-38" constraints: "mem=7G root-disk=32G" num_units: 1 options: diff --git a/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py b/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py index 9d58cc9af6..1e9794fd5f 100755 --- a/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py +++ b/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py @@ -53,7 +53,6 @@ def setUpClass(cls): 'resourcemanager': re.compile('ready'), 'slave': re.compile('ready'), 'spark': re.compile('ready'), - 'zookeeper': re.compile('ready'), }, timeout=3600) cls.hdfs = cls.d.sentry['namenode'][0] cls.yarn = cls.d.sentry['resourcemanager'][0] diff --git a/bigtop-deploy/juju/spark-processing/bundle.yaml b/bigtop-deploy/juju/spark-processing/bundle.yaml index f114ebfea8..4c8db6274a 100644 --- a/bigtop-deploy/juju/spark-processing/bundle.yaml +++ b/bigtop-deploy/juju/spark-processing/bundle.yaml @@ -1,6 +1,6 @@ services: spark: - charm: "cs:xenial/spark-34" + charm: "cs:xenial/spark-38" constraints: "mem=7G root-disk=32G" num_units: 2 options: @@ -13,7 +13,7 @@ services: - "0" - "1" zookeeper: - charm: "cs:xenial/zookeeper-19" + charm: "cs:xenial/zookeeper-23" constraints: "mem=3G root-disk=32G" num_units: 3 annotations: diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/icon.svg b/bigtop-packages/src/charm/hbase/layer-hbase/icon.svg index 4da73521cb..c86bd67ecd 100644 --- a/bigtop-packages/src/charm/hbase/layer-hbase/icon.svg +++ b/bigtop-packages/src/charm/hbase/layer-hbase/icon.svg @@ -1,278 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - -