Modified: trunk/opsview-core/bin/db_opsview
===================================================================
--- trunk/opsview-core/bin/db_opsview 2012-07-17 11:55:59 UTC (rev 9578)
+++ trunk/opsview-core/bin/db_opsview 2012-07-17 13:14:11 UTC (rev 9579)
@@ -784,6 +784,7 @@
public BOOLEAN DEFAULT 0 NOT NULL,
show_contextual_menus BOOLEAN DEFAULT 1 NOT NULL,
uncommitted BOOLEAN DEFAULT 0 NOT NULL,
+ exclude_handled BOOLEAN DEFAULT 0 NOT NULL,
PRIMARY KEY (id),
UNIQUE (name),
INDEX enabled (enabled, id, public) # For viewport summary pages
@@ -1214,7 +1215,7 @@
INSERT INTO schema_version (major_release, version) VALUES ('3.9', '27');
INSERT INTO schema_version (major_release, version) VALUES ('3.11', '15');
INSERT INTO schema_version (major_release, version) VALUES ('3.13', '11');
- INSERT INTO schema_version (major_release, version) VALUES ('3.15', '9');
+ INSERT INTO schema_version (major_release, version) VALUES ('3.15', '10');
EOF
Modified: trunk/opsview-core/installer/upgradedb_opsview.pl
===================================================================
--- trunk/opsview-core/installer/upgradedb_opsview.pl 2012-07-17 11:55:59 UTC (rev 9578)
+++ trunk/opsview-core/installer/upgradedb_opsview.pl 2012-07-17 13:14:11 UTC (rev 9579)
@@ -4585,6 +4585,14 @@
$db->updated;
}
+if ( $db->is_lower("3.15.10") ) {
+ $db->print( "Add exclude_handled to keywords" );
+ $dbh->do(
+ 'ALTER TABLE keywords ADD exclude_handled BOOLEAN NOT NULL DEFAULT 0'
+ );
+ $db->updated;
+}
+
# PLACEHOLDER
# For future upgrade of Opsview Core where you cannot have an automatic Opsview reload
# We mark this upgrade lock file so that post installs do not generate an unactivated configuration
Modified: trunk/opsview-core/lib/Opsview/Keyword.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/Keyword.pm 2012-07-17 11:55:59 UTC (rev 9578)
+++ trunk/opsview-core/lib/Opsview/Keyword.pm 2012-07-17 13:14:11 UTC (rev 9579)
@@ -26,8 +26,9 @@
__PACKAGE__->table( "keywords" );
-__PACKAGE__->columns( Primary => qw/id/ );
-__PACKAGE__->columns( Essential => qw/name description enabled style/ );
+__PACKAGE__->columns( Primary => qw/id/ );
+__PACKAGE__->columns(
+ Essential => qw/name description enabled style exclude_handled/ );
__PACKAGE__->columns( Stringify => qw/name/ );
Modified: trunk/opsview-core/lib/Opsview/Schema/Keywords.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/Schema/Keywords.pm 2012-07-17 11:55:59 UTC (rev 9578)
+++ trunk/opsview-core/lib/Opsview/Schema/Keywords.pm 2012-07-17 13:14:11 UTC (rev 9579)
@@ -79,6 +79,13 @@
is_nullable => 0,
size => 1
},
+ "exclude_handled",
+ {
+ data_type => "TINYINT",
+ default_value => 0,
+ is_nullable => 0,
+ size => 1
+ },
);
__PACKAGE__->set_primary_key( "id" );
__PACKAGE__->add_unique_constraint( "name", ["name"] );
Modified: trunk/opsview-core/t/var/opsview.test.db
===================================================================
--- trunk/opsview-core/t/var/opsview.test.db 2012-07-17 11:55:59 UTC (rev 9578)
+++ trunk/opsview-core/t/var/opsview.test.db 2012-07-17 13:14:11 UTC (rev 9579)
@@ -1176,6 +1176,7 @@
`public` tinyint(1) NOT NULL DEFAULT '0',
`show_contextual_menus` tinyint(1) NOT NULL DEFAULT '1',
`uncommitted` tinyint(1) NOT NULL DEFAULT '0',
+ `exclude_handled` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`),
KEY `enabled_id_public` (`enabled`,`id`,`public`)
@@ -1184,15 +1185,15 @@
LOCK TABLES `keywords` WRITE;
/*!40000 ALTER TABLE `keywords` DISABLE KEYS */;
-INSERT INTO `keywords` VALUES (1,'cloneable','cloneable devices',0,'group_by_host',0,0,1,0,0);
-INSERT INTO `keywords` VALUES (2,'cisco','cisco devices',1,'group_by_host',0,0,1,0,0);
-INSERT INTO `keywords` VALUES (3,'cisco_gp1','cisco devices, group 1',1,'group_by_host',0,0,1,1,0);
-INSERT INTO `keywords` VALUES (4,'cisco_gp2','Not public keyword',1,'group_by_host',0,0,0,0,0);
-INSERT INTO `keywords` VALUES (5,'disabled',NULL,0,NULL,0,0,1,0,0);
-INSERT INTO `keywords` VALUES (6,'alphaearly','Should not display in list of keywords on viewport summary',1,'group_by_host',0,0,1,0,0);
-INSERT INTO `keywords` VALUES (7,'allhosts',NULL,0,NULL,1,0,1,0,0);
-INSERT INTO `keywords` VALUES (8,'allservicechecks',NULL,0,NULL,0,1,1,0,0);
-INSERT INTO `keywords` VALUES (9,'allhandled','All services handled',1,'errors_and_host_cells',0,0,1,0,0);
+INSERT INTO `keywords` VALUES (1,'cloneable','cloneable devices',0,'group_by_host',0,0,1,0,0,0);
+INSERT INTO `keywords` VALUES (2,'cisco','cisco devices',1,'group_by_host',0,0,1,0,0,0);
+INSERT INTO `keywords` VALUES (3,'cisco_gp1','cisco devices, group 1',1,'group_by_host',0,0,1,1,0,0);
+INSERT INTO `keywords` VALUES (4,'cisco_gp2','Not public keyword',1,'group_by_host',0,0,0,0,0,0);
+INSERT INTO `keywords` VALUES (5,'disabled',NULL,0,NULL,0,0,1,0,0,0);
+INSERT INTO `keywords` VALUES (6,'alphaearly','Should not display in list of keywords on viewport summary',1,'group_by_host',0,0,1,0,0,0);
+INSERT INTO `keywords` VALUES (7,'allhosts',NULL,0,NULL,1,0,1,0,0,0);
+INSERT INTO `keywords` VALUES (8,'allservicechecks',NULL,0,NULL,0,1,1,0,0,0);
+INSERT INTO `keywords` VALUES (9,'allhandled','All services handled',1,'errors_and_host_cells',0,0,1,0,0,0);
/*!40000 ALTER TABLE `keywords` ENABLE KEYS */;
UNLOCK TABLES;
@@ -2059,7 +2060,7 @@
INSERT INTO `schema_version` VALUES ('3.9','27');
INSERT INTO `schema_version` VALUES ('3.11','15');
INSERT INTO `schema_version` VALUES ('3.13','11');
-INSERT INTO `schema_version` VALUES ('3.15','9');
+INSERT INTO `schema_version` VALUES ('3.15','10');
/*!40000 ALTER TABLE `schema_version` ENABLE KEYS */;
UNLOCK TABLES;
@@ -2176,8 +2177,8 @@
`event_handler` varchar(255) NOT NULL DEFAULT '',
`disable_name_change` tinyint(4) NOT NULL DEFAULT '0',
`dependency_level` tinyint(4) NOT NULL DEFAULT '0',
- `sensitive_arguments` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`id`),
+ `sensitive_arguments` tinyint(1) NOT NULL DEFAULT '1',
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`),
KEY `servicegroup` (`servicegroup`),
KEY `plugin` (`plugin`),
