Modified: trunk/opsview-core/bin/create_opspack
===================================================================
--- trunk/opsview-core/bin/create_opspack 2013-02-21 18:04:16 UTC (rev 11574)
+++ trunk/opsview-core/bin/create_opspack 2013-02-21 19:08:30 UTC (rev 11575)
@@ -468,7 +468,7 @@
close F;
print "Created config.json\n";
-if ( !-e "info" ) {
+if ( !-e "$norm_hosttemplate_dir/info" ) {
open F, ">", "$norm_hosttemplate_dir/info"
or my_die( "Cannot open $norm_hosttemplate_dir/info for writing" );
print F <<"EOF";
Modified: trunk/opsview-core/import/opspacks_source/snmp-mib-ii/config.json
===================================================================
--- trunk/opsview-core/import/opspacks_source/snmp-mib-ii/config.json 2013-02-21 18:04:16 UTC (rev 11574)
+++ trunk/opsview-core/import/opspacks_source/snmp-mib-ii/config.json 2013-02-21 19:08:30 UTC (rev 11575)
@@ -63,7 +63,7 @@
"alert_from_failure" : "1",
"args" : "-H $HOSTADDRESS$ -C $SNMP_COMMUNITY$",
"attribute" : null,
- "calculate_rate" : null,
+ "calculate_rate" : "no",
"cascaded_from" : null,
"check_attempts" : "3",
"check_freshness" : "0",
@@ -251,7 +251,7 @@
"alert_from_failure" : "1",
"args" : "-H $HOSTNAME$",
"attribute" : null,
- "calculate_rate" : null,
+ "calculate_rate" : "no",
"cascaded_from" : null,
"check_attempts" : "3",
"check_freshness" : "0",
@@ -298,7 +298,7 @@
"alert_from_failure" : "1",
"args" : "-H $HOSTADDRESS$ -C $SNMP_COMMUNITY$",
"attribute" : null,
- "calculate_rate" : null,
+ "calculate_rate" : "",
"cascaded_from" : null,
"check_attempts" : "3",
"check_freshness" : "0",
@@ -308,7 +308,11 @@
},
"critical_comparison" : null,
"critical_value" : null,
- "dependencies" : [],
+ "dependencies" : [
+ {
+ "name" : "SNMP Agent"
+ }
+ ],
"description" : "Raises an alerts if status for any interface changes (up / down)",
"event_handler" : "",
"flap_detection_enabled" : "1",
@@ -341,7 +345,7 @@
"alert_from_failure" : "1",
"args" : "-H $HOSTADDRESS$ -C $SNMP_COMMUNITY$",
"attribute" : null,
- "calculate_rate" : null,
+ "calculate_rate" : "no",
"cascaded_from" : {
"name" : "Uptime poller"
},
@@ -359,7 +363,6 @@
"flap_detection_enabled" : "1",
"freshness_type" : "renotify",
"invertresults" : "0",
- "keywords" : [],
"label" : null,
"level" : 0,
"markdown_filter" : "0",
@@ -397,7 +400,11 @@
},
"critical_comparison" : null,
"critical_value" : null,
- "dependencies" : [],
+ "dependencies" : [
+ {
+ "name" : "SNMP Agent"
+ }
+ ],
"description" : "Uptime poller",
"event_handler" : "",
"flap_detection_enabled" : "1",
Modified: trunk/opsview-core/import/opspacks_source/snmp-mib-ii/info
===================================================================
--- trunk/opsview-core/import/opspacks_source/snmp-mib-ii/info 2013-02-21 18:04:16 UTC (rev 11574)
+++ trunk/opsview-core/import/opspacks_source/snmp-mib-ii/info 2013-02-21 19:08:30 UTC (rev 11575)
@@ -1,5 +1,5 @@
NAME=com.opsview.opspack.snmp_mib_ii
-VERSION=2.0
+VERSION=2.1
ALIAS=SNMP - MIB-II
DEPENDENCIES=
OPSVIEW_MIN_VERSION=
Modified: trunk/opsview-core/utils/parse_config_json
===================================================================
--- trunk/opsview-core/utils/parse_config_json 2013-02-21 18:04:16 UTC (rev 11574)
+++ trunk/opsview-core/utils/parse_config_json 2013-02-21 19:08:30 UTC (rev 11575)
@@ -52,6 +52,12 @@
my $files = File::Next::files($opspacks_dir);
while ( defined( my $file = $files->() ) ) {
+
+ if ( $file =~ m%/Makefile$% ) {
+ unlink $file;
+ next;
+ }
+
next unless $file =~ m%/config.json$%;
# Ignore opsview opspacks
