Unverified Commit 1f13af04 authored by Julien1498's avatar Julien1498 Committed by GitHub
Browse files

Merge pull request #103 from damda58/master

馃拕 Matching status color between thruk and dahsboard
parents 79bfa002 1dea8717
...@@ -121,7 +121,7 @@ function drawPieChart(div_id, title, datas, column_type, link) ...@@ -121,7 +121,7 @@ function drawPieChart(div_id, title, datas, column_type, link)
var begin_url = path_nagios_status+'?'; var begin_url = path_nagios_status+'?';
var columns = [ var columns = [
["pending", "up", "down", "unreachable"], ["pending", "up", "down", "unreachable"],
['#2CC6F7', '#00e00f', '#db0f00', '#99A2A8'], ['#2CC6F7', '#00e00f', '#db0f00', '#CC66FF'],
['hostgroup=all&style=hostdetail&hoststatustypes=1', 'hostgroup=all&style=hostdetail&hoststatustypes=2', 'hostgroup=all&style=hostdetail&hoststatustypes=4', 'hostgroup=all&style=hostdetail&hoststatustypes=8'] ['hostgroup=all&style=hostdetail&hoststatustypes=1', 'hostgroup=all&style=hostdetail&hoststatustypes=2', 'hostgroup=all&style=hostdetail&hoststatustypes=4', 'hostgroup=all&style=hostdetail&hoststatustypes=8']
]; ];
} }
...@@ -130,7 +130,7 @@ function drawPieChart(div_id, title, datas, column_type, link) ...@@ -130,7 +130,7 @@ function drawPieChart(div_id, title, datas, column_type, link)
var begin_url = path_nagios_status+'?'; var begin_url = path_nagios_status+'?';
var columns = [ var columns = [
["pending", "ok", "warning", "critical", "unknown"], ["pending", "ok", "warning", "critical", "unknown"],
['#2CC6F7', '#03c700', '#ff9500', '#ff2d55', '#99A2A8'], ['#2CC6F7', '#03c700', '#ff9500', '#ff2d55', '#CC66FF'],
['host=all&hoststatustypes=15&servicestatustypes=1&style=detail', 'host=all&hoststatustypes=15&servicestatustypes=2&style=detail', 'host=all&hoststatustypes=15&servicestatustypes=4&style=detail', 'host=all&hoststatustypes=15&servicestatustypes=16&style=detail', 'host=all&_=1467375869340&hoststatustypes=15&servicestatustypes=8&style=detail'] ['host=all&hoststatustypes=15&servicestatustypes=1&style=detail', 'host=all&hoststatustypes=15&servicestatustypes=2&style=detail', 'host=all&hoststatustypes=15&servicestatustypes=4&style=detail', 'host=all&hoststatustypes=15&servicestatustypes=16&style=detail', 'host=all&_=1467375869340&hoststatustypes=15&servicestatustypes=8&style=detail']
]; ];
} }
...@@ -139,7 +139,7 @@ function drawPieChart(div_id, title, datas, column_type, link) ...@@ -139,7 +139,7 @@ function drawPieChart(div_id, title, datas, column_type, link)
var begin_url = '/module/monitoring_ged/index.php?'; var begin_url = '/module/monitoring_ged/index.php?';
var columns = [ var columns = [
["ok", "warning", "critical", "unknown"], ["ok", "warning", "critical", "unknown"],
['#03c700', '#ff9500', '#ff2d55', '#99A2A8'], ['#03c700', '#ff9500', '#ff2d55', '#CC66FF'],
["q=active&status=0", "q=active&status=1", "q=active&status=2", "q=active&status=3"] ["q=active&status=0", "q=active&status=1", "q=active&status=2", "q=active&status=3"]
]; ];
} }
......
...@@ -267,7 +267,7 @@ td.outageUnimportantProblem a,td.hostUnimportantProblem a,td.serviceUnimportantP ...@@ -267,7 +267,7 @@ td.outageUnimportantProblem a,td.hostUnimportantProblem a,td.serviceUnimportantP
} }
.serviceUNKNOWN { .serviceUNKNOWN {
background-color:#ffcd00; background-color:#CC66FF;
color: #333; color: #333;
} }
...@@ -813,7 +813,8 @@ TD.notificationsWARNING { ...@@ -813,7 +813,8 @@ TD.notificationsWARNING {
} }
TD.serviceTotalsUNKNOWN { TD.serviceTotalsUNKNOWN {
background-color:#ffcd00; background-color:#CC66FF;
color:#333;
} }
TD.serviceTotalsWARNING, TD.serviceTotalsPROBLEMS, TD.hostTotalsPROBLEMS { TD.serviceTotalsWARNING, TD.serviceTotalsPROBLEMS, TD.hostTotalsPROBLEMS {
...@@ -871,8 +872,8 @@ TD.statusEven { ...@@ -871,8 +872,8 @@ TD.statusEven {
} }
.statusUNKNOWN { .statusUNKNOWN {
background-color:#ffcd00 !important; background-color:#CC66FF !important;
color:#5f6268; color:#333;
height:22px; height:22px;
padding:1px; padding:1px;
} }
......
...@@ -266,7 +266,8 @@ td.outageUnimportantProblem a,td.hostUnimportantProblem a,td.serviceUnimportantP ...@@ -266,7 +266,8 @@ td.outageUnimportantProblem a,td.hostUnimportantProblem a,td.serviceUnimportantP
} }
.serviceUNKNOWN { .serviceUNKNOWN {
background-color:#ffcd00; background-color:#CC66FF;
color:#FFFFFF;
} }
TD.statusEven.tableRowSelected, TR.commentEven TD.tableRowSelected, TR.downtimeEven TD.tableRowSelected { TD.statusEven.tableRowSelected, TR.commentEven TD.tableRowSelected, TR.downtimeEven TD.tableRowSelected {
...@@ -808,7 +809,8 @@ TD.notificationsWARNING { ...@@ -808,7 +809,8 @@ TD.notificationsWARNING {
} }
TD.serviceTotalsUNKNOWN { TD.serviceTotalsUNKNOWN {
background-color:#ffcd00; background-color:#CC66FF;
color:#FFFFFF
} }
TD.serviceTotalsWARNING, TD.serviceTotalsPROBLEMS, TD.hostTotalsPROBLEMS { TD.serviceTotalsWARNING, TD.serviceTotalsPROBLEMS, TD.hostTotalsPROBLEMS {
...@@ -865,8 +867,8 @@ TD.statusEven { ...@@ -865,8 +867,8 @@ TD.statusEven {
} }
.statusUNKNOWN { .statusUNKNOWN {
background-color:#ffcd00 !important; background-color:#CC66FF !important;
color:#5f6268; color:#FFFFFF;
height:22px; height:22px;
padding:1px; padding:1px;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment