From 816b9697412cfc6a64605448166d2d7a68915fe9 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Thu, 6 Sep 2018 16:48:18 +0200 Subject: [PATCH 1/3] Added table tlog_graph_models --- pandora_console/extras/mr/20.sql | 9 +++++++++ .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 12 ++++++++++++ pandora_console/pandoradb.sql | 12 ++++++++++++ 3 files changed, 33 insertions(+) diff --git a/pandora_console/extras/mr/20.sql b/pandora_console/extras/mr/20.sql index 94e55dcf83..8b903e45ba 100644 --- a/pandora_console/extras/mr/20.sql +++ b/pandora_console/extras/mr/20.sql @@ -16,4 +16,13 @@ ALTER TABLE `tlayout_template_data` ADD COLUMN `linked_layout_status_type` ENUM ALTER TABLE `tlayout_template_data` ADD COLUMN `linked_layout_status_as_service_warning` FLOAT(20, 3) NOT NULL default 0; ALTER TABLE `tlayout_template_data` ADD COLUMN `linked_layout_status_as_service_critical` FLOAT(20, 3) NOT NULL default 0; +CREATE TABLE IF NOT EXISTS `tlog_graph_models` ( + `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, + `title` TEXT NOT NULL, + `regexp` TEXT NOT NULL, + `fields` TEXT NOT NULL, + `average` tinyint(1) NOT NULL default '0', + PRIMARY KEY(`id`) +) ENGINE = InnoDB DEFAULT CHARSET=utf8; + COMMIT; \ No newline at end of file diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 88478f5c9b..5a9f16b870 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -1768,3 +1768,15 @@ CREATE TABLE IF NOT EXISTS `tlayout_template_data` ( PRIMARY KEY(`id`), FOREIGN KEY (`id_layout_template`) REFERENCES tlayout_template(`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE = InnoDB DEFAULT CHARSET=utf8; + +-- --------------------------------------------------------------------- +-- Table `tlog_graph_models` +-- --------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `tlog_graph_models` ( + `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, + `title` TEXT NOT NULL, + `regexp` TEXT NOT NULL, + `fields` TEXT NOT NULL, + `average` tinyint(1) NOT NULL default '0', + PRIMARY KEY(`id`) +) ENGINE = InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index f8eaf58854..0a0227b4ac 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -3327,3 +3327,15 @@ CREATE TABLE IF NOT EXISTS `tlayout_template_data` ( PRIMARY KEY(`id`), FOREIGN KEY (`id_layout_template`) REFERENCES tlayout_template(`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE = InnoDB DEFAULT CHARSET=utf8; + +-- --------------------------------------------------------------------- +-- Table `tlog_graph_models` +-- --------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `tlog_graph_models` ( + `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, + `title` TEXT NOT NULL, + `regexp` TEXT NOT NULL, + `fields` TEXT NOT NULL, + `average` tinyint(1) NOT NULL default '0', + PRIMARY KEY(`id`) +) ENGINE = InnoDB DEFAULT CHARSET=utf8; From 39673ed93ab684eefcfbf59e1ac0db9e8b960f36 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Fri, 7 Sep 2018 14:15:21 +0200 Subject: [PATCH 2/3] Added class modaldeletebutton in pandora.css --- pandora_console/include/styles/pandora.css | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 7ffd0d59a4..8cdfa3a9e7 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -3709,6 +3709,57 @@ div.simple_value > a > span.text p color:white; } +.modaldeletebutton{ + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; + cursor:pointer; + text-align:center; + margin-left:45px; + float:left; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + margin-bottom:30px; + border-radius: 3px;width:90px;height:30px;background-color:white;border: 1px solid #FA5858; +} + +.modaldeletebuttontext{ + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; + color:#FA5858;font-family:Nunito;font-size:10pt;position:relative;top:6px; +} + +.modaldeletebutton:hover .modaldeletebuttontext { + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; + color:white; +} + +.modaldeletebutton:hover { + transition-property: background-color, color; + transition-duration: 1s; + transition-timing-function: ease-out; + -webkit-transition-property: background-color, color; + -webkit-transition-duration: 1s; + -o-transition-property: background-color, color; + -o-transition-duration: 1s; + background-color:#FA5858; +} + .modalgobutton{ transition-property: background-color, color; transition-duration: 1s; From 50a3e43bd42b70e9e69d429a1d9c106f9d8f37b5 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Mon, 17 Sep 2018 12:43:51 +0200 Subject: [PATCH 3/3] Insert apache log model in tlog_graph_models --- pandora_console/extras/mr/20.sql | 4 ++++ .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 4 ++++ pandora_console/pandoradb_data.sql | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/pandora_console/extras/mr/20.sql b/pandora_console/extras/mr/20.sql index 8b903e45ba..6452a3c052 100644 --- a/pandora_console/extras/mr/20.sql +++ b/pandora_console/extras/mr/20.sql @@ -25,4 +25,8 @@ CREATE TABLE IF NOT EXISTS `tlog_graph_models` ( PRIMARY KEY(`id`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8; +INSERT INTO tlog_graph_models VALUES (1, 'Apache log model', + '^.*?\s+.*".*?\s(\/.*?)\?.*1.1"\s+(.*?)\s+(.*?)\s+', + 'pagina, html_err_code, _tiempo_', 1); + COMMIT; \ No newline at end of file diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 5a9f16b870..d38833539f 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -1780,3 +1780,7 @@ CREATE TABLE IF NOT EXISTS `tlog_graph_models` ( `average` tinyint(1) NOT NULL default '0', PRIMARY KEY(`id`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8; + +INSERT INTO tlog_graph_models VALUES (1, 'Apache log model', + '^.*?\s+.*".*?\s(\/.*?)\?.*1.1"\s+(.*?)\s+(.*?)\s+', + 'pagina, html_err_code, _tiempo_', 1); diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 58f35ab553..7ab1986d09 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -1260,3 +1260,10 @@ INSERT INTO `tprofile_view` (`id_profile`, `sec`, `sec2`, `sec3`) VALUES (5, '*' -- Dumping data for table `tcontainer` -- INSERT INTO `tcontainer` SET `name` = 'Default graph container'; + +-- +-- Dumping data for table `tlog_graph_models` +-- +INSERT INTO tlog_graph_models VALUES (1, 'Apache log model', + '^.*?\s+.*".*?\s(\/.*?)\?.*1.1"\s+(.*?)\s+(.*?)\s+', + 'pagina, html_err_code, _tiempo_', 1);