You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/05/29 21:52:27 UTC

git commit: SLIDER-108. Clean up metrics name and add separate quick links for gweb

Repository: incubator-slider
Updated Branches:
  refs/heads/develop a363abe67 -> 429ae0094


SLIDER-108. Clean up metrics name and add separate quick links for gweb


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/429ae009
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/429ae009
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/429ae009

Branch: refs/heads/develop
Commit: 429ae0094c6789aa9f70430aaceab3331c2b6fae
Parents: a363abe
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu May 29 12:52:10 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu May 29 12:52:10 2014 -0700

----------------------------------------------------------------------
 app-packages/accumulo-v1_5/jmx_metrics.json   | 16 ++++++++--------
 app-packages/hbase-v0_96/jmx_metrics.json     |  6 +++---
 app-packages/hbase-v0_96/metainfo.xml         |  4 ++++
 app-packages/storm-v0_91/ganglia_metrics.json |  2 +-
 app-packages/storm-v0_91/jmx_metrics.json     |  4 ++--
 app-packages/storm-v0_91/metainfo.xml         |  4 ++++
 6 files changed, 22 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/429ae009/app-packages/accumulo-v1_5/jmx_metrics.json
----------------------------------------------------------------------
diff --git a/app-packages/accumulo-v1_5/jmx_metrics.json b/app-packages/accumulo-v1_5/jmx_metrics.json
index 05a1bd9..cf410d8 100644
--- a/app-packages/accumulo-v1_5/jmx_metrics.json
+++ b/app-packages/accumulo-v1_5/jmx_metrics.json
@@ -1,41 +1,41 @@
 {
     "Component": {
         "ACCUMULO_MASTER": {
-            "masterGoalState": {
+            "MasterGoalState": {
                 "metric": "/stats/masterGoalState",
                 "pointInTime": true,
                 "temporal": false
             },
-            "masterState": {
+            "MasterState": {
                 "metric": "/stats/masterState",
                 "pointInTime": true,
                 "temporal": false
             },
-            "deadTabletServers": {
+            "DeadTabletServers": {
                 "metric": "/stats/deadTabletServers",
                 "pointInTime": true,
                 "temporal": false
             },
-            "totals_ingestrate": {
+            "TotalIngestRate": {
                 "metric": "/stats/totals/ingestrate",
                 "pointInTime": true,
                 "temporal": false
             },
-            "totals_queryrate": {
+            "TotalQueryRate": {
                 "metric": "/stats/totals/queryrate",
                 "pointInTime": true,
                 "temporal": false
             },
-            "totals_diskrate": {
+            "TotalDiskRate": {
                 "metric": "/stats/totals/diskrate",
                 "pointInTime": true,
                 "temporal": false
             },
-            "badTabletServers": {
+            "BadTabletServers": {
                 "metric": "/stats/badTabletServers",
                 "pointInTime": true,
                 "temporal": false
             }
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/429ae009/app-packages/hbase-v0_96/jmx_metrics.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase-v0_96/jmx_metrics.json b/app-packages/hbase-v0_96/jmx_metrics.json
index ca980a9..ac0640e 100644
--- a/app-packages/hbase-v0_96/jmx_metrics.json
+++ b/app-packages/hbase-v0_96/jmx_metrics.json
@@ -1,7 +1,7 @@
 {
     "Component": {
         "HBASE_MASTER": {
-            "metricAverageLoad": {
+            "MetricAverageLoad": {
                 "metric": "Hadoop:service=HBase,name=Master,sub=Server.averageLoad",
                 "pointInTime": true,
                 "temporal": false
@@ -46,11 +46,11 @@
                 "pointInTime": true,
                 "temporal": false
             },
-            "cluster_requests": {
+            "ClusterRequests": {
                 "metric": "Hadoop:service=HBase,name=Master,sub=Server.clusterRequests",
                 "pointInTime": true,
                 "temporal": false
             }
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/429ae009/app-packages/hbase-v0_96/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-v0_96/metainfo.xml b/app-packages/hbase-v0_96/metainfo.xml
index e5bcdc9..7eb6867 100644
--- a/app-packages/hbase-v0_96/metainfo.xml
+++ b/app-packages/hbase-v0_96/metainfo.xml
@@ -45,6 +45,10 @@
               <name>org.apache.slider.metrics</name>
               <value>http://${site.global.ganglia_server_host}/cgi-bin/rrd.py?c=${site.global.ganglia_server_id}</value>
             </export>
+            <export>
+              <name>org.apache.slider.ganglia</name>
+              <value>http://${site.global.ganglia_server_host}/ganglia?c=${site.global.ganglia_server_id}</value>
+            </export>
           </exports>
         </exportGroup>
       </exportGroups>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/429ae009/app-packages/storm-v0_91/ganglia_metrics.json
----------------------------------------------------------------------
diff --git a/app-packages/storm-v0_91/ganglia_metrics.json b/app-packages/storm-v0_91/ganglia_metrics.json
index 478649b..861c4fa 100644
--- a/app-packages/storm-v0_91/ganglia_metrics.json
+++ b/app-packages/storm-v0_91/ganglia_metrics.json
@@ -1,6 +1,6 @@
 {
     "Component": {
-        "NIMBUS_SERVER": {
+        "NIMBUS": {
             "totalslots": {
                 "metric": "Total Slots",
                 "pointInTime": false,

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/429ae009/app-packages/storm-v0_91/jmx_metrics.json
----------------------------------------------------------------------
diff --git a/app-packages/storm-v0_91/jmx_metrics.json b/app-packages/storm-v0_91/jmx_metrics.json
index fa97527..f7d4e60 100644
--- a/app-packages/storm-v0_91/jmx_metrics.json
+++ b/app-packages/storm-v0_91/jmx_metrics.json
@@ -1,6 +1,6 @@
 {
     "Component": {
-        "NIMBUS_SERVER": {
+        "NIMBUS": {
             "FreeSlots": {
                 "metric": "$['slots.free']",
                 "pointInTime": true,
@@ -28,4 +28,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/429ae009/app-packages/storm-v0_91/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-v0_91/metainfo.xml b/app-packages/storm-v0_91/metainfo.xml
index 9913d8c..2b10c52 100644
--- a/app-packages/storm-v0_91/metainfo.xml
+++ b/app-packages/storm-v0_91/metainfo.xml
@@ -40,6 +40,10 @@
               <name>org.apache.slider.metrics</name>
               <value>http://${site.global.ganglia_server_host}/cgi-bin/rrd.py?c=${site.global.ganglia_server_id}</value>
             </export>
+            <export>
+              <name>org.apache.slider.ganglia</name>
+              <value>http://${site.global.ganglia_server_host}/ganglia?c=${site.global.ganglia_server_id}</value>
+            </export>
           </exports>
         </exportGroup>
       </exportGroups>