x/monasca-vagrant
Code Issues Proposed changes

Clarified alarm_action table, changed ids to ints

Browse Source
This commit is contained in:
Tim Kuhlman 2014-03-17 12:12:10 -06:00
parent a3cb0e2f8a
commit f5f71151fd
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
files/default/mon.sql
View File

@ -5,7 +5,7 @@ SET foreign_key_checks = 0;
DROP TABLE IF EXISTS `alarm`;
CREATE TABLE `alarm` (
`id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL,
`id` INT NOT NULL,
`tenant_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL,
`name` varchar(250) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`expression` mediumtext COLLATE utf8mb4_unicode_ci,
@ -20,15 +20,16 @@ CREATE TABLE `alarm` (
DROP TABLE IF EXISTS `alarm_action`;
CREATE TABLE `alarm_action` (
`alarm_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL,
`action_id` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
PRIMARY KEY (`alarm_id`,`action_id`),
CONSTRAINT `alarm_action` FOREIGN KEY (`alarm_id`) REFERENCES `alarm` (`id`) ON DELETE CASCADE
`alarm_id` INT NOT NULL,
`notification_id` INT NOT NULL,
PRIMARY KEY (`alarm_id`,`notification_id`),
CONSTRAINT `fk_alarm_action_alarm_id` FOREIGN KEY (`alarm_id`) REFERENCES `alarm` (`id`) ON DELETE CASCADE,
CONSTRAINT `fk_alarm_action_notification_id` FOREIGN KEY (`notification_id`) REFERENCES `notification_method` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
DROP TABLE IF EXISTS `notification_method`;
CREATE TABLE `notification_method` (
`id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL,
`id` INT NOT NULL,
`tenant_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL,
`name` varchar(250) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`type` enum('EMAIL','SMS') COLLATE utf8mb4_unicode_ci NOT NULL,
@ -40,8 +41,8 @@ CREATE TABLE `notification_method` (
DROP TABLE IF EXISTS `sub_alarm`;
CREATE TABLE `sub_alarm` (
`id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL,
`alarm_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL,
`id` INT NOT NULL,
`alarm_id` INT NOT NULL,
`function` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL,
`metric_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`operator` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL,
@ -58,7 +59,7 @@ CREATE TABLE `sub_alarm` (
DROP TABLE IF EXISTS `sub_alarm_dimension`;
CREATE TABLE `sub_alarm_dimension` (
`sub_alarm_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL,
`sub_alarm_id` INT NOT NULL,
`dimension_name` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
`value` varchar(300) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
PRIMARY KEY (`sub_alarm_id`,`dimension_name`),

4
recipes/mysql_schema.rb
View File

@ -1,6 +1,6 @@
# Temporary way of loading in the mysql schema
bash 'maas_schema' do
bash 'mon_schema' do
action :nothing
code 'mysql -uroot -ppassword < /var/lib/mysql/mon.sql'
end
@ -15,7 +15,7 @@ cookbook_file '/var/lib/mysql/mon.sql' do
owner 'root'
group 'root'
source 'mon.sql'
notifies :run, "bash[maas_schema]"
notifies :run, "bash[mon_schema]"
end
cookbook_file '/var/lib/mysql/addr_validate.sql' do