[fix] Remove files that are no longer in dev

This commit is contained in:
William Wernert
2020-05-04 10:57:46 -04:00
parent 5805d68b58
commit 80aee06a67
200 changed files with 0 additions and 21066 deletions

View File

@@ -447,13 +447,6 @@
]
}
],
<<<<<<<< HEAD:salt/common/grafana/grafana_dashboards/forward_nodes/sensor.json
"thresholds": "5,10",
"title": "{{ SERVERNAME }} -Zeek Packet Loss",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
========
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
@@ -481,7 +474,6 @@
"min": null,
"show": true
},
>>>>>>>> dev:salt/grafana/dashboards/sensor_nodes/sensor.json
{
"format": "short",
"label": null,
@@ -2068,8 +2060,6 @@
}
},
{
<<<<<<<< HEAD:salt/common/grafana/grafana_dashboards/forward_nodes/sensor.json
========
"aliasColors": {},
"bars": false,
"cacheTimeout": null,
@@ -2203,7 +2193,6 @@
}
},
{
>>>>>>>> dev:salt/grafana/dashboards/sensor_nodes/sensor.json
"aliasColors": {
"Buffered": "#6ED0E0",
"Cached": "#F9934E",