summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Mashchenko <ilya@netdata.cloud>2019-11-25 17:13:35 +0300
committerGitHub <noreply@github.com>2019-11-25 17:13:35 +0300
commit17cd331cec5bc785f8a3ba746febe28171342d21 (patch)
tree7d628e74d4cd84be3dddebf4e9177c7a33c8a929
parent4e22b01094f40448b1a28f9490e75b0d22886597 (diff)
installer: include go.d.plugin version v0.11.0 (#7365)
* bump godplugin ver to 0.11.0 * update godplugin checksums * add python unbound module to obsolete modules list * add deprecation info to the python unbound readme * remove old unbound charts descriptions from the dashboard_info.js * add web_log go ver alarms * update web_log alarms info (401) * remove unbound from python.d.conf
-rw-r--r--collectors/python.d.plugin/python.d.conf1
-rw-r--r--collectors/python.d.plugin/python.d.plugin.in1
-rw-r--r--collectors/python.d.plugin/unbound/README.md6
-rw-r--r--health/health.d/web_log.conf198
-rw-r--r--packaging/go.d.checksums32
-rw-r--r--packaging/go.d.version2
-rw-r--r--web/gui/dashboard_info.js28
7 files changed, 220 insertions, 48 deletions
diff --git a/collectors/python.d.plugin/python.d.conf b/collectors/python.d.plugin/python.d.conf
index 20636e251c..08d59c4d3c 100644
--- a/collectors/python.d.plugin/python.d.conf
+++ b/collectors/python.d.plugin/python.d.conf
@@ -100,7 +100,6 @@ nginx_log: no
# traefik: yes
# tomcat: yes
# tor: yes
-unbound: no
# uwsgi: yes
# varnish: yes
# w1sensor: yes
diff --git a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d.plugin/python.d.plugin.in
index 7aa48cbdd8..44b6671cba 100644
--- a/collectors/python.d.plugin/python.d.plugin.in
+++ b/collectors/python.d.plugin/python.d.plugin.in
@@ -135,6 +135,7 @@ def available_modules():
'nginx_log', # replaced by web_log
'mdstat', # rewritten in C
'sslcheck', # rewritten in Go, memory leak bug https://github.com/netdata/netdata/issues/5624
+ 'unbound', # rewritten in Go
)
files = sorted(os.listdir(DIRS.modules))
diff --git a/collectors/python.d.plugin/unbound/README.md b/collectors/python.d.plugin/unbound/README.md
index d4ad3da15c..4a30761005 100644
--- a/collectors/python.d.plugin/unbound/README.md
+++ b/collectors/python.d.plugin/unbound/README.md
@@ -1,5 +1,11 @@
# unbound
+## Deprecation Notes
+
+This module is deprecated. Please use [new version](https://github.com/netdata/go.d.plugin/tree/master/modules/unbound) instead.
+
+___
+
Monitoring uses the remote control interface to fetch statistics.
Provides the following charts:
diff --git a/health/health.d/web_log.conf b/health/health.d/web_log.conf
index 031adc2eac..1aefd7b002 100644
--- a/health/health.d/web_log.conf
+++ b/health/health.d/web_log.conf
@@ -43,7 +43,7 @@ families: *
warn: ($1m_requests > 120) ? ($this < (($status >= $WARNING ) ? ( 95 ) : ( 85 )) ) : ( 0 )
crit: ($1m_requests > 120) ? ($this < (($status == $CRITICAL) ? ( 85 ) : ( 75 )) ) : ( 0 )
delay: up 2m down 15m multiplier 1.5 max 1h
- info: the ratio of successful HTTP responses (1xx, 2xx, 304) over the last minute
+ info: the ratio of successful HTTP responses (1xx, 2xx, 304, 401) over the last minute
to: webmaster
template: 1m_redirects
@@ -69,7 +69,7 @@ families: *
warn: ($1m_requests > 120) ? ($this > (($status >= $WARNING) ? ( 10 ) : ( 30 )) ) : ( 0 )
crit: ($1m_requests > 120) ? ($this > (($status == $CRITICAL) ? ( 30 ) : ( 50 )) ) : ( 0 )
delay: up 2m down 15m multiplier 1.5 max 1h
- info: the ratio of HTTP bad requests (4xx) over the last minute
+ info: the ratio of HTTP bad requests (4xx except 401) over the last minute
to: webmaster
template: 1m_internal_errors
@@ -191,3 +191,197 @@ options: no-clear-notification
(clear notification for this alarm will not be sent)
to: webmaster
+
+
+# ---------------------------------------------------GO-VERSION---------------------------------------------------------
+
+# make sure we can collect web log data
+
+template: web_log_last_collected_secs
+ on: web_log.requests
+families: *
+ calc: $now - $last_collected_t
+ units: seconds ago
+ every: 10s
+ warn: $this > (($status >= $WARNING) ? ($update_every) : ( 5 * $update_every))
+ crit: $this > (($status == $CRITICAL) ? ($update_every) : (60 * $update_every))
+ delay: down 5m multiplier 1.5 max 1h
+ info: number of seconds since the last successful data collection
+ to: webmaster
+
+# unmatched lines
+
+# the following alarms trigger only when there are enough data.
+# we assume there are enough data when:
+#
+# $1m_total_requests > 120
+#
+# i.e. when there are at least 120 requests during the last minute
+
+template: web_log_1m_total_requests
+ on: web_log.requests
+families: *
+ lookup: sum -1m unaligned
+ calc: ($this == 0)?(1):($this)
+ units: requests
+ every: 10s
+ info: the sum of all HTTP requests over the last minute
+
+template: web_log_1m_unmatched
+ on: web_log.excluded_requests
+families: *
+ lookup: sum -1m unaligned of unmatched
+ calc: $this * 100 / $web_log_1m_total_requests
+ units: %
+ every: 10s
+ warn: ($web_log_1m_total_requests > 120) ? ($this > 1) : ( 0 )
+ crit: ($web_log_1m_total_requests > 120) ? ($this > 5) : ( 0 )
+ delay: up 1m down 5m multiplier 1.5 max 1h
+ info: the ratio of unmatched lines, over the last minute
+ to: webmaster
+
+# -----------------------------------------------------------------------------
+# high level response code alarms
+
+# the following alarms trigger only when there are enough data.
+# we assume there are enough data when:
+#
+# $1m_requests > 120
+#
+# i.e. when there are at least 120 requests during the last minute
+
+template: web_log_1m_requests
+ on: web_log.type_requests
+families: *
+ lookup: sum -1m unaligned
+ calc: ($this == 0)?(1):($this)
+ units: requests
+ every: 10s
+ info: the sum of all HTTP requests over the last minute
+
+template: web_log_1m_successful
+ on: web_log.type_requests
+families: *
+ lookup: sum -1m unaligned of success
+ calc: $this * 100 / $web_log_1m_requests
+ units: %
+ every: 10s
+ warn: ($web_log_1m_requests > 120) ? ($this < (($status >= $WARNING ) ? ( 95 ) : ( 85 )) ) : ( 0 )
+ crit: ($web_log_1m_requests > 120) ? ($this < (($status == $CRITICAL) ? ( 85 ) : ( 75 )) ) : ( 0 )
+ delay: up 2m down 15m multiplier 1.5 max 1h
+ info: the ratio of successful HTTP responses (1xx, 2xx, 304, 401) over the last minute
+ to: webmaster
+
+template: web_log_1m_redirects
+ on: web_log.type_requests
+families: *
+ lookup: sum -1m unaligned of redirect
+ calc: $this * 100 / $web_log_1m_requests
+ units: %
+ every: 10s
+ warn: ($web_log_1m_requests > 120) ? ($this > (($status >= $WARNING ) ? ( 1 ) : ( 20 )) ) : ( 0 )
+ crit: ($web_log_1m_requests > 120) ? ($this > (($status == $CRITICAL) ? ( 20 ) : ( 30 )) ) : ( 0 )
+ delay: up 2m down 15m multiplier 1.5 max 1h
+ info: the ratio of HTTP redirects (3xx except 304) over the last minute
+ to: webmaster
+
+template: web_log_1m_bad_requests
+ on: web_log.type_requests
+families: *
+ lookup: sum -1m unaligned of bad
+ calc: $this * 100 / $web_log_1m_requests
+ units: %
+ every: 10s
+ warn: ($web_log_1m_requests > 120) ? ($this > (($status >= $WARNING) ? ( 10 ) : ( 30 )) ) : ( 0 )
+ crit: ($web_log_1m_requests > 120) ? ($this > (($status == $CRITICAL) ? ( 30 ) : ( 50 )) ) : ( 0 )
+ delay: up 2m down 15m multiplier 1.5 max 1h
+ info: the ratio of HTTP bad requests (4xx except 401) over the last minute
+ to: webmaster
+
+template: web_log_1m_internal_errors
+ on: web_log.type_requests
+families: *
+ lookup: sum -1m unaligned of error
+ calc: $this * 100 / $web_log_1m_requests
+ units: %
+ every: 10s
+ warn: ($web_log_1m_requests > 120) ? ($this > (($status >= $WARNING) ? ( 1 ) : ( 2 )) ) : ( 0 )
+ crit: ($web_log_1m_requests > 120) ? ($this > (($status == $CRITICAL) ? ( 2 ) : ( 5 )) ) : ( 0 )
+ delay: up 2m down 15m multiplier 1.5 max 1h
+ info: the ratio of HTTP internal server errors (5xx), over the last minute
+ to: webmaster
+
+# -----------------------------------------------------------------------------
+# web slow
+
+# the following alarms trigger only when there are enough data.
+# we assume there are enough data when:
+#
+# $1m_requests > 120
+#
+# i.e. when there are at least 120 requests during the last minute
+
+template: web_log_10m_response_time
+ on: web_log.request_processing_time
+families: *
+ lookup: average -10m unaligned of avg
+ units: ms
+ every: 30s
+ info: the average time to respond to HTTP requests, over the last 10 minutes
+
+template: web_log_web_slow
+ on: web_log.request_processing_time
+families: *
+ lookup: average -1m unaligned of avg
+ units: ms
+ every: 10s
+ green: 500
+ red: 1000
+ warn: ($web_log_1m_requests > 120) ? ($this > $green && $this > ($web_log_10m_response_time * 2) ) : ( 0 )
+ crit: ($web_log_1m_requests > 120) ? ($this > $red && $this > ($web_log_10m_response_time * 4) ) : ( 0 )
+ delay: down 15m multiplier 1.5 max 1h
+ info: the average time to respond to HTTP requests, over the last 1 minute
+ options: no-clear-notification
+ to: webmaster
+
+# -----------------------------------------------------------------------------
+# web too many or too few requests
+
+# the following alarms trigger only when there are enough data.
+# we assume there are enough data when:
+#
+# $5m_successful_old > 120
+#
+# i.e. when there were at least 120 requests during the 5 minutes starting
+# at -10m and ending at -5m
+
+template: web_log_5m_successful_old
+ on: web_log.type_requests
+families: *
+ lookup: average -5m at -5m unaligned of success
+ units: requests/s
+ every: 30s
+ info: average rate of successful HTTP requests over the last 5 minutes
+
+template: web_log_5m_successful
+ on: web_log.type_requests
+families: *
+ lookup: average -5m unaligned of success
+ units: requests/s
+ every: 30s
+ info: average successful HTTP requests over the last 5 minutes
+
+template: web_log_5m_requests_ratio
+ on: web_log.type_requests
+families: *
+ calc: ($web_log_5m_successful_old > 0)?($web_log_5m_successful * 100 / $web_log_5m_successful_old):(100)
+ units: %
+ every: 30s
+ warn: ($web_log_5m_successful_old > 120) ? ($this > 200 OR $this < 50) : (0)
+ crit: ($web_log_5m_successful_old > 120) ? ($this > 400 OR $this < 25) : (0)
+ delay: down 15m multiplier 1.5 max 1h
+options: no-clear-notification
+ info: the percentage of successful web requests over the last 5 minutes, \
+ compared with the previous 5 minutes \
+ (clear notification for this alarm will not be sent)
+ to: webmaster
diff --git a/packaging/go.d.checksums b/packaging/go.d.checksums
index 9437104260..6f7d30b39c 100644
--- a/packaging/go.d.checksums
+++ b/packaging/go.d.checksums
@@ -1,16 +1,16 @@
-e99a297521e8420fe9fca440d58c666df5c5498c82a980ca5ac3411e0cbf6e0d *config.tar.gz
-8b8d8f99d8649537185b91f85aebd1d088a30ccd2136bec19dee3f19592234f7 *go.d.plugin-v0.10.0.darwin-386.tar.gz
-335c5e417f4bbf7cf3a5d7cacc934885fc8fb6d9831d19179d0ea99f0fb8d53d *go.d.plugin-v0.10.0.darwin-amd64.tar.gz
-753b47e291985c1864f242cd3de555f702b7975b0890303abaf64913a4658d2a *go.d.plugin-v0.10.0.freebsd-386.tar.gz
-25dacbb8c14469c50ee8ae353803630732ffc6caca7a94603cd98e946a861788 *go.d.plugin-v0.10.0.freebsd-amd64.tar.gz
-4382862045849d242f1d92dc1596eea729714d8f6ee21a61305691f1260d23c4 *go.d.plugin-v0.10.0.freebsd-arm.tar.gz
-fc2413d59bfa80509db6b6bfd11fba3b232b504e9865e4a7a4555d7cec68fb5e *go.d.plugin-v0.10.0.linux-386.tar.gz
-e027831ba0108260ceead05df991dac008693195699df3d195c403c8dd29ae49 *go.d.plugin-v0.10.0.linux-amd64.tar.gz
-9221283f0fccb7940f4b40852430965c9a2186255119c9dfec4e634099c36893 *go.d.plugin-v0.10.0.linux-arm.tar.gz
-8f88c4ecdde55408a3b38c6dab801ab63057e1d4efbe1a0ba25aeaa69c90e491 *go.d.plugin-v0.10.0.linux-arm64.tar.gz
-e41b1c0c7bb09a816798428659d8e0b4e6ff5194f1741fc3e304e0e841561c53 *go.d.plugin-v0.10.0.linux-mips.tar.gz
-2d3d9ca920b8207482229abad43caa58f5c17e36beac5e59b5a6d52289741576 *go.d.plugin-v0.10.0.linux-mips64.tar.gz
-9d4e5bdb4c0b51c37938d8f4559ed553fbd0e87357433a4fd5ced1aae93114ca *go.d.plugin-v0.10.0.linux-mips64le.tar.gz
-7244bf058cd8e7163324dbcf263ec13021f202cca6c6ed24b6611d62523fcdfe *go.d.plugin-v0.10.0.linux-mipsle.tar.gz
-9637bfe94f7622752a558674c446077f2c7bb1b87d33e807efe624e78d5500ca *go.d.plugin-v0.10.0.linux-ppc64.tar.gz
-a151fcc992b9cab53a92ae6fa64cafe9d9bd52c37838400433acd1ad98ff9a96 *go.d.plugin-v0.10.0.linux-ppc64le.tar.gz
+150136ab8f44699e7998383879a162a24929f6d2a15b67c458282e909511db1d *config.tar.gz
+4727baf7e12c27631013088078d88824a3d88a5706a4c41941a4ce247ad94e9f *go.d.plugin-v0.11.0.darwin-386.tar.gz
+e4609376184ca41865883ac474ba14d217be8bee8607cf01e8270a664ebb8352 *go.d.plugin-v0.11.0.darwin-amd64.tar.gz
+d09ad9eafb8c7431e3a9103c2fa7a92422ecfb22e42b6e3f48ffe29ab5b4e574 *go.d.plugin-v0.11.0.freebsd-386.tar.gz
+a6164659332bcac5d812ece9d4434558bc3c1634ad9ebb7e7e22d2a0a3309b1f *go.d.plugin-v0.11.0.freebsd-amd64.tar.gz
+ae6194a40fbdb731b9d35588bbf0a2415f74374fe5b70e2666272c112f486ea2 *go.d.plugin-v0.11.0.freebsd-arm.tar.gz
+dcf406a3106f713c70ab7279f4b540cc71d338a7fb4393ed372f81bca9381cdb *go.d.plugin-v0.11.0.linux-386.tar.gz
+816103eecd6c46143eda10507a5be7f2b12eade409236ced075a6c3dcf374b4b *go.d.plugin-v0.11.0.linux-amd64.tar.gz
+cd51ddf81270e065dbc298d51a36a3b8f59975448fbb2def5686460071b5df50 *go.d.plugin-v0.11.0.linux-arm.tar.gz
+5b1eee46997ab84687a77bb55e68806162b658df3d3ab26163b1d3146f0765aa *go.d.plugin-v0.11.0.linux-arm64.tar.gz
+ac85e4c288ee3ed273b41ad037964310e62404511ba66f0fdd9549cc7db7ee84 *go.d.plugin-v0.11.0.linux-mips.tar.gz
+7208f810efa4ae40612187d29da9274ee054d06cb442de8a5a2c923be88f95c8 *go.d.plugin-v0.11.0.linux-mips64.tar.gz
+e9f9729ef1ab8410e30706c2a9649e7e636af2e02b826ee1e5215c4dca6ff43d *go.d.plugin-v0.11.0.linux-mips64le.tar.gz
+3b19879e3000dc8354ab525173ac6b6f08cd811a6d2158cc014f3a7ddb5baa6f *go.d.plugin-v0.11.0.linux-mipsle.tar.gz
+c46748da48ec11a9c057d4db4c35c8f4dd170f1b259d85f546e74ffc24752eed *go.d.plugin-v0.11.0.linux-ppc64.tar.gz
+4578d8ecc606f77fe78d4420f9e7c9775edc0f4343c7e1d40a925b6de593bc23 *go.d.plugin-v0.11.0.linux-ppc64le.tar.gz
diff --git a/packaging/go.d.version b/packaging/go.d.version
index bf057dbfd9..fd2726c91d 100644
--- a/packaging/go.d.version
+++ b/packaging/go.d.version
@@ -1 +1 @@
-v0.10.0
+v0.11.0
diff --git a/web/gui/dashboard_info.js b/web/gui/dashboard_info.js
index fbd1a667ce..cb5c9f7bcf 100644
--- a/web/gui/dashboard_info.js
+++ b/web/gui/dashboard_info.js
@@ -2407,34 +2407,6 @@ netdataDashboard.context = {
info: 'The number of currently connect users on the monitored Spigot server.'
},
- 'unbound.queries': {
- info: 'Shows the number of queries being processed of each type. Note that <code>Recursive</code> queries are also accounted as cache misses.'
- },
-
- 'unbound.reqlist': {
- info: 'Shows various stats about Unbound\'s internal request list.'
- },
-
- 'unbound.recursion': {
- info: 'Average and median time to complete recursive name resolution.'
- },
-
- 'unbound.cache': {
- info: 'The number of items in each of the various caches.'
- },
-
- 'unbound.threads.queries': {
- height: 0.2
- },
-
- 'unbound.threads.reqlist': {
- height: 0.2
- },
-
- 'unbound.threads.recursion': {
- height: 0.2
- },
-
'boinc.tasks': {
info: 'The total number of tasks and the number of active tasks. Active tasks are those which are either currently being processed, or are partialy processed but suspended.'
},