Repository: ambari Updated Branches: refs/heads/trunk b3430e705 -> 70588f5e0
AMBARI-6791. Flume: FLUME_HANDLER should have cardinality of 1+ (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70588f5e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70588f5e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70588f5e Branch: refs/heads/trunk Commit: 70588f5e039df6ad4ecb7c9cfe82602fd88ef7ef Parents: b3430e7 Author: Nate Cole <[email protected]> Authored: Fri Aug 8 09:08:34 2014 -0400 Committer: Nate Cole <[email protected]> Committed: Fri Aug 8 13:01:20 2014 -0400 ---------------------------------------------------------------------- .../resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml | 2 +- .../HDP/2.0.6/services/GANGLIA/package/templates/rrd.py.j2 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/70588f5e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml index d3e489e..ce1fac7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml @@ -26,7 +26,7 @@ <component> <name>FLUME_HANDLER</name> <category>SLAVE</category> - <cardinality>0+</cardinality> + <cardinality>1+</cardinality> <commandScript> <script>scripts/flume_handler.py</script> <scriptType>PYTHON</scriptType> http://git-wip-us.apache.org/repos/asf/ambari/blob/70588f5e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/rrd.py.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/rrd.py.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/rrd.py.j2 index d4ded14..055c810 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/rrd.py.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/rrd.py.j2 @@ -122,10 +122,10 @@ def collectStatMetrics(clusterName, hostName, metricName, files, cf, start, end, if vals[i] is None: vals[i] = {} vals[i]['count'] = 0 - vals[i]['_sum'] = 0 - vals[i]['_avg'] = 0 - vals[i]['_min'] = 0 - vals[i]['_max'] = 0 + vals[i]['_sum'] = 0.0 + vals[i]['_avg'] = 0.0 + vals[i]['_min'] = 999999999999.99 + vals[i]['_max'] = 0.0 rawValue = tuple[0] vals[i]['step_value'] = rawValue
