Merge pull request #441 from glensc/logrotate

use try-restart in logrotate sample

diff --git a/charts.d/apache.chart.sh b/charts.d/apache.chart.sh
index dbf14a43274ba1408c3da12d81220bc498f0f667..f4f7d0581b0729b8234bd241a4f49ce4514245fc 100755 (executable)
--- a/charts.d/apache.chart.sh
+++ b/charts.d/apache.chart.sh
@@ -2,6 +2,7 @@
 
 # the URL to download apache status info
 apache_url="http://127.0.0.1:80/server-status?auto"
+apache_curl_opts=
 
 # _update_every is a special variable - it holds the number of seconds
 # between the calls of the _update() function
@@ -94,7 +95,7 @@ apache_detect() {
 
 apache_get() {
        local oIFS="${IFS}" ret
-       IFS=$':\n' apache_response=($(curl -Ss "${apache_url}"))
+       IFS=$':\n' apache_response=($(curl -Ss ${apache_curl_opts} "${apache_url}"))
        ret=$?
        IFS="${oIFS}"
 

diff --git a/charts.d/nginx.chart.sh b/charts.d/nginx.chart.sh
index 450aa94b30cb066baf7902bd31a6a21cad36c781..9b75c2c5e68ae67ecf663b167e401ef470df22a2 100755 (executable)
--- a/charts.d/nginx.chart.sh
+++ b/charts.d/nginx.chart.sh
@@ -4,6 +4,7 @@
 # must start with X_
 
 nginx_url="http://127.0.0.1:80/stub_status"
+nginx_curl_opts=""
 
 # _update_every is a special variable - it holds the number of seconds
 # between the calls of the _update() function
@@ -19,7 +20,7 @@ nginx_reading=0
 nginx_writing=0
 nginx_waiting=0
 nginx_get() {
-       nginx_response=($(curl -Ss "${nginx_url}"))
+       nginx_response=($(curl -Ss ${nginx_curl_opts} "${nginx_url}"))
        [ $? -ne 0 -o "${#nginx_response[@]}" -eq 0 ] && return 1
 
        if [ "${nginx_response[0]}" != "Active" \

diff --git a/charts.d/phpfpm.chart.sh b/charts.d/phpfpm.chart.sh
index c0532fab11cf73f32e4176d394c350cfa4f0724d..55510169b4bb372bcc37bd7bba8415897679b3fb 100755 (executable)
--- a/charts.d/phpfpm.chart.sh
+++ b/charts.d/phpfpm.chart.sh
@@ -8,6 +8,7 @@
 # you can see, https://easyengine.io/tutorials/php/fpm-status-page/
 
 declare -A phpfpm_urls=()
+declare -A phpfpm_curl_opts=()
 
 # _update_every is a special variable - it holds the number of seconds
 # between the calls of the _update() function
@@ -29,8 +30,9 @@ phpfpm_max_active_processes=0
 phpfpm_max_children_reached=0
 phpfpm_slow_requests=0
 phpfpm_get() {
-       url=$1
-       phpfpm_response=($(curl -Ss "${url}"))
+       local opts="${1}" url="${2}"
+
+       phpfpm_response=($(curl -Ss ${opts} "${url}"))
        [ $? -ne 0 -o "${#phpfpm_response[@]}" -eq 0 ] && return 1
 
        if [[ "${phpfpm_response[0]}" != "pool:" \
@@ -94,7 +96,7 @@ phpfpm_check() {
        local m
        for m in "${!phpfpm_urls[@]}"
        do
-               phpfpm_get "${phpfpm_urls[$m]}"
+               phpfpm_get "${phpfpm_curl_opts[$m]}" "${phpfpm_urls[$m]}"
                if [ $? -ne 0 ]; then
                        echo >&2 "phpfpm: cannot find status on URL '${phpfpm_url[$m]}'. Please set phpfpm_urls[$m]='http://localhost/status' in $confd/phpfpm.conf"
                        unset phpfpm_urls[$m]
@@ -149,7 +151,7 @@ phpfpm_update() {
        local m
        for m in "${!phpfpm_urls[@]}"
        do
-               phpfpm_get "${phpfpm_urls[$m]}"
+               phpfpm_get "${phpfpm_curl_opts[$m]}" "${phpfpm_urls[$m]}"
                if [ $? -ne 0 ]; then
                        continue
                fi

diff --git a/charts.d/tomcat.chart.sh b/charts.d/tomcat.chart.sh
index f7809ddd3109a333d1127957735d770670c915b3..b0eddc7f0dac66345b79ad55b017a321b53ae5ac 100755 (executable)
--- a/charts.d/tomcat.chart.sh
+++ b/charts.d/tomcat.chart.sh
@@ -6,6 +6,7 @@
 # the URL to download tomcat status info
 # usually http://localhost:8080/manager/status?XML=true
 tomcat_url=""
+tomcat_curl_opts=""
 
 # set tomcat username/password here
 tomcatUser=""
@@ -64,7 +65,7 @@ tomcat_check() {
 tomcat_get() {
        # collect tomcat values
        tomcat_port="$(IFS=/ read -ra a <<< "$tomcat_url"; hostport=${a[2]}; echo "${hostport#*:}")"
-       mapfile -t lines < <(curl -u "$tomcatUser":"$tomcatPassword" -Ss "$tomcat_url" |\
+       mapfile -t lines < <(curl -u "$tomcatUser":"$tomcatPassword" -Ss ${tomcat_curl_opts} "$tomcat_url" |\
                xmlstarlet sel \
                        -t -m "/status/jvm/memory" -v @free \
                        -n -m "/status/connector[@name='\"http-bio-$tomcat_port\"']/threadInfo" -v @currentThreadCount \

diff --git a/web/Makefile.am b/web/Makefile.am
index 174ef229bcec8a2a8c0ac22a7a83e629b75cadb3..4a8f48a7b85e804f191ea84439435f539120a13d 100644 (file)
--- a/web/Makefile.am
+++ b/web/Makefile.am
@@ -77,6 +77,8 @@ dist_webfonts_DATA = \
 
 webimagesdir=$(webdir)/images
 dist_webimages_DATA = \
+       images/animated.gif \
+       images/post.png \
        images/seo-performance-16.png \
        images/seo-performance-24.png \
        images/seo-performance-32.png \

diff --git a/web/dashboard.html b/web/dashboard.html
index cf48ba8208726b72cf0837f0790946ac508056e7..0f9aca69f3cbcba2bbbc64422d3365f2773e363d 100644 (file)
--- a/web/dashboard.html
+++ b/web/dashboard.html
@@ -17,7 +17,7 @@
        <meta property="og:type" content="website"/>
        <meta property="og:site_name" content="netdata"/>
        <meta property="og:title" content="netdata - real-time performance monitoring, done right!"/>
-       <meta property="og:description" content="netdata is an embeddable real-time performance monitoring solution, for Linux systems, micro services, applications, APIs, SNMP devices. Stunning dashboards, blazzingly fast and extremely interactive." />
+       <meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
 </head>
 <body>
 

diff --git a/web/demo.html b/web/demo.html
index fb81b7a7c190a3d9c09e8d418db8a019379390d2..108a9486703d4e85585199f5d9edbeedadfdd24a 100644 (file)
--- a/web/demo.html
+++ b/web/demo.html
@@ -17,7 +17,7 @@
        <meta property="og:type" content="website"/>
        <meta property="og:site_name" content="netdata"/>
        <meta property="og:title" content="netdata - real-time performance monitoring, done right!"/>
-       <meta property="og:description" content="netdata is an embeddable real-time performance monitoring solution, for Linux systems, micro services, applications, APIs, SNMP devices. Stunning dashboards, blazzingly fast and extremely interactive." />
+       <meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
        
        <script type="text/javascript" src="dashboard.js?v38"></script>
 </head>

diff --git a/web/demo2.html b/web/demo2.html
index 98d9406e709e27e1ac75400311baf442ec786b72..237facd41e383215ad2a98c9ef7cb39dc7d4caf5 100644 (file)
--- a/web/demo2.html
+++ b/web/demo2.html
@@ -17,7 +17,7 @@
        <meta property="og:type" content="website"/>
        <meta property="og:site_name" content="netdata"/>
        <meta property="og:title" content="netdata - real-time performance monitoring, done right!"/>
-       <meta property="og:description" content="netdata is an embeddable real-time performance monitoring solution, for Linux systems, micro services, applications, APIs, SNMP devices. Stunning dashboards, blazzingly fast and extremely interactive." />
+       <meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
 
        <script>var netdataTheme = 'slate';</script>
        <script type="text/javascript" src="dashboard.js?v38"></script>

diff --git a/web/demosites.html b/web/demosites.html
index e26ce822a7d55376b7d06d7f16437bd6dadf57bb..3a106ede869a566942d26f680a917df4640061a2 100644 (file)
--- a/web/demosites.html
+++ b/web/demosites.html
@@ -16,7 +16,7 @@
        <meta property="og:type" content="website"/>
        <meta property="og:site_name" content="netdata"/>
        <meta property="og:title" content="netdata - real-time performance monitoring, done right!"/>
-       <meta property="og:description" content="netdata is an embeddable real-time performance monitoring solution, for Linux systems, micro services, applications, APIs, SNMP devices. Stunning dashboards, blazzingly fast and extremely interactive." />
+       <meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
 
        <script>
        // --- OPTIONS FOR THE DASHBOARD --

diff --git a/web/images/animated.gif b/web/images/animated.gif
new file mode 100644 (file)
index 0000000..0e94a20
Binary files /dev/null and b/web/images/animated.gif differ

diff --git a/web/images/post.png b/web/images/post.png
new file mode 100644 (file)
index 0000000..239af42
Binary files /dev/null and b/web/images/post.png differ

diff --git a/web/index.html b/web/index.html
index 3dcef9087bde078cd2fe66f701731b3328897a7b..fd808f7c8b32dca4310c52ca2b7009aa7e0bcc2f 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -27,12 +27,12 @@
        <link rel="icon" type="image/png" sizes="16x16" href="images/seo-performance-16.png">
 
        <meta property="og:locale" content="en_US" />
-       <meta property="og:image" content="https://my-netdata.io/images/seo-performance-512.png"/>
+       <meta property="og:image" content="http://my-netdata.io/images/post.png"/>
        <meta property="og:url" content="http://my-netdata.io/"/>
        <meta property="og:type" content="website"/>
        <meta property="og:site_name" content="netdata"/>
        <meta property="og:title" content="netdata - real-time performance monitoring, done right!"/>
-       <meta property="og:description" content="netdata is an embeddable real-time performance monitoring solution, for Linux systems, micro services, applications, APIs, SNMP devices. Stunning dashboards, blazzingly fast and extremely interactive." />
+       <meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
 
        <style>
 

diff --git a/web/tv.html b/web/tv.html
index 0a798ddae12bf4ba151b73fbb70af702d47165f3..f80c551bb734985eecb1102df33c5d76c124f2cf 100644 (file)
--- a/web/tv.html
+++ b/web/tv.html
@@ -16,7 +16,7 @@
        <meta property="og:type" content="website"/>
        <meta property="og:site_name" content="netdata"/>
        <meta property="og:title" content="netdata - real-time performance monitoring, done right!"/>
-       <meta property="og:description" content="netdata is an embeddable real-time performance monitoring solution, for Linux systems, micro services, applications, APIs, SNMP devices. Stunning dashboards, blazzingly fast and extremely interactive." />
+       <meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
        
        <script>
        // this section has to appear before loading dashboard.js