stackforge-attic/cookbook-monasca-schema
Code Issues Proposed changes

Link sub_alarm to sub_alarm_expression

Browse Source 
Linking sub_alarm to sub_alarm_expression allows the Threshhold engine
to change SubAlarms when the Alarm Definition is changed.

Also, increase size of dimension_name and value in the
sub_alarm_definition_dimension table to match what the API accepts

Remove the primary key from the sub_alarm_definition_dimension
table because increasing the size of dimension_name exceeds the
size thet mysql will accept for an index. This key isn't really
needed

Bump the cookbook revision

Change-Id: Ic2e84a24fe051eb46b98ed6ef57e28cccda80f53
This commit is contained in:
Craig Bryant 2014-10-20 11:25:06 -06:00
parent c12ba6a5bd
commit afa1f76678
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
files/default/mysql/mon.sql
View File

@ -119,9 +119,8 @@ CREATE TABLE `sub_alarm_definition` (
DROP TABLE IF EXISTS `sub_alarm_definition_dimension`;
CREATE TABLE `sub_alarm_definition_dimension` (
`sub_alarm_definition_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
`dimension_name` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
`value` varchar(300) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
PRIMARY KEY (`sub_alarm_definition_id`,`dimension_name`),
`dimension_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
`value` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
CONSTRAINT `fk_sub_alarm_definition_dimension` FOREIGN KEY (`sub_alarm_definition_id`) REFERENCES `sub_alarm_definition` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@ -129,12 +128,15 @@ 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 DEFAULT '',
`sub_expression_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
`expression` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
`created_at` datetime NOT NULL,
`updated_at` datetime NOT NULL,
PRIMARY KEY (`id`),
KEY `fk_sub_alarm` (`alarm_id`),
CONSTRAINT `fk_sub_alarm` FOREIGN KEY (`alarm_id`) REFERENCES `alarm` (`id`) ON DELETE CASCADE
KEY `fk_sub_alarm_expr` (`sub_expression_id`),
CONSTRAINT `fk_sub_alarm` FOREIGN KEY (`alarm_id`) REFERENCES `alarm` (`id`) ON DELETE CASCADE,
CONSTRAINT `fk_sub_alarm_expr` FOREIGN KEY (`sub_expression_id`) REFERENCES `sub_alarm_definition` (`id`)
);
DROP TABLE IF EXISTS `schema_migrations`;

2
metadata.rb
View File

@ -6,5 +6,5 @@ maintainer_email 'monasca@lists.launchpad.net'
license 'All rights reserved'
description 'Installs/Configures monasca_schema'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '0.1.4'
version '0.1.5'
depends 'influxdb'