From 30685b4c66c6b3fd3011c4bca75406f220642781 Mon Sep 17 00:00:00 2001 From: dipohl Date: Wed, 22 Feb 2017 20:59:43 +0100 Subject: [PATCH] Category Tree: Reduce number of categories slony -> db (postgresql) qpid -> webserver (apache) solr -> search (solr) --- plugins/{qpid => apache}/qpid_bytedepth | 2 +- plugins/{qpid => apache}/qpid_discardsring | 2 +- plugins/{qpid => apache}/qpid_enqueuebytes | 2 +- plugins/{qpid => apache}/qpid_enqueuecount | 2 +- plugins/{qpid => apache}/qpid_msgdepth | 2 +- plugins/{slony => postgresql}/slony_lag_events_ | 2 +- plugins/{slony => postgresql}/slony_lag_time | 2 +- plugins/{slony => postgresql}/slony_lag_time_ | 2 +- plugins/solr/solr | 2 +- plugins/solr/solr-stats | 2 +- plugins/solr/solr4_ | 14 +++++++------- plugins/solr/solrmulticore | 2 +- plugins/solr/wfsolr_ | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) rename plugins/{qpid => apache}/qpid_bytedepth (97%) rename plugins/{qpid => apache}/qpid_discardsring (97%) rename plugins/{qpid => apache}/qpid_enqueuebytes (97%) rename plugins/{qpid => apache}/qpid_enqueuecount (97%) rename plugins/{qpid => apache}/qpid_msgdepth (97%) rename plugins/{slony => postgresql}/slony_lag_events_ (98%) rename plugins/{slony => postgresql}/slony_lag_time (98%) rename plugins/{slony => postgresql}/slony_lag_time_ (98%) diff --git a/plugins/qpid/qpid_bytedepth b/plugins/apache/qpid_bytedepth similarity index 97% rename from plugins/qpid/qpid_bytedepth rename to plugins/apache/qpid_bytedepth index 43959fe8..e328f9d8 100755 --- a/plugins/qpid/qpid_bytedepth +++ b/plugins/apache/qpid_bytedepth @@ -31,7 +31,7 @@ for q in queues: output_queue.append(re.sub('[^a-zA-Z0-9_]', '_', q.name)) if len(sys.argv) > 1 and sys.argv[1] == "config": - print "graph_category Qpid"; + print "graph_category webserver"; print "graph_title Queue byte depth"; print "graph_vlabel bytes" for queue in output_queue: diff --git a/plugins/qpid/qpid_discardsring b/plugins/apache/qpid_discardsring similarity index 97% rename from plugins/qpid/qpid_discardsring rename to plugins/apache/qpid_discardsring index 62d85d1b..99be6ef8 100755 --- a/plugins/qpid/qpid_discardsring +++ b/plugins/apache/qpid_discardsring @@ -31,7 +31,7 @@ for q in queues: output_queue.append(re.sub('[^a-zA-Z0-9_]', '_', q.name)) if len(sys.argv) > 1 and sys.argv[1] == "config": - print "graph_category Qpid"; + print "graph_category webserver"; print "graph_title Ring queue discard rate"; print "graph_vlabel messages/second"; for queue in output_queue: diff --git a/plugins/qpid/qpid_enqueuebytes b/plugins/apache/qpid_enqueuebytes similarity index 97% rename from plugins/qpid/qpid_enqueuebytes rename to plugins/apache/qpid_enqueuebytes index 8afc420f..ec31f053 100755 --- a/plugins/qpid/qpid_enqueuebytes +++ b/plugins/apache/qpid_enqueuebytes @@ -31,7 +31,7 @@ for q in queues: output_queue.append(re.sub('[^a-zA-Z0-9_]', '_', q.name)) if len(sys.argv) > 1 and sys.argv[1] == "config": - print "graph_category Qpid"; + print "graph_category webserver"; print "graph_title Enqueue data rate"; print "graph_vlabel bytes/second" for queue in output_queue: diff --git a/plugins/qpid/qpid_enqueuecount b/plugins/apache/qpid_enqueuecount similarity index 97% rename from plugins/qpid/qpid_enqueuecount rename to plugins/apache/qpid_enqueuecount index 45420d89..478ad13c 100755 --- a/plugins/qpid/qpid_enqueuecount +++ b/plugins/apache/qpid_enqueuecount @@ -31,7 +31,7 @@ for q in queues: output_queue.append(re.sub('[^a-zA-Z0-9_]', '_', q.name)) if len(sys.argv) > 1 and sys.argv[1] == "config": - print "graph_category Qpid"; + print "graph_category webserver"; print "graph_title Enqueue message rate"; print "graph_vlabel messages/second" for queue in output_queue: diff --git a/plugins/qpid/qpid_msgdepth b/plugins/apache/qpid_msgdepth similarity index 97% rename from plugins/qpid/qpid_msgdepth rename to plugins/apache/qpid_msgdepth index 33143d00..08013ebe 100755 --- a/plugins/qpid/qpid_msgdepth +++ b/plugins/apache/qpid_msgdepth @@ -31,7 +31,7 @@ for q in queues: output_queue.append(re.sub('[^a-zA-Z0-9_]', '_', q.name)) if len(sys.argv) > 1 and sys.argv[1] == "config": - print "graph_category Qpid"; + print "graph_category webserver"; print "graph_title Queue message depth"; print "graph_vlabel messages" for queue in output_queue: diff --git a/plugins/slony/slony_lag_events_ b/plugins/postgresql/slony_lag_events_ similarity index 98% rename from plugins/slony/slony_lag_events_ rename to plugins/postgresql/slony_lag_events_ index 1e2a72ca..13d88f83 100755 --- a/plugins/slony/slony_lag_events_ +++ b/plugins/postgresql/slony_lag_events_ @@ -49,7 +49,7 @@ PGDATABASE=$(basename $0 | sed 's/^slony_lag_events_//g') if [ "$1" = "config" ]; then echo "graph_args --base 1000 -l 0" - echo "graph_category slony" + echo "graph_category db" echo "graph_info Slony st_lag_num_events for ${PGDATABASE}" echo "graph_title Slony lag events for ${PGDATABASE}" echo 'graph_vlabel event' diff --git a/plugins/slony/slony_lag_time b/plugins/postgresql/slony_lag_time similarity index 98% rename from plugins/slony/slony_lag_time rename to plugins/postgresql/slony_lag_time index fafee9be..3ba34422 100755 --- a/plugins/slony/slony_lag_time +++ b/plugins/postgresql/slony_lag_time @@ -49,7 +49,7 @@ PGDATABASE=$(basename $0 | sed 's/^slony_lag_time_//g') if [ "$1" = "config" ]; then echo "graph_args --base 1000 -l 0" - echo "graph_category slony" + echo "graph_category db" echo "graph_info Slony st_lag_time for ${PGDATABASE}" echo "graph_title Slony lag time for ${PGDATABASE}" echo "graph_vlabel \${graph_period}" diff --git a/plugins/slony/slony_lag_time_ b/plugins/postgresql/slony_lag_time_ similarity index 98% rename from plugins/slony/slony_lag_time_ rename to plugins/postgresql/slony_lag_time_ index 223e840b..c671f657 100755 --- a/plugins/slony/slony_lag_time_ +++ b/plugins/postgresql/slony_lag_time_ @@ -49,7 +49,7 @@ PGDATABASE=$(basename $0 | sed 's/^slony_lag_time_//g') if [ "$1" = "config" ]; then echo "graph_args --base 1000 -l 0" - echo "graph_category slony" + echo "graph_category db" echo "graph_info Slony st_lag_time for ${PGDATABASE}" echo "graph_title Slony lag time for ${PGDATABASE}" echo "graph_vlabel \${graph_period}" diff --git a/plugins/solr/solr b/plugins/solr/solr index f243d74e..647ea5e9 100755 --- a/plugins/solr/solr +++ b/plugins/solr/solr @@ -88,7 +88,7 @@ if len(sys.argv) > 1: print 'graph_title Solr %s' % params['valueName'] print 'graph_args -l 0 ' print 'graph_vlabel Size %s' % params['valueName'] - print 'graph_category Solr' + print 'graph_category search' print 'graph_info Info for cores: %s' % ( ",".join(params['cores'])) for core in params['cores']: diff --git a/plugins/solr/solr-stats b/plugins/solr/solr-stats index 9c3d84a6..e023d339 100755 --- a/plugins/solr/solr-stats +++ b/plugins/solr/solr-stats @@ -24,7 +24,7 @@ $property = $tabParams[4]; if('config' === $action) { - echo 'graph_category SolR ' . $core . "\n"; + echo 'graph_category search ' . $core . "\n"; echo 'graph_title ' . $item . ' ' . $property . "\n"; echo 'graph_vlabel ' . $property . "\n"; echo $core . $item . $property . 'solr.label ' . $property . "\n"; diff --git a/plugins/solr/solr4_ b/plugins/solr/solr4_ index 81b67430..247c0810 100755 --- a/plugins/solr/solr4_ +++ b/plugins/solr/solr4_ @@ -232,7 +232,7 @@ class SolrCoreMBean: # Graph Templates CACHE_GRAPH_TPL = """multigraph solr_{core}_{cacheType}_hit_rates -graph_category solr +graph_category search graph_title Solr {core} {cacheName} Hit rates graph_order lookups hits inserts graph_scale no @@ -256,7 +256,7 @@ hits.type DERIVE multigraph solr_{core}_{cacheType}_size graph_title Solr {core} {cacheName} Size graph_args -l 0 -graph_category solr +graph_category search graph_vlabel Size size.label Size size.draw LINE2 @@ -269,7 +269,7 @@ QPSMAIN_GRAPH_TPL = """graph_title Solr {core} {handler} Request per second graph_args --base 1000 -r --lower-limit 0 graph_scale no graph_vlabel request / second -graph_category solr +graph_category search graph_period second graph_order {gorder} {cores_qps_graphs}""" @@ -284,7 +284,7 @@ REQUESTTIMES_GRAPH_TPL = """multigraph {core}_requesttimes graph_title Solr {core} {handler} Time per request graph_args -l 0 graph_vlabel millis -graph_category solr +graph_category search savgtimeperrequest_{core}.label {core} Avg time per request savgtimeperrequest_{core}.type GAUGE savgtimeperrequest_{core}.graph yes @@ -299,12 +299,12 @@ s99thpcrequesttime_{core}.graph yes NUMDOCS_GRAPH_TPL = """graph_title Solr Docs %s graph_vlabel docs docs.label Docs -graph_category solr""" +graph_category search""" INDEXSIZE_GRAPH_TPL = """graph_args --base 1024 -l 0 graph_vlabel Bytes graph_title Index Size -graph_category solr +graph_category search graph_info Solr Index Size. graph_order {cores} {cores_config} @@ -318,7 +318,7 @@ INDEXSIZECORE_GRAPH_TPL = """{core}.label {core} MEMORYUSAGE_GRAPH_TPL = """graph_args --base 1024 -l 0 --upper-limit {availableram} graph_vlabel Bytes graph_title Solr memory usage -graph_category solr +graph_category search graph_info Solr Memory Usage. used.label Used max.label Max diff --git a/plugins/solr/solrmulticore b/plugins/solr/solrmulticore index 8eab6ece..7819e4cd 100755 --- a/plugins/solr/solrmulticore +++ b/plugins/solr/solrmulticore @@ -158,7 +158,7 @@ if len(sys.argv) > 1: print 'graph_title %s' % ( PLUGINOPTIONSLIST[params['valueName']]['label'] ) print "graph_args --base 1000"; print 'graph_vlabel Size %s' % params['valueName'] - print 'graph_category Solr' + print 'graph_category search' print 'graph_info Info for cores: %s' % ( ",".join(params['cores']) ) # Iterations for core datas diff --git a/plugins/solr/wfsolr_ b/plugins/solr/wfsolr_ index 5f71706a..fa5d5025 100755 --- a/plugins/solr/wfsolr_ +++ b/plugins/solr/wfsolr_ @@ -170,7 +170,7 @@ try { echo "graph_args --base 1024 -l 0\n"; } - echo "graph_category Solr $core\n"; + echo "graph_category search $core\n"; echo "graph_title $item $property\n"; echo "graph_vlabel $property\n"; if ($core !== null)