From 1595e59369f36c1720f63a9e0a2c113df68c7e9c Mon Sep 17 00:00:00 2001
From: onefang
Date: Fri, 27 Dec 2019 13:49:32 +1000
Subject: Rejig the graphs.

---
 conf/config.php   |  2 +-
 conf/types.db     |  2 +-
 plugin/FTP.json   |  2 +-
 plugin/HTTP.json  | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 plugin/HTTPS.json | 35 +--------------------------------
 plugin/RSYNC.json |  2 +-
 6 files changed, 63 insertions(+), 39 deletions(-)
 mode change 120000 => 100644 plugin/HTTP.json
 mode change 100644 => 120000 plugin/HTTPS.json

diff --git a/conf/config.php b/conf/config.php
index f66723a..eae3307 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -35,7 +35,7 @@ $CONFIG['rrdtool_opts'] = array(
 
 # default plugins to show on host page
 #$CONFIG['overview'] = array('load', 'cpu', 'memory', 'swap');
-$CONFIG['overview'] = array('FTP', 'HTTP', 'HTTPS', 'RSYNC');
+$CONFIG['overview'] = array('FTP', 'HTTP', 'HTTPS', 'RSYNC', 'Speed');
 
 # allowed other plugins to show on host page
 $CONFIG['allowed'] = array();
diff --git a/conf/types.db b/conf/types.db
index 0605eae..e7123e9 100644
--- a/conf/types.db
+++ b/conf/types.db
@@ -1,2 +1,2 @@
 Speed                   max:GAUGE:0:U, min:GAUGE:0:U
-Tests                   ProtocolWarnings:GUAGE:0:U, URLSanityErrors:GUAGE:0:U, IntegrityErrors:GUAGE:0:U, IntegrityWarnings:GUAGE:0:U, UpdatedErrors:GUAGE:0:U, UpdatedWarnings:GUAGE:0:U
+Tests                   URLSanityErrors:GUAGE:0:U, URLSanityWarnings:GUAGE:0:U, URLSanityTimeouts:GUAGE:0:U, ProtocolErrors:GUAGE:0:U, ProtocolWarnings:GUAGE:0:U, ProtocolTimeouts:GUAGE:0:U, UpdatedErrors:GUAGE:0:U, UpdatedWarnings:GUAGE:0:U, UpdatedTimeouts:GUAGE:0:U, IntegrityErrors:GUAGE:0:U, IntegrityWarnings:GUAGE:0:U, IntegrityTimeouts:GUAGE:0:U
diff --git a/plugin/FTP.json b/plugin/FTP.json
index 8d0efb8..919fd10 120000
--- a/plugin/FTP.json
+++ b/plugin/FTP.json
@@ -1 +1 @@
-HTTPS.json
\ No newline at end of file
+HTTP.json
\ No newline at end of file
diff --git a/plugin/HTTP.json b/plugin/HTTP.json
deleted file mode 120000
index 8d0efb8..0000000
--- a/plugin/HTTP.json
+++ /dev/null
@@ -1 +0,0 @@
-HTTPS.json
\ No newline at end of file
diff --git a/plugin/HTTP.json b/plugin/HTTP.json
new file mode 100644
index 0000000..2c27f37
--- /dev/null
+++ b/plugin/HTTP.json
@@ -0,0 +1,58 @@
+{
+	"Tests": {
+		"title": "Issues on {{HOST}}",
+		"vertical": "count",
+		"type": "stacked",
+		"legend": {
+			"URLSanityErrors": {
+				"name": "URLSanity errors",
+				"color": "440000"
+			},
+			"URLSanityWarnings": {
+				"name": "URLSanity warnings",
+				"color": "004400"
+			},
+			"URLSanityTimeouts": {
+				"name": "URLSanity timeouts",
+				"color": "000044"
+			},
+			"ProtocolErrors": {
+				"name": "Protocol errors",
+				"color": "880000"
+			},
+			"ProtocolWarnings": {
+				"name": "Protocol warnings",
+				"color": "008888"
+			},
+			"ProtocolTimeouts": {
+				"name": "Protocol timeouts",
+				"color": "000088"
+			},
+			"UpdatedErrors": {
+				"name": "Updated errors",
+				"color": "bb0000"
+			},
+			"UpdatedWarnings": {
+				"name": "Updated warnings",
+				"color": "00bbbb"
+			},
+			"UpdatedTimeouts": {
+				"name": "Updated timeouts",
+				"color": "0000bb"
+			},
+			"IntegrityErrors": {
+				"name": "Integrity errors",
+				"color": "ffffff"
+			},
+			"IntegrityWarnings": {
+				"name": "Integrity warnings",
+				"color": "00ff00"
+			},
+			"IntegrityTimeouts": {
+				"name": "Integrity timeouts",
+				"color": "0000ff"
+			}
+		},
+		"legend_format": "%5.0lf"
+	}
+}
diff --git a/plugin/HTTPS.json b/plugin/HTTPS.json
deleted file mode 100644
index 2c6ddeb..0000000
--- a/plugin/HTTPS.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"Tests": {
-		"title": "Issuess on {{HOST}}",
-		"vertical": "count",
-		"type": "stacked",
-		"legend": {
-			"ProtocolWarnings": {
-				"name": "Protocol warnings",
-				"color": "0000ff"
-			},
-			"URLSanityErrors": {
-				"name": "URLSanity errors",
-				"color": "ff00ff"
-			},
-			"IntegrityErrors": {
-				"name": "Integrity errors",
-				"color": "ff0000"
-			},
-			"IntegrityWarnings": {
-				"name": "Integrity warnings",
-				"color": "ffff00"
-			},
-			"UpdatedErrors": {
-				"name": "Updated errors",
-				"color": "880000"
-			},
-			"UpdatedWarnings": {
-				"name": "Updated warnings",
-				"color": "888800"
-			}
-		},
-		"legend_format": "%5.0lf"
-	}
-}
diff --git a/plugin/HTTPS.json b/plugin/HTTPS.json
new file mode 120000
index 0000000..919fd10
--- /dev/null
+++ b/plugin/HTTPS.json
@@ -0,0 +1 @@
+HTTP.json
\ No newline at end of file
diff --git a/plugin/RSYNC.json b/plugin/RSYNC.json
index 8d0efb8..919fd10 120000
--- a/plugin/RSYNC.json
+++ b/plugin/RSYNC.json
@@ -1 +1 @@
-HTTPS.json
\ No newline at end of file
+HTTP.json
\ No newline at end of file
-- 
cgit v1.1