x
/
bansho
Code Issues Proposed changes

Improve variable name 

Change-Id: I6fb4c33eec06f440235f67fc198cbcdccbaa0200
This commit is contained in:
flavien peyre 2015-08-19 09:34:15 -04:00 committed by Vincent Fournier
parent 266fbf4402
commit 0e33dc7553
6 changed files with 243 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/components/config/componentsConfig.json
View File

@ -293,17 +293,17 @@
"endpoint": "commands", "endpoint": "commands",
"filter": "all" "filter": "all"
}, },
"businessimpactmodulations": { "businessImpactModulations": {
"provider": "config", "provider": "config",
"endpoint": "businessimpactmodulations", "endpoint": "businessimpactmodulations",
"filter": "all" "filter": "all"
}, },
"checkmodulations": { "checkModulations": {
"provider": "config", "provider": "config",
"endpoint": "checkmodulations", "endpoint": "checkmodulations",
"filter": "all" "filter": "all"
}, },
"contactgroups": { "contactGroups": {
"provider": "config", "provider": "config",
"endpoint": "contactgroups", "endpoint": "contactgroups",
"filter": "all" "filter": "all"
@ -313,17 +313,17 @@
"endpoint": "contacts", "endpoint": "contacts",
"filter": "all" "filter": "all"
}, },
"hostgroups": { "hostGroups": {
"provider": "config", "provider": "config",
"endpoint": "hostgroups", "endpoint": "hostgroups",
"filter": "all" "filter": "all"
}, },
"macromodulations": { "macroModulations": {
"provider": "config", "provider": "config",
"endpoint": "macromodulations", "endpoint": "macromodulations",
"filter": "all" "filter": "all"
}, },
"notificationways": { "notificationWays": {
"provider": "config", "provider": "config",
"endpoint": "notificationways", "endpoint": "notificationways",
"filter": "all" "filter": "all"
@ -333,12 +333,12 @@
"endpoint": "realms", "endpoint": "realms",
"filter": "all" "filter": "all"
}, },
"servicegroups": { "serviceGroups": {
"provider": "config", "provider": "config",
"endpoint": "servicegroups", "endpoint": "servicegroups",
"filter": "all" "filter": "all"
}, },
"timeperiods": { "timePeriods": {
"provider": "config", "provider": "config",
"endpoint": "timeperiods", "endpoint": "timeperiods",
"filter": "all" "filter": "all"

341
app/components/config/defaultLayoutConfig.json
View File

@ -11,11 +11,11 @@
"attributes": { "attributes": {
"navigation": { "navigation": {
"openProblems": { "openProblems": {
"title": "Open problems", "title": "Open Problems",
"provider": "nbServicesHostsOpenProblems" "provider": "nbServicesHostsOpenProblems"
}, },
"allProblems": { "allProblems": {
"title": "All problems", "title": "All Problems",
"provider": "nbServicesHostsProblems" "provider": "nbServicesHostsProblems"
} }
} }
@ -144,7 +144,7 @@
{ {
"type": "title", "type": "title",
"attributes": { "attributes": {
"title": "Open hosts problems", "title": "Open Hosts Problems",
"item": "host", "item": "host",
"provider": "nbHostsOpenProblems" "provider": "nbHostsOpenProblems"
} }
@ -192,13 +192,13 @@
{ {
"type": "cell-status-last-check", "type": "cell-status-last-check",
"attributes": { "attributes": {
"title": "Last check" "title": "Last Check"
} }
}, },
{ {
"type": "cell-status-host-status", "type": "cell-status-host-status",
"attributes": { "attributes": {
"title": "Host status" "title": "Host Status"
} }
} }
] ]
@ -241,7 +241,7 @@
{ {
"type": "cell-status-service-check", "type": "cell-status-service-check",
"attributes": { "attributes": {
"title": "Service check", "title": "Service Check",
"url": { "url": {
"view": "service", "view": "service",
"params": [ "params": [
@ -266,7 +266,7 @@
{ {
"type": "cell-status-last-check", "type": "cell-status-last-check",
"attributes": { "attributes": {
"title": "Last check" "title": "Last Check"
} }
} }
] ]
@ -333,7 +333,7 @@
{ {
"type": "title", "type": "title",
"attributes": { "attributes": {
"title": "Hosts problems", "title": "Hosts Problems",
"item": "host", "item": "host",
"provider": "nbHostsOpenProblems" "provider": "nbHostsOpenProblems"
} }
@ -381,13 +381,13 @@
{ {
"type": "cell-status-last-check", "type": "cell-status-last-check",
"attributes": { "attributes": {
"title": "Last check" "title": "Last Check"
} }
}, },
{ {
"type": "cell-status-host-status", "type": "cell-status-host-status",
"attributes": { "attributes": {
"title": "Host status" "title": "Host Status"
} }
} }
] ]
@ -395,7 +395,7 @@
{ {
"type": "title", "type": "title",
"attributes": { "attributes": {
"title": "Services problems", "title": "Services Problems",
"item": "service", "item": "service",
"provider": "nbServicesOpenProblems" "provider": "nbServicesOpenProblems"
} }
@ -430,7 +430,7 @@
{ {
"type": "cell-status-service-check", "type": "cell-status-service-check",
"attributes": { "attributes": {
"title": "Service check", "title": "Service Check",
"url": { "url": {
"view": "service", "view": "service",
"params": [ "params": [
@ -455,7 +455,7 @@
{ {
"type": "cell-status-last-check", "type": "cell-status-last-check",
"attributes": { "attributes": {
"title": "Last check" "title": "Last Check"
} }
} }
] ]
@ -475,7 +475,7 @@
{ {
"type": "title", "type": "title",
"attributes": { "attributes": {
"title": "Hosts status" "title": "Hosts Status"
} }
}, },
{ {
@ -571,14 +571,14 @@
{ {
"type": "cell-status-last-check", "type": "cell-status-last-check",
"attributes": { "attributes": {
"title": "Last check", "title": "Last Check",
"class": "small" "class": "small"
} }
}, },
{ {
"type": "cell-status-host-status", "type": "cell-status-host-status",
"attributes": { "attributes": {
"title": "Host status", "title": "Host Status",
"class": "small" "class": "small"
} }
} }
@ -679,7 +679,7 @@
{ {
"type": "cell-status-service-check", "type": "cell-status-service-check",
"attributes": { "attributes": {
"title": "Service check", "title": "Service Check",
"url": { "url": {
"view": "service", "view": "service",
"params": [ "params": [
@ -704,7 +704,7 @@
{ {
"type": "cell-status-last-check", "type": "cell-status-last-check",
"attributes": { "attributes": {
"title": "Last check" "title": "Last Check"
} }
} }
] ]
@ -799,7 +799,7 @@
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"entryKey": "event_service_description", "entryKey": "event_service_description",
"title": "Service description" "title": "Service Description"
} }
}, },
{ {
@ -812,7 +812,7 @@
{ {
"type": "cell-other-fields", "type": "cell-other-fields",
"attributes": { "attributes": {
"title": "Other fields", "title": "Other Fields",
"skipFields": [ "skipFields": [
"event_time", "event_time",
"event_host_name", "event_host_name",
@ -860,7 +860,7 @@
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Configuration": "configHost" "Configuration": "configHost"
} }
} }
@ -876,7 +876,7 @@
"template": "drupal" "template": "drupal"
}, },
"drupalDashboard": { "drupalDashboard": {
"title": "Drupal dashboard", "title": "Drupal Dashboard",
"template": "drupal_dashboard", "template": "drupal_dashboard",
"hostsMap": { "hostsMap": {
"drupal": "Wonderful Drupal Website" "drupal": "Wonderful Drupal Website"
@ -911,7 +911,7 @@
{ {
"type": "title", "type": "title",
"attributes": { "attributes": {
"title": "Hosts configuration" "title": "Hosts Configuration"
} }
}, },
{ {
@ -1084,7 +1084,7 @@
{ {
"type": "cell-other-fields", "type": "cell-other-fields",
"attributes": { "attributes": {
"title": "Other fields", "title": "Other Fields",
"skipFields": [ "skipFields": [
"use", "use",
"name" "name"
@ -1147,14 +1147,7 @@
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"entryKey": "command_name", "entryKey": "command_name",
"title": "Name" "title": "Name",
}
},
{
"type": "cell-single",
"attributes": {
"entryKey": "command_line",
"title": "Line",
"url": { "url": {
"view": "command", "view": "command",
"params": [ "params": [
@ -1166,6 +1159,13 @@
} }
} }
}, },
{
"type": "cell-single",
"attributes": {
"entryKey": "command_line",
"title": "Line"
}
},
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
@ -1185,14 +1185,20 @@
{ {
"type": "panel", "type": "panel",
"components": [ "components": [
{
"type": "title",
"attributes": {
"title": "Command"
}
},
{ {
"type": "container", "type": "container",
"components": [ "components": [
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Command": "configCommand" "Configuration": "configCommand"
} }
} }
} }
@ -1202,7 +1208,7 @@
} }
] ]
}, },
"businessimpactmodulations": { "businessImpactModulations": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
@ -1241,7 +1247,7 @@
"attributes": { "attributes": {
"tableId": 0, "tableId": 0,
"headerFollow": true, "headerFollow": true,
"inputSource": "businessimpactmodulations", "inputSource": "businessImpactModulations",
"isWrappable": false, "isWrappable": false,
"noRepeatCell": "", "noRepeatCell": "",
"checkColumn": false, "checkColumn": false,
@ -1254,7 +1260,7 @@
"entryKey": "business_impact_modulation_name", "entryKey": "business_impact_modulation_name",
"title": "Name", "title": "Name",
"url": { "url": {
"view": "businessimpactmodulation", "view": "businessImpactModulation",
"params": [ "params": [
{ {
"urlParam": "business_impact_modulation_name", "urlParam": "business_impact_modulation_name",
@ -1267,7 +1273,7 @@
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"title": "business_impact", "title": "Business Impact",
"entryKey": "business_impact", "entryKey": "business_impact",
"class": "small" "class": "small"
} }
@ -1286,20 +1292,26 @@
} }
] ]
}, },
"businessimpactmodulation": { "businessImpactModulation": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
"type": "panel", "type": "panel",
"components": [ "components": [
{
"type": "title",
"attributes": {
"title": "Business Impact Modulation"
}
},
{ {
"type": "container", "type": "container",
"components": [ "components": [
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Business Impact Modulation": "configBusinessImpactModulation" "Configuration": "configBusinessImpactModulation"
} }
} }
} }
@ -1309,7 +1321,7 @@
} }
] ]
}, },
"checkmodulations": { "checkModulations": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
@ -1348,7 +1360,7 @@
"attributes": { "attributes": {
"tableId": 0, "tableId": 0,
"headerFollow": true, "headerFollow": true,
"inputSource": "checkmodulations", "inputSource": "checkModulations",
"isWrappable": false, "isWrappable": false,
"noRepeatCell": "", "noRepeatCell": "",
"checkColumn": false, "checkColumn": false,
@ -1361,7 +1373,7 @@
"entryKey": "checkmodulation_name", "entryKey": "checkmodulation_name",
"title": "Name", "title": "Name",
"url": { "url": {
"view": "checkmodulation", "view": "checkModulation",
"params": [ "params": [
{ {
"urlParam": "checkmodulation_name", "urlParam": "checkmodulation_name",
@ -1374,7 +1386,7 @@
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"title": "Check period", "title": "Check Period",
"entryKey": "check_period", "entryKey": "check_period",
"class": "small" "class": "small"
} }
@ -1382,7 +1394,7 @@
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"title": "check command", "title": "Check Command",
"entryKey": "check_command", "entryKey": "check_command",
"class": "small" "class": "small"
} }
@ -1393,20 +1405,26 @@
} }
] ]
}, },
"checkmodulation": { "checkModulation": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
"type": "panel", "type": "panel",
"components": [ "components": [
{
"type": "title",
"attributes": {
"title": "Check Modulation"
}
},
{ {
"type": "container", "type": "container",
"components": [ "components": [
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Check Modulation": "configCheckModulation" "Configuration": "configCheckModulation"
} }
} }
} }
@ -1416,7 +1434,7 @@
} }
] ]
}, },
"contactgroups": { "contactGroups": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
@ -1455,7 +1473,7 @@
"attributes": { "attributes": {
"tableId": 0, "tableId": 0,
"headerFollow": true, "headerFollow": true,
"inputSource": "contactgroups", "inputSource": "contactGroups",
"isWrappable": false, "isWrappable": false,
"noRepeatCell": "", "noRepeatCell": "",
"checkColumn": false, "checkColumn": false,
@ -1468,7 +1486,7 @@
"entryKey": "contactgroup_name", "entryKey": "contactgroup_name",
"title": "Name", "title": "Name",
"url": { "url": {
"view": "contactgroup", "view": "contactGroup",
"params": [ "params": [
{ {
"urlParam": "contactgroup_name", "urlParam": "contactgroup_name",
@ -1489,7 +1507,7 @@
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"title": "", "title": "Host Notification Commands",
"entryKey": "host_notification_commands", "entryKey": "host_notification_commands",
"class": "small" "class": "small"
} }
@ -1497,7 +1515,7 @@
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"title": "Service notification commands", "title": "Service Notification Commands",
"entryKey": "service_notification_commands", "entryKey": "service_notification_commands",
"class": "small" "class": "small"
} }
@ -1522,20 +1540,26 @@
} }
] ]
}, },
"contactgroup": { "contactGroup": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
"type": "panel", "type": "panel",
"components": [ "components": [
{
"type": "title",
"attributes": {
"title": "Contact Group"
}
},
{ {
"type": "container", "type": "container",
"components": [ "components": [
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Contact Group": "configContactGroup" "Configuration": "configContactGroup"
} }
} }
} }
@ -1665,14 +1689,20 @@
{ {
"type": "panel", "type": "panel",
"components": [ "components": [
{
"type": "title",
"attributes": {
"title": "Contact"
}
},
{ {
"type": "container", "type": "container",
"components": [ "components": [
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Contact": "configContact" "Configuration": "configContact"
} }
} }
} }
@ -1682,7 +1712,7 @@
} }
] ]
}, },
"hostgroups": { "hostGroups": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
@ -1691,7 +1721,7 @@
{ {
"type": "title", "type": "title",
"attributes": { "attributes": {
"title": "Host groups" "title": "Host Groups"
} }
}, },
{ {
@ -1721,7 +1751,7 @@
"attributes": { "attributes": {
"tableId": 0, "tableId": 0,
"headerFollow": true, "headerFollow": true,
"inputSource": "hostgroups", "inputSource": "hostGroups",
"isWrappable": false, "isWrappable": false,
"noRepeatCell": "", "noRepeatCell": "",
"checkColumn": false, "checkColumn": false,
@ -1734,7 +1764,7 @@
"entryKey": "hostgroup_name", "entryKey": "hostgroup_name",
"title": "Name", "title": "Name",
"url": { "url": {
"view": "hostgroup", "view": "hostGroup",
"params": [ "params": [
{ {
"urlParam": "hostgroup_name", "urlParam": "hostgroup_name",
@ -1747,7 +1777,7 @@
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"title": "Action url", "title": "Action Url",
"entryKey": "action_url", "entryKey": "action_url",
"class": "small" "class": "small"
} }
@ -1771,7 +1801,7 @@
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"title": "notes url", "title": "Notes Url",
"entryKey": "notes_url", "entryKey": "notes_url",
"class": "small" "class": "small"
} }
@ -1779,7 +1809,7 @@
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"title": "notes", "title": "Notes",
"entryKey": "notes", "entryKey": "notes",
"class": "medium" "class": "medium"
} }
@ -1790,20 +1820,26 @@
} }
] ]
}, },
"hostgroup": { "hostGroup": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
"type": "panel", "type": "panel",
"components": [ "components": [
{
"type": "title",
"attributes": {
"title": "Host Group"
}
},
{ {
"type": "container", "type": "container",
"components": [ "components": [
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Host Group": "configHostGroup" "Configuration": "configHostGroup"
} }
} }
} }
@ -1813,7 +1849,7 @@
} }
] ]
}, },
"macromodulations": { "macroModulations": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
@ -1822,7 +1858,7 @@
{ {
"type": "title", "type": "title",
"attributes": { "attributes": {
"title": "Macromodulations" "title": "Macro Modulations"
} }
}, },
{ {
@ -1852,18 +1888,11 @@
"attributes": { "attributes": {
"tableId": 0, "tableId": 0,
"headerFollow": true, "headerFollow": true,
"inputSource": "macromodulations", "inputSource": "macroModulations",
"isWrappable": false, "isWrappable": false,
"noRepeatCell": "", "noRepeatCell": "",
"checkColumn": false, "checkColumn": false,
"pagingbar": true, "pagingbar": true
"cellUrls": {
"macromodulation_name": {
"view": "macromodulation",
"params": [
]
}
}
}, },
"components": [ "components": [
{ {
@ -1872,7 +1901,7 @@
"entryKey": "macromodulation_name", "entryKey": "macromodulation_name",
"title": "Name", "title": "Name",
"url": { "url": {
"view": "macromodulation", "view": "macroModulation",
"params": [ "params": [
{ {
"urlParam": "macromodulation_name", "urlParam": "macromodulation_name",
@ -1895,20 +1924,26 @@
} }
] ]
}, },
"macromodulation": { "macroModulation": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
"type": "panel", "type": "panel",
"components": [ "components": [
{
"type": "title",
"attributes": {
"title": "Macro Modulation"
}
},
{ {
"type": "container", "type": "container",
"components": [ "components": [
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Macro Modulation": "configMacroModulation" "Configuration": "configMacroModulation"
} }
} }
} }
@ -1918,7 +1953,7 @@
} }
] ]
}, },
"notificationways": { "notificationWays": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
@ -1957,7 +1992,7 @@
"attributes": { "attributes": {
"tableId": 0, "tableId": 0,
"headerFollow": true, "headerFollow": true,
"inputSource": "notificationways", "inputSource": "notificationWays",
"isWrappable": false, "isWrappable": false,
"noRepeatCell": "", "noRepeatCell": "",
"checkColumn": false, "checkColumn": false,
@ -1970,7 +2005,7 @@
"title": "Name", "title": "Name",
"entryKey": "notificationway_name", "entryKey": "notificationway_name",
"url": { "url": {
"view": "notificationway", "view": "notificationWay",
"params": [ "params": [
{ {
"urlParam": "notificationway_name", "urlParam": "notificationway_name",
@ -1984,7 +2019,7 @@
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"title": "host notification commands", "title": "Host Notification Commands",
"entryKey": "host_notification_commands", "entryKey": "host_notification_commands",
"class": "small" "class": "small"
} }
@ -1992,7 +2027,7 @@
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"title": "Service notification commands", "title": "Service Notification Commands",
"entryKey": "service_notification_commands", "entryKey": "service_notification_commands",
"class": "small" "class": "small"
} }
@ -2016,20 +2051,26 @@
} }
] ]
}, },
"notificationway": { "notificationWay": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
"type": "panel", "type": "panel",
"components": [ "components": [
{
"type": "title",
"attributes": {
"title": "Notification Way"
}
},
{ {
"type": "container", "type": "container",
"components": [ "components": [
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Notification Way": "configNotificationWay" "Configuration": "configNotificationWay"
} }
} }
} }
@ -2112,7 +2153,7 @@
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"title": "default", "title": "Default",
"entryKey": "default", "entryKey": "default",
"class": "small" "class": "small"
} }
@ -2129,14 +2170,20 @@
{ {
"type": "panel", "type": "panel",
"components": [ "components": [
{
"type": "title",
"attributes": {
"title": "Realm"
}
},
{ {
"type": "container", "type": "container",
"components": [ "components": [
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Realm": "configRealm" "Command": "configRealm"
} }
} }
} }
@ -2146,7 +2193,7 @@
} }
] ]
}, },
"servicegroups": { "serviceGroups": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
@ -2155,7 +2202,7 @@
{ {
"type": "title", "type": "title",
"attributes": { "attributes": {
"title": "Service groups" "title": "Service Groups"
} }
}, },
{ {
@ -2185,39 +2232,85 @@
"attributes": { "attributes": {
"tableId": 0, "tableId": 0,
"headerFollow": true, "headerFollow": true,
"inputSource": "servicegroups", "inputSource": "serviceGroups",
"isWrappable": false, "isWrappable": false,
"noRepeatCell": "", "noRepeatCell": "",
"checkColumn": false, "checkColumn": false,
"pagingbar": true, "pagingbar": true},
"cellUrls": { "components": [
"servicegroup_name": { {
"view": "servicegroup", "type": "cell-single",
"params": [ "attributes": {
"servicegroup_name" "title": "Name",
] "entryKey": "servicegroup_name",
"url": {
"view": "serviceGroup",
"params": [
{
"urlParam": "servicegroup_name",
"entryKey": "servicegroup_name"
}
]
},
"class": "medium"
}
},
{
"type": "cell-single",
"attributes": {
"entryKey": "members",
"title": "Members",
"class": "small"
}
},
{
"type": "cell-single",
"attributes": {
"entryKey": "servicegroup_members",
"title": "Service Group Members",
"class": "small"
}
},
{
"type": "cell-other-fields",
"attributes": {
"title": "Other",
"skipFields": [
"servicegroup_name",
"members",
"servicegroup_members"
],
"class": "medium"
} }
} }
} ]
} }
] ]
} }
] ]
}, },
"servicegroup": { "serviceGroup": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
"type": "panel", "type": "panel",
"components": [ "components": [
{
"type": "title",
"attributes": {
"title": "Service Group"
}
},
{ {
"type": "container", "type": "container",
"components": [ "components": [
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Service Group": "configServiceGroup" "Configuration": "configServiceGroup"
} }
} }
} }
@ -2227,7 +2320,7 @@
} }
] ]
}, },
"timeperiods": { "timePeriods": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
@ -2236,7 +2329,7 @@
{ {
"type": "title", "type": "title",
"attributes": { "attributes": {
"title": "Time periods" "title": "Time Periods"
} }
}, },
{ {
@ -2266,7 +2359,7 @@
"attributes": { "attributes": {
"tableId": 0, "tableId": 0,
"headerFollow": true, "headerFollow": true,
"inputSource": "timeperiods", "inputSource": "timePeriods",
"isWrappable": false, "isWrappable": false,
"noRepeatCell": "", "noRepeatCell": "",
"checkColumn": false, "checkColumn": false,
@ -2279,7 +2372,7 @@
"entryKey": "timeperiod_name", "entryKey": "timeperiod_name",
"title": "Name", "title": "Name",
"url": { "url": {
"view": "timeperiod", "view": "timePeriod",
"params": [ "params": [
{ {
"urlParam": "timeperiod_name", "urlParam": "timeperiod_name",
@ -2311,20 +2404,26 @@
} }
] ]
}, },
"timeperiod": { "timePeriod": {
"template": "page", "template": "page",
"components": [ "components": [
{ {
"type": "panel", "type": "panel",
"components": [ "components": [
{
"type": "title",
"attributes": {
"title": "Time Period"
}
},
{ {
"type": "container", "type": "container",
"components": [ "components": [
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Time Period": "configTimePeriod" "Configuration": "configTimePeriod"
} }
} }
} }
@ -2384,13 +2483,13 @@
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"entryKey": "host_name", "entryKey": "host_name",
"title": "Host name" "title": "Host Name"
} }
}, },
{ {
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"title": "Service description", "title": "Service Description",
"entryKey": "service_description", "entryKey": "service_description",
"url": { "url": {
"view": "service", "view": "service",
@ -2412,7 +2511,7 @@
"type": "cell-single", "type": "cell-single",
"attributes": { "attributes": {
"entryKey": "contact_groups", "entryKey": "contact_groups",
"title": "Contact groups", "title": "Contact Groups",
"class": "small" "class": "small"
} }
}, },
@ -2427,7 +2526,7 @@
{ {
"type": "cell-other-fields", "type": "cell-other-fields",
"attributes": { "attributes": {
"title": "title", "title": "Title",
"skipFields": [ "skipFields": [
"contact_groups", "contact_groups",
"service_description", "service_description",
@ -2470,7 +2569,7 @@
{ {
"type": "info", "type": "info",
"attributes": { "attributes": {
"datamodel": { "inputSource": {
"Service configuration": "configService" "Service configuration": "configService"
} }
} }

3
app/components/directive/container/container.js
View File

@ -80,7 +80,6 @@ angular.module('bansho.container', [])
}); });
}, },
"configService": function () { "configService": function () {
console.log('Hey, listen!')
surveilConfig.getService(templateManager.getPageParam('host_name'),templateManager.getPageParam('service_description')) surveilConfig.getService(templateManager.getPageParam('host_name'),templateManager.getPageParam('service_description'))
.then(function (data) { .then(function (data) {
$scope.param.configService = data[0]; $scope.param.configService = data[0];
@ -134,8 +133,6 @@ angular.module('bansho.container', [])
var hostname = templateManager.getPageParam('host_name'), var hostname = templateManager.getPageParam('host_name'),
serviceDescription = templateManager.getPageParam('service_description'); serviceDescription = templateManager.getPageParam('service_description');
console.log('hostname ')
console.log(hostname)
surveilStatus.getService(hostname, serviceDescription).then(function (data) { surveilStatus.getService(hostname, serviceDescription).then(function (data) {
$scope.param.service = data[0]; $scope.param.service = data[0];
surveilStatus.getServiceMetricNames(hostname, serviceDescription).then(function(metric_names) { surveilStatus.getServiceMetricNames(hostname, serviceDescription).then(function(metric_names) {

6
app/components/directive/container/info/info.html
View File

@ -1,8 +1,8 @@
<span data-ng-repeat="(key, datamodel) in datamodels"> <span data-ng-repeat="(key, inputSource) in inputSources">
<div data-ng-show="param[datamodel]" class="subcomponent__live"> <div data-ng-show="param[inputSource]" class="subcomponent__live">
<h2>{{key}}</h2> <h2>{{key}}</h2>
<table class="data-table"> <table class="data-table">
<tbody data-ng-repeat="(key, value) in param[datamodel]"> <tbody data-ng-repeat="(key, value) in param[inputSource]">
<tr> <tr>
<td>{{key}}</td> <td>{{key}}</td>
<td>{{value}}</td> <td>{{value}}</td>

6
app/components/directive/container/info/info.js
View File

@ -9,12 +9,12 @@ angular.module('bansho.container')
scope.param = scope.$parent.param; scope.param = scope.$parent.param;
angular.forEach(scope.components, function(component) { angular.forEach(scope.components, function(component) {
if (component.type === 'info') { if (component.type === 'info') {
scope.datamodels = component.attributes.datamodel; scope.inputSources = component.attributes.inputSource;
} }
}); });
angular.forEach(scope.datamodels, function (datamodel) { angular.forEach(scope.inputSources, function (inputSource) {
scope.$parent.addDirectiveParamRequirements(datamodel); scope.$parent.addDirectiveParamRequirements(inputSource);
}); });
} }
}; };

18
app/components/sidebar/sidebar.html
View File

@ -37,17 +37,17 @@
<span class="visuallyhidden">Customize the config objects category</span> <span class="visuallyhidden">Customize the config objects category</span>
</button> </button>
<ul class="sidebar__sublist collapse in" id="configList"> <ul class="sidebar__sublist collapse in" id="configList">
<li class="sidebar__subitem"><a href="#/view?view=configHosts">Host</a></li> <li class="sidebar__subitem"><a href="#/view?view=configHosts">Hosts</a></li>
<li class="sidebar__subitem"><a href="#/view?view=configHostsTemplate">Templates</a></li> <li class="sidebar__subitem"><a href="#/view?view=configHostsTemplate">Templates</a></li>
<li class="sidebar__subitem"><a href="#/view?view=configServices">Services</a></li> <li class="sidebar__subitem"><a href="#/view?view=configServices">Services</a></li>
<li class="sidebar__subitem"><a href="#/view?view=commands">Commands</a></li> <li class="sidebar__subitem"><a href="#/view?view=commands">Commands</a></li>
<li class="sidebar__subitem"><a href="#/view?view=businessimpactmodulations">BusinessImpactModulation</a></li> <li class="sidebar__subitem"><a href="#/view?view=businessImpactModulations">Business Impact Modulations</a></li>
<li class="sidebar__subitem"><a href="#/view?view=checkmodulations">CheckModulation</a></li> <li class="sidebar__subitem"><a href="#/view?view=checkModulations">Check Modulation</a></li>
<li class="sidebar__subitem"><a href="#/view?view=contacts">Contacts</a></li> <li class="sidebar__subitem"><a href="#/view?view=contacts">Contacts</a></li>
<li class="sidebar__subitem"><a href="#/view?view=macromodulations">Macromodulation</a></li> <li class="sidebar__subitem"><a href="#/view?view=macroModulations">Macro Modulation</a></li>
<li class="sidebar__subitem"><a href="#/view?view=notificationways">Notification Way</a></li> <li class="sidebar__subitem"><a href="#/view?view=notificationWays">Notification Way</a></li>
<li class="sidebar__subitem"><a href="#/view?view=realms">Realm</a></li> <li class="sidebar__subitem"><a href="#/view?view=realms">Realm</a></li>
<li class="sidebar__subitem"><a href="#/view?view=timeperiods">Time periods</a></li> <li class="sidebar__subitem"><a href="#/view?view=timePeriods">Time Periods</a></li>
</ul> </ul>
</li> </li>
<li class="sidebar__item"> <li class="sidebar__item">
@ -78,9 +78,9 @@
</button> </button>
<ul class="sidebar__sublist collapse in" id="groupsList"> <ul class="sidebar__sublist collapse in" id="groupsList">
<li class="sidebar__subitem"><a href="#/view?view=hostgroups">Host groups</a></li> <li class="sidebar__subitem"><a href="#/view?view=hostGroups">Host groups</a></li>
<li class="sidebar__subitem"><a href="#/view?view=servicegroups">Service Groups</a></li> <li class="sidebar__subitem"><a href="#/view?view=serviceGroups">Service groups</a></li>
<li class="sidebar__subitem"><a href="#/view?view=contactgroups">Contact Groups</a></li> <li class="sidebar__subitem"><a href="#/view?view=contactGroups">Contact groups</a></li>
</ul> </ul>
</li> </li>
<li class="sidebar__item"> <li class="sidebar__item">