svn commit: r1441251 - in /incubator/ambari/trunk: CHANGES.txt ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh

[js...@apache.org]

Author: jspeidel
Date: Thu Jan 31 23:09:44 2013
New Revision: 1441251

URL: http://svn.apache.org/viewvc?rev=1441251&view=rev
Log:
AMBARI-1164. Fix disk info ganglia metric

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1441251&r1=1441250&r2=1441251&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Jan 31 23:09:44 2013
@@ -221,6 +221,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1164. Disk info ganglia metrics is broken for some OS. (Dmytro Shkvyra via jspeidel)
+
  AMBARI-1325. Left border is missing from the main nav. (srimanth)
  
  AMBARI-1324. Job Browser default sort order should be Run Date DESC. (srimanth)

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh?rev=1441251&r1=1441250&r2=1441251&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh Thu Jan 31 23:09:44 2013
@@ -220,6 +220,19 @@ collection_group {
   }
 }
 
+/* This collection group will send general info about this host total memory every
+   180 secs.
+   This information doesn't change between reboots and is only collected
+   once. This information needed for heatmap showing */
+ collection_group {
+   collect_once = yes
+   time_threshold = 180
+   metric {
+    name = "mem_total"
+    title = "Memory Total"
+   }
+ }
+
 /* This collection group will send general info about this host every
    1200 secs.
    This information doesn't change between reboots and is only collected
@@ -235,10 +248,6 @@ collection_group {
     name = "cpu_speed"
     title = "CPU Speed"
   }
-  metric {
-    name = "mem_total"
-    title = "Memory Total"
-  }
   /* Should this be here? Swap can be added/removed between reboots. */
   metric {
     name = "swap_total"
@@ -426,16 +435,6 @@ collection_group {
   }
 }
 
-/* Different than 2.5.x default since the old config made no sense */
-collection_group {
-  collect_every = 1800
-  time_threshold = 3600
-  metric {
-    name = "disk_total"
-    value_threshold = 1.0
-    title = "Total Disk Space"
-  }
-}
 
 collection_group {
   collect_every = 40
@@ -450,6 +449,11 @@ collection_group {
     value_threshold = 1.0
     title = "Maximum Disk Space Used"
   }
+  metric {
+    name = "disk_total"
+    value_threshold = 1.0
+    title = "Total Disk Space"
+  }
 }
 
 include ("${GANGLIA_CONF_DIR}/${gmondClusterName}/conf.d/*.conf")