diff --git a/plugins/sensors/megaraid-hdd-temperature-using-megacli b/plugins/disk/megaraid-hdd-temperature-using-megacli similarity index 100% rename from plugins/sensors/megaraid-hdd-temperature-using-megacli rename to plugins/disk/megaraid-hdd-temperature-using-megacli diff --git a/plugins/sensors/esxi__sensors b/plugins/esx/esxi__sensors similarity index 100% rename from plugins/sensors/esxi__sensors rename to plugins/esx/esxi__sensors diff --git a/plugins/sensors/freeipmi b/plugins/ipmi/freeipmi similarity index 100% rename from plugins/sensors/freeipmi rename to plugins/ipmi/freeipmi diff --git a/plugins/snmp/snmp__poseidon-sensors b/plugins/poseidon/snmp__poseidon-sensors similarity index 100% rename from plugins/snmp/snmp__poseidon-sensors rename to plugins/poseidon/snmp__poseidon-sensors diff --git a/plugins/ups/apc_status b/plugins/power/apc_status similarity index 100% rename from plugins/ups/apc_status rename to plugins/power/apc_status diff --git a/plugins/ups/apcupsd_pct b/plugins/power/apcupsd_pct similarity index 100% rename from plugins/ups/apcupsd_pct rename to plugins/power/apcupsd_pct diff --git a/plugins/ups/apcupsd_ww b/plugins/power/apcupsd_ww similarity index 100% rename from plugins/ups/apcupsd_ww rename to plugins/power/apcupsd_ww diff --git a/plugins/ups/eatonups_ b/plugins/power/eatonups_ similarity index 100% rename from plugins/ups/eatonups_ rename to plugins/power/eatonups_ diff --git a/plugins/ups/nut b/plugins/power/nut similarity index 100% rename from plugins/ups/nut rename to plugins/power/nut diff --git a/plugins/ups/nutups2_ b/plugins/power/nutups2_ similarity index 100% rename from plugins/ups/nutups2_ rename to plugins/power/nutups2_ diff --git a/plugins/ups/snmp__apc_ups b/plugins/power/snmp__apc_ups similarity index 100% rename from plugins/ups/snmp__apc_ups rename to plugins/power/snmp__apc_ups diff --git a/plugins/ups/snmp__ipoman_ b/plugins/power/snmp__ipoman_ similarity index 100% rename from plugins/ups/snmp__ipoman_ rename to plugins/power/snmp__ipoman_ diff --git a/plugins/snmp/snmp__sentry b/plugins/power/snmp__sentry similarity index 100% rename from plugins/snmp/snmp__sentry rename to plugins/power/snmp__sentry diff --git a/plugins/ups/snmp__ups_ b/plugins/power/snmp__ups_ similarity index 100% rename from plugins/ups/snmp__ups_ rename to plugins/power/snmp__ups_ diff --git a/plugins/ups/upsmonpro_ b/plugins/power/upsmonpro_ similarity index 100% rename from plugins/ups/upsmonpro_ rename to plugins/power/upsmonpro_ diff --git a/plugins/snmp/snmp__sfsnmp_fan b/plugins/sfsnmp/snmp__sfsnmp_fan similarity index 100% rename from plugins/snmp/snmp__sfsnmp_fan rename to plugins/sfsnmp/snmp__sfsnmp_fan diff --git a/plugins/snmp/snmp__sfsnmp_temp b/plugins/sfsnmp/snmp__sfsnmp_temp similarity index 100% rename from plugins/snmp/snmp__sfsnmp_temp rename to plugins/sfsnmp/snmp__sfsnmp_temp diff --git a/plugins/snmp/snmp__sfsnmp_volt b/plugins/sfsnmp/snmp__sfsnmp_volt similarity index 100% rename from plugins/snmp/snmp__sfsnmp_volt rename to plugins/sfsnmp/snmp__sfsnmp_volt diff --git a/plugins/weather/buienradar_ b/plugins/weather/buienradar_ index 9d740b9d..663b3cd0 100755 --- a/plugins/weather/buienradar_ +++ b/plugins/weather/buienradar_ @@ -108,7 +108,7 @@ if($stationName eq "") { # Output for config if(defined $ARGV[0] && $ARGV[0] eq 'config') { print "graph_title ".$stationName."\n"; - print "graph_category Weather\n"; + print "graph_category sensors\n"; if($LAN eq "nl") { # Dutch Language if($TMP eq "yes") { print "tmp.label Temperatuur (C)\n"; } @@ -181,4 +181,4 @@ sub print_stations { ." [6319] Terneuzen (Station Westdorpe) [6248] Hoorn (Station Wijdenes)\n" ." [6257] Wijk aan Zee (Station Wijk aan Zee) [6340] Woensdrecht (Station Woensdrecht)\n" ." [6239] Noordzee (Station Zeeplatform F-3) [6252] Noordzee (Station Zeeplatform K13)\n"; -} \ No newline at end of file +} diff --git a/plugins/sensors/humidity-sensor b/plugins/weather/humidity-sensor similarity index 100% rename from plugins/sensors/humidity-sensor rename to plugins/weather/humidity-sensor diff --git a/plugins/weather/openweather_ b/plugins/weather/openweather_ index 0a045607..45b9610d 100755 --- a/plugins/weather/openweather_ +++ b/plugins/weather/openweather_ @@ -34,7 +34,7 @@ then multigraph $plugin_name graph_title Temperature in ${CITY} graph_vlabel Celsius - graph_category weather + graph_category sensors graph_info This graph show the temperature in ${CITY} temp_avg.label avg temp_avg.cdef $KELVIN_BIAS,- @@ -42,7 +42,7 @@ then multigraph $plugin_name.temp graph_title Temperature in ${CITY} graph_vlabel Celsius - graph_category weather + graph_category sensors graph_info This graph show the temperature in ${CITY} temp_avg.label avg temp_avg.cdef $KELVIN_BIAS,- @@ -54,28 +54,28 @@ then multigraph $plugin_name.humidity graph_title Humidity in ${CITY} graph_vlabel % - graph_category weather + graph_category sensors graph_info This graph show the humidity in ${CITY} humidity.label humidity multigraph $plugin_name.pressure graph_title Pressure in ${CITY} graph_vlabel hPa - graph_category weather + graph_category sensors graph_info This graph show the pressure in ${CITY} pressure.label pressure multigraph $plugin_name.wind_speed graph_title Wind Speed in ${CITY} graph_vlabel m/s - graph_category weather + graph_category sensors graph_info This graph show the wind speed in ${CITY} speed.label wind speed multigraph $plugin_name.wind_direction graph_title Wind direction in ${CITY} graph_vlabel m/s - graph_category weather + graph_category sensors graph_info This graph show the wind direction in ${CITY} direction.label wind direction EOF diff --git a/plugins/weather/weather_press_ b/plugins/weather/weather_press_ index 5dc79358..b5dc8623 100755 --- a/plugins/weather/weather_press_ +++ b/plugins/weather/weather_press_ @@ -32,7 +32,7 @@ elif len(sys.argv) == 2 and sys.argv[1] == "config": print 'graph_title Atmospheric pressure at code %s' % code print 'graph_vlabel Pressure in hPa' - print 'graph_category Weather' + print 'graph_category sensors' print 'pressure.label Pressure' print 'pressure.type GAUGE' diff --git a/plugins/weather/weather_temp_ b/plugins/weather/weather_temp_ index 01c57494..eee22379 100755 --- a/plugins/weather/weather_temp_ +++ b/plugins/weather/weather_temp_ @@ -32,7 +32,7 @@ elif len(sys.argv) == 2 and sys.argv[1] == "config": print 'graph_title Temperature and Dew Point at code %s' % code print 'graph_vlabel Temperature and Dew Point in C' - print 'graph_category Weather' + print 'graph_category sensors' print 'temperature.label Temperature' print 'dewpoint.label Dew Point' diff --git a/plugins/sensors/wfrog b/plugins/weather/wfrog similarity index 100% rename from plugins/sensors/wfrog rename to plugins/weather/wfrog