From 87649cf32bd0e14d5a903fb85b01e9f41a253540 Mon Sep 17 00:00:00 2001 From: Federico Ceratto Date: Wed, 23 Nov 2016 15:49:10 +0000 Subject: New upstream version 1.4.0+dfsg --- conf.d/python.d/mysql.conf | 4 +++ conf.d/python.d/nginx.conf | 27 +++++++++++++++-- conf.d/python.d/phpfpm.conf | 7 +++-- conf.d/python.d/retroshare.conf | 67 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 conf.d/python.d/retroshare.conf (limited to 'conf.d/python.d') diff --git a/conf.d/python.d/mysql.conf b/conf.d/python.d/mysql.conf index d247b89a0..8fbbe6513 100644 --- a/conf.d/python.d/mysql.conf +++ b/conf.d/python.d/mysql.conf @@ -104,6 +104,8 @@ tcp: # pass : '' host : 'localhost' port : '3306' + # keep in mind port might be ignored by mysql, if host = 'localhost' + # http://serverfault.com/questions/337818/how-to-force-mysql-to-connect-by-tcp-instead-of-a-unix-socket/337844#337844 tcpipv4: name : 'local' @@ -158,6 +160,8 @@ tcp_root: # pass : '' host : 'localhost' port : '3306' + # keep in mind port might be ignored by mysql, if host = 'localhost' + # http://serverfault.com/questions/337818/how-to-force-mysql-to-connect-by-tcp-instead-of-a-unix-socket/337844#337844 tcpipv4_root: name : 'local' diff --git a/conf.d/python.d/nginx.conf b/conf.d/python.d/nginx.conf index 1a27d67c5..645925a55 100644 --- a/conf.d/python.d/nginx.conf +++ b/conf.d/python.d/nginx.conf @@ -1,5 +1,17 @@ # netdata python.d.plugin configuration for nginx # +# You must have ngx_http_stub_status_module configured on your nginx server for this +# plugin to work. The following is an example config. +# It must be located inside a server { } block. +# +# location /stub_status { +# stub_status; +# # Security: Only allow access from the IP below. +# allow 192.168.1.200; +# # Deny anyone else +# deny all; +# } +# # This file is in YaML format. Generally the format is: # # name: value @@ -47,14 +59,15 @@ # predefined parameters. These are: # # job_name: -# name: myname # the JOB's name as it will appear at the -# # dashboard (by default is the job_name) +# name: my_name # the JOB's name as it will appear at the +# # dashboard. If name: is not supplied the +# # job_name: will be used (use _ for spaces) # # JOBs sharing a name are mutually exclusive # update_every: 1 # the JOB's data collection frequency # priority: 60000 # the JOB's order on the dashboard # retries: 5 # the JOB's number of restoration attempts # -# Additionally to the above, nginx also supports the following: +# Additionally to the above, this plugin also supports the following: # # url: 'URL' # the URL to fetch nginx's status stats # @@ -63,6 +76,14 @@ # user: 'username' # pass: 'password' # +# Example +# +# RemoteNginx: +# name : 'Reverse_Proxy' +# url : 'http://yourdomain.com/stub_status' +# +# "RemoteNginx" will show up in Netdata logs. "Reverse Proxy" will show up in the menu +# in the nginx section. # ---------------------------------------------------------------------- # AUTO-DETECTION JOBS diff --git a/conf.d/python.d/phpfpm.conf b/conf.d/python.d/phpfpm.conf index 06d2367ae..f5d067cc7 100644 --- a/conf.d/python.d/phpfpm.conf +++ b/conf.d/python.d/phpfpm.conf @@ -57,6 +57,7 @@ # Additionally to the above, PHP-FPM also supports the following: # # url: 'URL' # the URL to fetch nginx's status stats +# # Be sure and include ?full&status at the end of the url # # if the URL is password protected, the following are supported: # @@ -70,13 +71,13 @@ localhost: name : 'local' - url : "http://localhost/status" + url : "http://localhost/status?full&json" localipv4: name : 'local' - url : "http://127.0.0.1/status" + url : "http://127.0.0.1/status?full&json" localipv6: name : 'local' - url : "http://::1/status" + url : "http://::1/status?full&json" diff --git a/conf.d/python.d/retroshare.conf b/conf.d/python.d/retroshare.conf new file mode 100644 index 000000000..79614373b --- /dev/null +++ b/conf.d/python.d/retroshare.conf @@ -0,0 +1,67 @@ +# netdata python.d.plugin configuration for RetroShare +# +# This file is in YaML format. Generally the format is: +# +# name: value +# +# There are 2 sections: +# - global variables +# - one or more JOBS +# +# JOBS allow you to collect values from multiple sources. +# Each source will have its own set of charts. +# +# JOB parameters have to be indented (using spaces only, example below). + +# ---------------------------------------------------------------------- +# Global Variables +# These variables set the defaults for all JOBs, however each JOB +# may define its own, overriding the defaults. + +# update_every sets the default data collection frequency. +# If unset, the python.d.plugin default is used. +# update_every: 1 + +# priority controls the order of charts at the netdata dashboard. +# Lower numbers move the charts towards the top of the page. +# If unset, the default for python.d.plugin is used. +# priority: 60000 + +# retries sets the number of retries to be made in case of failures. +# If unset, the default for python.d.plugin is used. +# Attempts to restore the service are made once every update_every +# and only if the module has collected values in the past. +# retries: 5 + +# ---------------------------------------------------------------------- +# JOBS (data collection sources) +# +# The default JOBS share the same *name*. JOBS with the same name +# are mutually exclusive. Only one of them will be allowed running at +# any time. This allows autodetection to try several alternatives and +# pick the one that works. +# +# Any number of jobs is supported. +# +# All python.d.plugin JOBS (for all its modules) support a set of +# predefined parameters. These are: +# +# job_name: +# name: myname # the JOB's name as it will appear at the +# # dashboard (by default is the job_name) +# # JOBs sharing a name are mutually exclusive +# update_every: 1 # the JOB's data collection frequency +# priority: 60000 # the JOB's order on the dashboard +# retries: 5 # the JOB's number of restoration attempts +# +# Additionally to the above, RetroShare also supports the following: +# +# - url: 'url' # the URL to the WebUI +# +# ---------------------------------------------------------------------- +# AUTO-DETECTION JOBS +# only one of them will run (they have the same name) + +localhost: + name: 'local' + url: 'http://localhost:9090' -- cgit v1.2.3