From 6a28f5a215a79115c5557dbbe41f13250d8d0094 Mon Sep 17 00:00:00 2001 From: Stig Sandbeck Mathisen Date: Sat, 4 Oct 2014 21:16:42 +0200 Subject: [PATCH] Save with UNIX line breaks - also remove lots of trailing whitespace on last line --- plugins/ftp/proftpd | 50 ++++++++++---------- plugins/ftp/pureftpd_count | 93 +++++++++++++++++++------------------- 2 files changed, 71 insertions(+), 72 deletions(-) diff --git a/plugins/ftp/proftpd b/plugins/ftp/proftpd index 835a2553..aacae81b 100755 --- a/plugins/ftp/proftpd +++ b/plugins/ftp/proftpd @@ -1,25 +1,25 @@ -#! /bin/sh -# configuration : -# -# env.LOGFILE /var/log/proftpd/proftpd.log - -if [ "$1" = 'config' ]; then - echo "graph_args --base 1000 -l 0" - echo "graph_title Serveur FTP" - echo "graph_category Ftp" - echo "graph_vlabel Stats Proftpd" - echo "succes.label Login succes" - echo "succes.draw AREA" - echo "failed.label Login failed" - echo "failed.draw AREA" -fi - -LOGFILE=${LOGFILE:-"/var/log/proftpd/proftpd.log"} - -succes=$(grep -c "successful" "$LOGFILE" ) -failed=$(grep -c "Login failed" "$LOGFILE" ) - -echo "succes.value $succes" -echo "failed.value $failed" - -exit 0 +#! /bin/sh +# configuration : +# +# env.LOGFILE /var/log/proftpd/proftpd.log + +if [ "$1" = 'config' ]; then + echo "graph_args --base 1000 -l 0" + echo "graph_title Serveur FTP" + echo "graph_category Ftp" + echo "graph_vlabel Stats Proftpd" + echo "succes.label Login succes" + echo "succes.draw AREA" + echo "failed.label Login failed" + echo "failed.draw AREA" +fi + +LOGFILE=${LOGFILE:-"/var/log/proftpd/proftpd.log"} + +succes=$(grep -c "successful" "$LOGFILE" ) +failed=$(grep -c "Login failed" "$LOGFILE" ) + +echo "succes.value $succes" +echo "failed.value $failed" + +exit 0 diff --git a/plugins/ftp/pureftpd_count b/plugins/ftp/pureftpd_count index 19a5a222..ab7bc247 100755 --- a/plugins/ftp/pureftpd_count +++ b/plugins/ftp/pureftpd_count @@ -1,47 +1,46 @@ -#!/bin/sh -# -# -# Script to show pureftp counts. -# Logs are searched in /var/log/pure-ftpd/transfer.log by default. -# Logs must be in w3c format: -# pure-ftpd --altlog w3c:/var/log/pure-ftpd/transfer.log -# -# Parameters understood: -# -# config (required) -# autoconf (optional - used by munin-config) -# -# -# Magic markers (optional - used by munin-config and installation -# scripts): -# -#%# family=auto -#%# capabilities=autoconf - -MAXLABEL=20 - -if [ "$1" = "autoconf" ]; then - echo yes - exit 0 -fi - -if [ "$1" = "config" ]; then - - echo 'graph_title FTP Server' - echo 'graph_args --base 1000 -l 0' - echo 'graph_vlabel Daily FTP Operations' - echo 'graph_category FTP' - echo 'graph_period second' - echo 'ftp_put.type GAUGE' - echo 'ftp_get.type GAUGE' - echo 'ftp_put.label Files PUT' - echo 'ftp_get.label Files GET' - exit 0 -fi - -echo -en "ftp_put.value " -echo $(grep "`date '+%Y-%m-%d'`" /var/log/pure-ftpd/transfer.log | grep [[:space:]]\\[\\]created[[:space:]] | wc -l) -echo -n -echo -en "ftp_get.value " -echo $(grep "`date '+%Y-%m-%d'`" /var/log/pure-ftpd/transfer.log | grep [[:space:]]\\[\\]sent[[:space:]] | wc -l) - +#!/bin/sh +# +# +# Script to show pureftp counts. +# Logs are searched in /var/log/pure-ftpd/transfer.log by default. +# Logs must be in w3c format: +# pure-ftpd --altlog w3c:/var/log/pure-ftpd/transfer.log +# +# Parameters understood: +# +# config (required) +# autoconf (optional - used by munin-config) +# +# +# Magic markers (optional - used by munin-config and installation +# scripts): +# +#%# family=auto +#%# capabilities=autoconf + +MAXLABEL=20 + +if [ "$1" = "autoconf" ]; then + echo yes + exit 0 +fi + +if [ "$1" = "config" ]; then + + echo 'graph_title FTP Server' + echo 'graph_args --base 1000 -l 0' + echo 'graph_vlabel Daily FTP Operations' + echo 'graph_category FTP' + echo 'graph_period second' + echo 'ftp_put.type GAUGE' + echo 'ftp_get.type GAUGE' + echo 'ftp_put.label Files PUT' + echo 'ftp_get.label Files GET' + exit 0 +fi + +echo -en "ftp_put.value " +echo $(grep "`date '+%Y-%m-%d'`" /var/log/pure-ftpd/transfer.log | grep [[:space:]]\\[\\]created[[:space:]] | wc -l) +echo -n +echo -en "ftp_get.value " +echo $(grep "`date '+%Y-%m-%d'`" /var/log/pure-ftpd/transfer.log | grep [[:space:]]\\[\\]sent[[:space:]] | wc -l)