diff --git a/public/configurations/dashboards/aarNSG.json b/public/configurations/dashboards/aarNSG.json index 5277261c..7f395e58 100644 --- a/public/configurations/dashboards/aarNSG.json +++ b/public/configurations/dashboards/aarNSG.json @@ -4,19 +4,19 @@ "creationDate": "10/26/2016", "title": "AAR NSG ({{snsg}})", "visualizations": [ - { "id": "aar-nsg-top10-app", "x": 0, "y": 10, "w": 6, "h": 15, "minW": 5, "minH": 10, "static": true}, - { "id": "aar-nsg-top5-talkers-upload", "x": 0, "y": 25, "w": 6, "h": 12, "minW": 5, "minH": 10, "static": true}, - { "id": "aar-nsg-top5-talkers-download", "x": 6, "y": 25, "w": 6, "h": 12, "minW": 5, "minH": 10, "static": true}, - { "id": "aar-nsg-app-linechart", "x": 6, "y": 10, "w": 6, "h": 15, "minW": 5, "minH": 10, "static": true}, - { "id": "aar-nsg-alarm-count-critical", "x": 3, "y": 0, "w": 2, "h": 9, "minW": 1, "minH": 5, "static": true}, - { "id": "aar-nsg-alarm-count-major", "x": 5, "y": 0, "w": 2, "h": 9, "minW": 1, "minH": 5, "static": true}, - { "id": "aar-nsg-alarm-count-minor", "x": 7, "y": 0, "w": 2, "h": 9, "minW": 1, "minH": 5, "static": true} + { "id": "aar-nsg-alarm-text", "x": 1, "y": 0, "w": 2, "h": 8, "minW": 1, "minH": 5, "static": true}, + { "id": "aar-nsg-resource-linechart", "x": 0, "y": 8, "w": 8, "h": 15, "minW": 1, "minH": 5, "static": true}, + { "id": "aar-nsg-disk-barchart", "x": 8, "y": 8, "w": 4, "h": 15, "minW": 1, "minH":5, "static": true} ], "links": [ { "label": "Dashboard View", "url": "/dashboards/aarNSG" }, + { + "label": "Top Apps", + "url": "/dashboards/aarNSGTopApps" + }, { "label": "Detail View", "url": "/dashboards/aarNSGDetail" @@ -33,22 +33,5 @@ "label": "Alarms", "url": "/dashboards/aarNSGAlarms" } - ], - "filterOptions": { - "Metric": { - "parameter": "metric", - "default": "TotalBytesCount", - "options": [ - { - "label": "Total Bytes", - "value": "TotalBytesCount", - "default": true - }, - { - "label": "Total Packets", - "value": "TotalPacketsCount" - } - ] - } - } + ] } diff --git a/public/configurations/dashboards/aarNSGAlarms.json b/public/configurations/dashboards/aarNSGAlarms.json index 2416f813..bffb1e93 100644 --- a/public/configurations/dashboards/aarNSGAlarms.json +++ b/public/configurations/dashboards/aarNSGAlarms.json @@ -11,6 +11,10 @@ "label": "Dashboard View", "url": "/dashboards/aarNSG" }, + { + "label": "Top Apps", + "url": "/dashboards/aarNSGTopApps" + }, { "label": "Detail View", "url": "/dashboards/aarNSGDetail" diff --git a/public/configurations/dashboards/aarNSGDetail.json b/public/configurations/dashboards/aarNSGDetail.json index ed84957e..4fbc5f33 100644 --- a/public/configurations/dashboards/aarNSGDetail.json +++ b/public/configurations/dashboards/aarNSGDetail.json @@ -17,6 +17,10 @@ "label": "Dashboard View", "url": "/dashboards/aarNSG" }, + { + "label": "Top Apps", + "url": "/dashboards/aarNSGTopApps" + }, { "label": "Detail View", "url": "/dashboards/aarNSGDetail" diff --git a/public/configurations/dashboards/aarNSGIKE.json b/public/configurations/dashboards/aarNSGIKE.json index 2ae05fb1..d54ab267 100644 --- a/public/configurations/dashboards/aarNSGIKE.json +++ b/public/configurations/dashboards/aarNSGIKE.json @@ -16,6 +16,10 @@ "label": "Dashboard View", "url": "/dashboards/aarNSG" }, + { + "label": "Top Apps", + "url": "/dashboards/aarNSGTopApps" + }, { "label": "Detail View", "url": "/dashboards/aarNSGDetail" diff --git a/public/configurations/dashboards/aarNSGNATTEvents.json b/public/configurations/dashboards/aarNSGNATTEvents.json index c4770ec2..e12440eb 100644 --- a/public/configurations/dashboards/aarNSGNATTEvents.json +++ b/public/configurations/dashboards/aarNSGNATTEvents.json @@ -13,6 +13,10 @@ "label": "Dashboard View", "url": "/dashboards/aarNSG" }, + { + "label": "Top Apps", + "url": "/dashboards/aarNSGTopApps" + }, { "label": "Detail View", "url": "/dashboards/aarNSGDetail" diff --git a/public/configurations/dashboards/aarNSGTopApps.json b/public/configurations/dashboards/aarNSGTopApps.json new file mode 100644 index 00000000..94f4721a --- /dev/null +++ b/public/configurations/dashboards/aarNSGTopApps.json @@ -0,0 +1,55 @@ +{ + "id": "aarNSGTopApps", + "author": "Ronak Shah", + "creationDate": "10/26/2016", + "title": "NSG ({{snsg}}) Top Apps ", + "visualizations": [ + { "id": "aar-nsg-top10-app", "x": 0, "y": 0, "w": 6, "h": 15, "minW": 5, "minH": 10, "static": true}, + { "id": "aar-nsg-top5-talkers-upload", "x": 0, "y": 15, "w": 6, "h": 12, "minW": 5, "minH": 10, "static": true}, + { "id": "aar-nsg-top5-talkers-download", "x": 6, "y": 15, "w": 6, "h": 12, "minW": 5, "minH": 10, "static": true}, + { "id": "aar-nsg-app-linechart", "x": 6, "y": 0, "w": 6, "h": 15, "minW": 5, "minH": 10, "static": true} + ], + "links": [ + { + "label": "Dashboard View", + "url": "/dashboards/aarNSG" + }, + { + "label": "Top Apps", + "url": "/dashboards/aarNSGTopApps" + }, + { + "label": "Detail View", + "url": "/dashboards/aarNSGDetail" + }, + { + "label": "NATT Events", + "url": "/dashboards/aarNSGNATTEvents" + }, + { + "label": "IKE", + "url": "/dashboards/aarNSGIKE" + }, + { + "label": "Alarms", + "url": "/dashboards/aarNSGAlarms" + } + ], + "filterOptions": { + "Metric": { + "parameter": "metric", + "default": "TotalBytesCount", + "options": [ + { + "label": "Total Bytes", + "value": "TotalBytesCount", + "default": true + }, + { + "label": "Total Packets", + "value": "TotalPacketsCount" + } + ] + } + } +} diff --git a/public/configurations/queries/aar-nsg-disk-barchart.json b/public/configurations/queries/aar-nsg-disk-barchart.json new file mode 100644 index 00000000..5f25b180 --- /dev/null +++ b/public/configurations/queries/aar-nsg-disk-barchart.json @@ -0,0 +1,27 @@ +{ + "id":"aar-nsg-disk-barchart", + "title":"TBD", + "service":"elasticsearch", + "query":{ + "index":"{{index:nuage_sysmon}}", + "type":"{{type:nuage_doc_type}}", + "body":{ + "size":1, + "sort":[ + {"timestamp":{"order":"desc"}} + ], + "query":{ + "bool":{ + "must":[ + { + "term": { + "system_id": "{{nsgSystemId}}" + } + } + ] + } + } + } + }, + "tabify":"nsgDiskUsage" +} diff --git a/public/configurations/queries/aar-nsg-resource-linechart.json b/public/configurations/queries/aar-nsg-resource-linechart.json new file mode 100644 index 00000000..7c0a3cba --- /dev/null +++ b/public/configurations/queries/aar-nsg-resource-linechart.json @@ -0,0 +1,52 @@ +{ + "id":"aar-nsg-resource-linechart", + "title":"TBD", + "service":"elasticsearch", + "query":{ + "index":"{{index:nuage_sysmon}}", + "type":"{{type:nuage_doc_type}}", + "body":{ + "size":0, + "query":{ + "bool":{ + "must":[ + { + "range":{ + "timestamp":{ + "gte":"{{startTime:now-24h}}", + "lte":"{{endTime:now}}", + "format":"epoch_millis" + } + } + }, + { + "term": { + "system_id": "{{nsgSystemId}}" + } + } + ] + } + }, + "aggs": { + "ts": { + "date_histogram": { + "field": "timestamp", + "interval": "{{interval:1h}}" + }, + "aggs": { + "CPU": { + "avg": { + "field": "cpu" + } + }, + "MEMORY": { + "avg": { + "field": "memory" + } + } + } + } + } + } + } +} diff --git a/public/configurations/visualizations/aar-enterprise-geomap-text-notactivated.json b/public/configurations/visualizations/aar-enterprise-geomap-text-notactivated.json index dc963d2d..fc72bcbf 100644 --- a/public/configurations/visualizations/aar-enterprise-geomap-text-notactivated.json +++ b/public/configurations/visualizations/aar-enterprise-geomap-text-notactivated.json @@ -3,7 +3,6 @@ "title": "NSGs Health", "query": "aar-enterprise-geomap-text", "graph": "MultiColumnStatusTextGraph", - "description":"Quick View of the Critical alarms for this NSG in the VSD dashboard", "showTitleBar":false, "data": { "targetedColumns": ["alarmedNSGCount.critical", "alarmedNSGCount.major", "alarmedNSGCount.healthy", "inactiveNSGCount"], diff --git a/public/configurations/visualizations/aar-nsg-alarm-count-critical.json b/public/configurations/visualizations/aar-nsg-alarm-count-critical.json deleted file mode 100644 index 6ec0ebe3..00000000 --- a/public/configurations/visualizations/aar-nsg-alarm-count-critical.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "aar-nsg-alarm-count-critical", - "title": "Critical Alarms", - "query": "aar-nsg-alarm-summary", - "graph": "SimpleTextGraph", - "description":"Quick View of the Critical alarms for this NSG in the VSD dashboard", - "showTitleBar":false, - "data": { - "borderRadius": "0", - "targetedColumn":"criticalAlarmsCount", - "circleColor":"#f76159", - "colors":[ - "red" - ] - }, - "listeners": [{ - "redirect": "/dashboards/aarNSGAlarms", - "params": { - "nsgId": "gatewayID" - } - }] -} diff --git a/public/configurations/visualizations/aar-nsg-alarm-count-major.json b/public/configurations/visualizations/aar-nsg-alarm-count-major.json deleted file mode 100644 index 9e2296bc..00000000 --- a/public/configurations/visualizations/aar-nsg-alarm-count-major.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": "aar-nsg-alarm-count-major", - "title": "Major Alarms", - "query": "aar-nsg-alarm-summary", - "graph": "SimpleTextGraph", - "description":"Quick View of the Major alarms for this NSG in the VSD dashboard", - "showTitleBar":false, - "data": { - "borderRadius": "0", - "targetedColumn":"majorAlarmsCount", - "colors":[ - "#ffd92f" - ] - }, - "listeners": [{ - "redirect": "/dashboards/aarNSGAlarms", - "params": { - "nsgId": "gatewayID" - } - }] -} diff --git a/public/configurations/visualizations/aar-nsg-alarm-count-minor.json b/public/configurations/visualizations/aar-nsg-alarm-count-minor.json deleted file mode 100644 index 50a0dd80..00000000 --- a/public/configurations/visualizations/aar-nsg-alarm-count-minor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": "aar-nsg-alarm-count-minor", - "title": "Minor Alarms", - "query": "aar-nsg-alarm-summary", - "graph": "SimpleTextGraph", - "description":"Quick View of the Minor alarms for this NSG in the VSD dashboard", - "showTitleBar":false, - "data": { - "borderRadius": "0", - "targetedColumn":"minorAlarmsCount", - "colors":[ - "green" - ] - }, - "listeners": [{ - "redirect": "/dashboards/aarNSGAlarms", - "params": { - "nsgId": "gatewayID" - } - }] -} diff --git a/public/configurations/visualizations/aar-nsg-alarm-text.json b/public/configurations/visualizations/aar-nsg-alarm-text.json new file mode 100644 index 00000000..6775c575 --- /dev/null +++ b/public/configurations/visualizations/aar-nsg-alarm-text.json @@ -0,0 +1,34 @@ +{ + "id": "aar-nsg-alarm-text", + "title": "NSG Health", + "query": "aar-nsg-alarm-summary", + "graph": "MultiColumnStatusTextGraph", + "description":"Quick View of the Critical alarms for this NSG in the VSD dashboard", + "showTitleBar":false, + "data": { + "targetedColumns": ["criticalAlarmsCount", "majorAlarmsCount", "minorAlarmsCount"], + "colors":[ + "#D9070A", + "#FFBF02", + "#62AC00" + ], + "texts": [ + "Critical Alarms", + "Major Alarms", + "Healthy NSGs" + ], + "margin": { + "top": "25px", + "bottom": "auto", + "left": "auto", + "right": "auto" + }, + "disableTitle": true + }, + "listeners": [{ + "redirect": "/dashboards/aarNSGAlarms", + "params": { + "nsgId": "gatewayID" + } + }] +} diff --git a/public/configurations/visualizations/aar-nsg-disk-barchart.json b/public/configurations/visualizations/aar-nsg-disk-barchart.json new file mode 100644 index 00000000..d65cca50 --- /dev/null +++ b/public/configurations/visualizations/aar-nsg-disk-barchart.json @@ -0,0 +1,28 @@ +{ + "id": "aar-nsg-disk-barchart", + "graph": "DynamicBarGraph", + "title": "Disk Utilisation on NSG", + "description": "Bar graph displays disk usage for two disks - /nuagetmpfs and /home", + "author": "Bharat Mukheja", + "creationDate": "11/26/2018", + "data": { + "brush": 7, + "tooltip": [ + { "column": "name", "label": "Disk" }, + { "column": "field", "label": "Type" }, + { "column": "value", "label": "Value (%)", "format": ",.2f"} + ], + "colors":[ + "#b3d645", + "#f76159" + ], + "yLabel": "Disk", + "xLabel": "Usage", + "xTickFormat": ".2s", + "yColumn": "name", + "stackColumn":"field", + "xColumn": "value", + "orientation":"horizontal" + }, + "query": "aar-nsg-disk-barchart" +} diff --git a/public/configurations/visualizations/aar-nsg-resource-linechart.json b/public/configurations/visualizations/aar-nsg-resource-linechart.json new file mode 100644 index 00000000..df9a289a --- /dev/null +++ b/public/configurations/visualizations/aar-nsg-resource-linechart.json @@ -0,0 +1,30 @@ +{ + "id": "aar-nsg-resource-linechart", + "graph": "MultiLineGraph", + "title": "Resource Utilisation", + "description": "Memory and CPU utilization over a period of time selected in interval", + "author": "Bharat Mukheja", + "creationDate": "11/19/2018", + "data": { + "dateHistogram": true, + "xColumn": "ts", + "xLabel": "Time", + "yColumn": ["CPU", "MEMORY"], + "yTickFormat": ",.1f", + "yLabel": "", + "yTicks": 5, + "linesColumn": ["CPU", "MEMORY"], + "legend": { + "orientation": "vertical", + "show": true, + "circleSize": 5, + "labelOffset": 5 + }, + "tooltip": [ + { "column": "columnType", "label": "Type"}, + { "column": "yColumn", "label": "Value (%)", "format": "0.2f"}, + { "column": "ts", "label": "Timestamp", "timeFormat": "%b %d, %y %X"} + ] + }, + "query": "aar-nsg-resource-linechart" +} diff --git a/src/components/App/MainMenu.js b/src/components/App/MainMenu.js index a5db51cc..822e86a0 100644 --- a/src/components/App/MainMenu.js +++ b/src/components/App/MainMenu.js @@ -174,7 +174,7 @@ class MainMenuView extends React.Component {
{nsgs.map((nsg) => { - let queryParams = Object.assign({}, context, { snsg: nsg.name, dnsg: nsg.name, nsgId: nsg.ID }); + let queryParams = Object.assign({}, context, { snsg: nsg.name, dnsg: nsg.name, nsgId: nsg.ID, nsgSystemId: nsg.systemID }); return ( d._source); + } else { + throw new Error("Tabify() invoked with invalid result set. Result set must have either 'aggregations' or 'hits' defined."); + } + table = response.hits.hits[0]._source.disks; + //table = flatArray(table) + + let finalData = []; + table.forEach(item => { + //Select only these two disks, and populate their percentages. Little workaround to avoid lots of configuration in configuration file + if (item.name === "/home" || item.name === "/nuagetmpfs"){ + finalData.push({ + name:item.name, + field:"used", + value:(item.used*100/(item.used+item.available)) + }); + finalData.push({ + name:item.name, + field:"available", + value:(item.available*100/(item.used+item.available)) + }); + } + }) + + if (process.env.NODE_ENV === "development") { + console.log("Results from tabify (first 3 rows only):"); + + // This one shows where there are "undefined" values. + console.log(finalData) + + // This one shows the full structure pretty-printed. + console.log(JSON.stringify(finalData.slice(0, 3), null, 2)) + } + + return finalData; +}