summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCosta Tsaousis (ktsaou) <costa@tsaousis.gr>2016-12-19 09:43:36 +0200
committerCosta Tsaousis (ktsaou) <costa@tsaousis.gr>2016-12-19 09:43:36 +0200
commitb1eb6c5f19ef0361908357d82de034b4fb6cb524 (patch)
treeb8ece2d8c6bcabd867e42e23a721980c71d86eb8
parentce11c9a486d6c6eb3e80e7893432ef44287ccbe5 (diff)
do not overwrite root auto-detection for mysql
-rw-r--r--conf.d/python.d/mysql.conf18
-rw-r--r--web/demosites.html3
2 files changed, 11 insertions, 10 deletions
diff --git a/conf.d/python.d/mysql.conf b/conf.d/python.d/mysql.conf
index 7a70404216..63d635174a 100644
--- a/conf.d/python.d/mysql.conf
+++ b/conf.d/python.d/mysql.conf
@@ -213,41 +213,41 @@ tcpipv6_root:
# Now we try the same as above with user: netdata
-mycnf1_root:
+mycnf1_netdata:
name : 'local'
user : 'netdata'
'my.cnf' : '/etc/my.cnf'
-mycnf2_root:
+mycnf2_netdata:
name : 'local'
user : 'netdata'
'my.cnf' : '/etc/mysql/my.cnf'
-socket1_root:
+socket1_netdata:
name : 'local'
user : 'netdata'
# pass : ''
socket : '/var/run/mysqld/mysqld.sock'
-socket2_root:
+socket2_netdata:
name : 'local'
user : 'netdata'
# pass : ''
socket : '/var/run/mysqld/mysql.sock'
-socket3_root:
+socket3_netdata:
name : 'local'
user : 'netdata'
# pass : ''
socket : '/var/lib/mysql/mysql.sock'
-socket4_root:
+socket4_netdata:
name : 'local'
user : 'netdata'
# pass : ''
socket : '/tmp/mysql.sock'
-tcp_root:
+tcp_netdata:
name : 'local'
user : 'netdata'
# pass : ''
@@ -256,14 +256,14 @@ tcp_root:
# 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:
+tcpipv4_netdata:
name : 'local'
user : 'netdata'
# pass : ''
host : '127.0.0.1'
port : '3306'
-tcpipv6_root:
+tcpipv6_netdata:
name : 'local'
user : 'netdata'
# pass : ''
diff --git a/web/demosites.html b/web/demosites.html
index a3b4180d20..63a62d6966 100644
--- a/web/demosites.html
+++ b/web/demosites.html
@@ -626,7 +626,8 @@ p {
<p class=description>
Simple.
Effective.
- Awesome.<br/>&nbsp;<br/>
+ Awesome.
+ <br/>&nbsp;<br/>
<strong>Unparalleled</strong> insights, in <strong>real-time</strong>,
of <strong>everything</strong> happening on your Linux systems and applications,
with stunning, <strong>interactive</strong> web dashboards