do not overwrite root auto-detection for mysql

diff --git a/conf.d/python.d/mysql.conf b/conf.d/python.d/mysql.conf
index 7a704042166678a8dd370a4383e133318a171a67..63d635174a026b4943b78d1f7a42a3fc0bbfca01 100644 (file)
--- 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 a3b4180d2065b9aa02376a75e7b85519062e089b..63a62d6966ef7b329d04857f32dd5cbb7ba5c457 100644 (file)
--- 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