mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-19 07:23:06 +01:00
[fix] Remove files that are no longer in dev
This commit is contained in:
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user