Modified: trunk/opsview-core/bin/db_opsview
===================================================================
--- trunk/opsview-core/bin/db_opsview 2013-08-14 10:54:33 UTC (rev 13230)
+++ trunk/opsview-core/bin/db_opsview 2013-08-14 11:04:03 UTC (rev 13231)
@@ -1234,6 +1234,7 @@
INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130219hsteh', 'install', NOW());
INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130424alerts', 'install', NOW());
INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130521notmeth', 'install', NOW());
+ INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130814surv', 'install', NOW());
EOF
populate_db
Modified: trunk/opsview-core/import/initial_opsview.sql
===================================================================
--- trunk/opsview-core/import/initial_opsview.sql 2013-08-14 10:54:33 UTC (rev 13230)
+++ trunk/opsview-core/import/initial_opsview.sql 2013-08-14 11:04:03 UTC (rev 13231)
@@ -223,7 +223,7 @@
LOCK TABLES `systempreferences` WRITE;
/*!40000 ALTER TABLE `systempreferences` DISABLE KEYS */;
-INSERT INTO `systempreferences` (`id`, `default_statusmap_layout`, `default_statuswrl_layout`, `refresh_rate`, `log_notifications`, `log_service_retries`, `log_host_retries`, `log_event_handlers`, `log_initial_states`, `log_external_commands`, `log_passive_checks`, `daemon_dumps_core`, `audit_log_retention`, `hostgroup_info_url`, `host_info_url`, `service_info_url`, `enable_odw_import`, `enable_full_odw_import`, `odw_large_retention_months`, `odw_small_retention_months`, `opsview_server_name`, `soft_state_dependencies`, `show_timeline`, `smart_hosttemplate_removal`, `rancid_email_notification`, `viewport_summary_style`, `send_anon_data`, `uuid`, `netdisco_url`, `updates_includemajor`, `date_format`, `set_downtime_on_host_delete`) VALUES (1,4,2,30,1,1,1,1,0,1,0,0,365,'','','',0,0,2,12,'',1,1,0,NULL,'list',1,'','',0,'iso8601',1);
+INSERT INTO `systempreferences` (`id`, `default_statusmap_layout`, `default_statuswrl_layout`, `refresh_rate`, `log_notifications`, `log_service_retries`, `log_host_retries`, `log_event_handlers`, `log_initial_states`, `log_external_commands`, `log_passive_checks`, `daemon_dumps_core`, `audit_log_retention`, `hostgroup_info_url`, `host_info_url`, `service_info_url`, `enable_odw_import`, `enable_full_odw_import`, `odw_large_retention_months`, `odw_small_retention_months`, `opsview_server_name`, `soft_state_dependencies`, `show_timeline`, `smart_hosttemplate_removal`, `rancid_email_notification`, `viewport_summary_style`, `send_anon_data`, `uuid`, `netdisco_url`, `updates_includemajor`, `date_format`, `set_downtime_on_host_delete`) VALUES (1,4,2,30,1,1,1,1,0,1,0,0,365,'','','',0,0,2,12,'',1,1,0,NULL,'list',1,'','',1,'iso8601',1);
/*!40000 ALTER TABLE `systempreferences` ENABLE KEYS */;
UNLOCK TABLES;
Modified: trunk/opsview-core/installer/upgradedb_opsview.pl
===================================================================
--- trunk/opsview-core/installer/upgradedb_opsview.pl 2013-08-14 10:54:33 UTC (rev 13230)
+++ trunk/opsview-core/installer/upgradedb_opsview.pl 2013-08-14 11:04:03 UTC (rev 13231)
@@ -4750,6 +4750,17 @@
$db->updated;
}
+# This should not be added to Commercial!!!!
+# Earlier Core was disabling include_major incorrectly, so we set that too
+unless (
+ $db->is_installed( '20130814surv', "Set survey to always send", 'all' ) )
+{
+ $dbh->do(
+ q[ UPDATE systempreferences SET send_anon_data=1, updates_includemajor=1 ]
+ );
+ $db->updated;
+}
+
# end of updates
if ( $postupdate->{regenerate_hostgroups_lft_rgt} ) {
$db->print( "Regenerating host group information" );
Modified: trunk/opsview-core/t/var/opsview.test.db
===================================================================
--- trunk/opsview-core/t/var/opsview.test.db 2013-08-14 10:54:33 UTC (rev 13230)
+++ trunk/opsview-core/t/var/opsview.test.db 2013-08-14 11:04:03 UTC (rev 13231)
@@ -2069,6 +2069,7 @@
INSERT INTO `schema_version` VALUES ('20130221snmpthro','all','Increasing the size of snmp.throughput_*','2013-02-21 15:30:52',0);
INSERT INTO `schema_version` VALUES ('20130424alerts','all','Support for limiting notification alerts','2013-04-24 11:14:58',0);
INSERT INTO `schema_version` VALUES ('20130521notmeth','all','New notitication method on master','2013-05-21 14:19:29',0);
+INSERT INTO `schema_version` VALUES ('20130814surv','all','Set survey to always send','2013-06-30 16:38:26',0);
INSERT INTO `schema_version` VALUES ('3.0','4',NULL,NULL,NULL);
INSERT INTO `schema_version` VALUES ('3.1','4',NULL,NULL,NULL);
INSERT INTO `schema_version` VALUES ('3.11','15',NULL,NULL,NULL);
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Systempreference.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Systempreference.pm 2013-08-14 10:54:33 UTC (rev 13230)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Systempreference.pm 2013-08-14 11:04:03 UTC (rev 13231)
@@ -38,8 +38,6 @@
daemon_dumps_core => 0,
date_format => 0,
soft_state_dependencies => 0,
- updates_includemajor => 0,
- send_anon_data => 0,
show_timeline => 0,
smart_hosttemplate_removal => 0,
set_downtime_on_host_delete => 0,
@@ -59,7 +57,7 @@
$c->stash( title_description => $c->loc("ui.objecttype.systempreference")
);
$self->next::method( $c, 1 );
- my $tabs = [qw(Web Updates Nagios)];
+ my $tabs = [qw(Web Nagios)];
$c->stash( tabs => $tabs );
}
