Rejig the graphs.

author: onefang 2019-12-27 13:49:32 +1000
committer: onefang 2019-12-27 13:49:32 +1000
commit: 1595e59369f36c1720f63a9e0a2c113df68c7e9c (patch)
tree: a0da967482ef1263b2507e923921c04fb67ea95e
parent: Speed RRD is now it's own thing, not a separate one per protocol. (diff)
download: apt-panopticon_cgp-1595e59369f36c1720f63a9e0a2c113df68c7e9c.zip
apt-panopticon_cgp-1595e59369f36c1720f63a9e0a2c113df68c7e9c.tar.gz
apt-panopticon_cgp-1595e59369f36c1720f63a9e0a2c113df68c7e9c.tar.bz2
apt-panopticon_cgp-1595e59369f36c1720f63a9e0a2c113df68c7e9c.tar.xz
6 files changed, 63 insertions, 39 deletions
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
index 8d0efb8..2c27f37 120000..100644
--- a/plugin/HTTP.json
+++ b/plugin/HTTP.json
@@ -1 +1,58 @@
-HTTPS.json
-\ No newline at end of file
+{
+        "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
index 2c6ddeb..919fd10 100644..120000
--- a/plugin/HTTPS.json
+++ b/plugin/HTTPS.json
@@ -1,34 +1 @@
-{
+HTTP.json
+\ No newline at end of file
-        "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/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
author	onefang	2019-12-27 13:49:32 +1000
committer	onefang	2019-12-27 13:49:32 +1000
commit	1595e59369f36c1720f63a9e0a2c113df68c7e9c (patch)
tree	a0da967482ef1263b2507e923921c04fb67ea95e
parent	Speed RRD is now it's own thing, not a separate one per protocol. (diff)
download	apt-panopticon_cgp-1595e59369f36c1720f63a9e0a2c113df68c7e9c.zip apt-panopticon_cgp-1595e59369f36c1720f63a9e0a2c113df68c7e9c.tar.gz apt-panopticon_cgp-1595e59369f36c1720f63a9e0a2c113df68c7e9c.tar.bz2 apt-panopticon_cgp-1595e59369f36c1720f63a9e0a2c113df68c7e9c.tar.xz

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(
35		35
36	# default plugins to show on host page	36	# default plugins to show on host page
37	#$CONFIG['overview'] = array('load', 'cpu', 'memory', 'swap');	37	#$CONFIG['overview'] = array('load', 'cpu', 'memory', 'swap');
38	$CONFIG['overview'] = array('FTP', 'HTTP', 'HTTPS', 'RSYNC');	38	$CONFIG['overview'] = array('FTP', 'HTTP', 'HTTPS', 'RSYNC', 'Speed');
39		39
40	# allowed other plugins to show on host page	40	# allowed other plugins to show on host page
41	$CONFIG['allowed'] = array();	41	$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 @@
1	Speed max:GAUGE:0:U, min:GAUGE:0:U	1	Speed max:GAUGE:0:U, min:GAUGE:0:U
2	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	2	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 index 8d0efb8..2c27f37 120000..100644 --- a/plugin/HTTP.json +++ b/plugin/HTTP.json
@@ -1 +1,58 @@
1	HTTPS.json \ No newline at end of file	1	{
		2	"Tests": {
		3	"title": "Issues on {{HOST}}",
		4	"vertical": "count",
		5	"type": "stacked",
		6	"legend": {
		7	"URLSanityErrors": {
		8	"name": "URLSanity errors",
		9	"color": "440000"
		10	},
		11	"URLSanityWarnings": {
		12	"name": "URLSanity warnings",
		13	"color": "004400"
		14	},
		15	"URLSanityTimeouts": {
		16	"name": "URLSanity timeouts",
		17	"color": "000044"
		18	},
		19	"ProtocolErrors": {
		20	"name": "Protocol errors",
		21	"color": "880000"
		22	},
		23	"ProtocolWarnings": {
		24	"name": "Protocol warnings",
		25	"color": "008888"
		26	},
		27	"ProtocolTimeouts": {
		28	"name": "Protocol timeouts",
		29	"color": "000088"
		30	},
		31	"UpdatedErrors": {
		32	"name": "Updated errors",
		33	"color": "bb0000"
		34	},
		35	"UpdatedWarnings": {
		36	"name": "Updated warnings",
		37	"color": "00bbbb"
		38	},
		39	"UpdatedTimeouts": {
		40	"name": "Updated timeouts",
		41	"color": "0000bb"
		42	},
		43	"IntegrityErrors": {
		44	"name": "Integrity errors",
		45	"color": "ffffff"
		46	},
		47	"IntegrityWarnings": {
		48	"name": "Integrity warnings",
		49	"color": "00ff00"
		50	},
		51	"IntegrityTimeouts": {
		52	"name": "Integrity timeouts",
		53	"color": "0000ff"
		54	}
		55	},
		56	"legend_format": "%5.0lf"
		57	}
		58	}


diff --git a/plugin/HTTPS.json b/plugin/HTTPS.json index 2c6ddeb..919fd10 100644..120000 --- a/plugin/HTTPS.json +++ b/plugin/HTTPS.json
@@ -1,34 +1 @@
1	{		HTTP.json \ No newline at end of file
2	"Tests": {
3	"title": "Issuess on {{HOST}}",
4	"vertical": "count",
5	"type": "stacked",
6	"legend": {
7	"ProtocolWarnings": {
8	"name": "Protocol warnings",
9	"color": "0000ff"
10	},
11	"URLSanityErrors": {
12	"name": "URLSanity errors",
13	"color": "ff00ff"
14	},
15	"IntegrityErrors": {
16	"name": "Integrity errors",
17	"color": "ff0000"
18	},
19	"IntegrityWarnings": {
20	"name": "Integrity warnings",
21	"color": "ffff00"
22	},
23	"UpdatedErrors": {
24	"name": "Updated errors",
25	"color": "880000"
26	},
27	"UpdatedWarnings": {
28	"name": "Updated warnings",
29	"color": "888800"
30	}
31	},
32	"legend_format": "%5.0lf"
33	}
34	}


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