From ffa77ad80004c24938dab96661d67cb9320a5599 Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 20 Oct 2018 00:12:49 +0200 Subject: optimization and simplification + added min value + added version check for the updates_available graph * all plugin configs updated * optimized requests.session code * used os.environ.get to simplify code * simplified run code - removed os.environ code --- nextcloud_apps | 79 +++++++++++++++++++++------------------------ nextcloud_dbsize | 69 ++++++++++++++++++---------------------- nextcloud_multi | 97 +++++++++++++++++++++++++++++--------------------------- nextcloud_shares | 79 +++++++++++++++++++++++---------------------- nextcloud_users | 75 ++++++++++++++++++++----------------------- 5 files changed, 191 insertions(+), 208 deletions(-) diff --git a/nextcloud_apps b/nextcloud_apps index 228a197..e7a5bbc 100755 --- a/nextcloud_apps +++ b/nextcloud_apps @@ -22,12 +22,13 @@ class NextcloudApps: config = { 'apps': [ 'graph_title Nextcloud available App updates', - 'graph_args --base 1024 -l 0', + 'graph_args --base 1000 -l 0', 'graph_vlabel updates available', 'graph_info graph showing the number of available app updates', 'graph_category nextcloud', 'num_updates_available.label available app updates', - 'num_updates_available.info number of available app updates' + 'num_updates_available.info number of available app updates', + 'num_updates_available.min 0' ] } @@ -39,64 +40,56 @@ class NextcloudApps: } # precaution for Nextcloud versions prior to version 14 - try: + version = api_response['ocs']['data']['nextcloud']['system']['version'].split(sep=".") + + if int(version[0]) >= 14: num_updates_available = api_response['ocs']['data']['nextcloud']['system']['apps']['num_updates_available'] data['nextcloud_available_updates'].append('num_updates_available.value %s' % num_updates_available) - except KeyError: - return False return data def run(self): - # read the configuration from munin environment - URL = os.environ['url'] - auth = (os.environ['username'], os.environ['password']) - # init requests session with specific header and credentials with requests.Session() as s: - s.auth = auth - s.headers.update({'Accept': 'application/json'}) - s.stream = False + # read credentials from env + s.auth = (os.environ.get('username'), os.environ.get('password')) - # request data from api - r = s.get(URL) + # update header for json + s.headers.update({'Accept': 'application/json'}) - # if status code is successful close connection and continue - if r.status_code == 200: - s.close() - api_response = r.json() + # request the data + r = s.get(os.environ.get('url')) - result = self.get_data(api_response) + # if status code is successful continue + if r.status_code == 200: + api_response = r.json() + result = self.get_data(api_response) - for key in result.keys(): - print('\n'.join(result[key])) + for key in result.keys(): + print('\n'.join(result[key])) - elif r.status_code == 996: - print('server error') - elif r.status_code == 997: - print('not authorized') - elif r.status_code == 998: - print('not found') - else: - print('unknown error') + elif r.status_code == 996: + print('server error') + elif r.status_code == 997: + print('not authorized') + elif r.status_code == 998: + print('not found') + else: + print('unknown error') def main(self): - if (sys.argv.__len__() == 2) and (sys.argv[1] == "config"): - for key in self.config().keys(): - print('\n'.join(self.config()[key])) - try: - if os.environ['MUNIN_CAP_DIRTYCONFIG'] == '1': + # check if first argument is config or autoconf if not fetch data + if sys.argv.__len__() >= 2: + if sys.argv[1] == "config": + for key in self.config().keys(): + print('\n'.join(self.config()[key])) + if os.environ.get('MUNIN_CAP_DIRTYCONFIG') == '1': self.run() - except KeyError: - pass - - elif (sys.argv.__len__() == 2) and (sys.argv[1] == 'autoconf'): - # check host if env variables are set - try: - if None not in {os.environ['url'], os.environ['username'], os.environ['password']}: + elif sys.argv[1] == 'autoconf': + if None in [os.environ.get('username'), os.environ.get('password')]: + print('env variables are missing') + else: print('yes') - except KeyError: - print('no env configuration options are missing') else: self.run() diff --git a/nextcloud_dbsize b/nextcloud_dbsize index fc4f035..9a15774 100755 --- a/nextcloud_dbsize +++ b/nextcloud_dbsize @@ -29,6 +29,7 @@ class NextcloudDB: 'db_size.label database size in byte', 'db_size.info users connected in the last 5 minutes', 'db_size.draw AREA', + 'db_size.min 0' ] } @@ -45,55 +46,47 @@ class NextcloudDB: return data def run(self): - # read the configuration from munin environment - URL = os.environ['url'] - auth = (os.environ['username'], os.environ['password']) - # init requests session with specific header and credentials with requests.Session() as s: - s.auth = auth + # read credentials from env + s.auth = (os.environ.get('username'), os.environ.get('password')) + + # update header for json s.headers.update({'Accept': 'application/json'}) - s.stream = False - # request data from api - r = s.get(URL) + # request the data + r = s.get(os.environ.get('url')) - # if status code is successful close connection and continue - if r.status_code == 200: - s.close() - api_response = r.json() + # if status code is successful continue + if r.status_code == 200: + api_response = r.json() + result = self.get_data(api_response) - result = self.get_data(api_response) + for key in result.keys(): + print('\n'.join(result[key])) - for key in result.keys(): - print('\n'.join(result[key])) - - elif r.status_code == 996: - print('server error') - elif r.status_code == 997: - print('not authorized') - elif r.status_code == 998: - print('not found') - else: - print('unknown error') + elif r.status_code == 996: + print('server error') + elif r.status_code == 997: + print('not authorized') + elif r.status_code == 998: + print('not found') + else: + print('unknown error') def main(self): - if (sys.argv.__len__() == 2) and (sys.argv[1] == "config"): - for key in self.config().keys(): - print('\n'.join(self.config()[key])) - try: - if os.environ['MUNIN_CAP_DIRTYCONFIG'] == '1': + # check if first argument is config or autoconf if not fetch data + if sys.argv.__len__() >= 2: + if sys.argv[1] == "config": + for key in self.config().keys(): + print('\n'.join(self.config()[key])) + if os.environ.get('MUNIN_CAP_DIRTYCONFIG') == '1': self.run() - except KeyError: - pass - - elif (sys.argv.__len__() == 2) and (sys.argv[1] == 'autoconf'): - # check host if env variables are set - try: - if None not in {os.environ['url'], os.environ['username'], os.environ['password']}: + elif sys.argv[1] == 'autoconf': + if None in [os.environ.get('username'), os.environ.get('password')]: + print('env variables are missing') + else: print('yes') - except KeyError: - print('no env configuration options are missing') else: self.run() diff --git a/nextcloud_multi b/nextcloud_multi index 62d59c8..8a53656 100755 --- a/nextcloud_multi +++ b/nextcloud_multi @@ -28,39 +28,49 @@ class NextcloudMultiGraph: 'users': [ 'multigraph nextcloud_users', 'graph_title Nextcloud User Activity', - 'graph_args --base 1024 -l 0', + 'graph_args --base 1000 -l 0', 'graph_printf %.0lf', 'graph_vlabel connected users', 'graph_info graph showing the number of connected user', 'graph_category nextcloud', 'last5minutes.label last 5 minutes', 'last5minutes.info users connected in the last 5 minutes', + 'last5minutes.min 0', 'last1hour.label last hour', 'last1hour.info users connected in the last hour', + 'last1hour.min 0', 'last24hours.label last 24 hours', - 'last24hours.info users connected in the last 24 hours' + 'last24hours.info users connected in the last 24 hours', + 'last24hours.min 0' ], 'shares': [ 'multigraph nextcloud_shares', 'graph_title Nextcloud Shares', - 'graph_args --base 1024 -l 0', + 'graph_args --base 1000 -l 0', 'graph_vlabel number of shares', 'graph_info graph showing the number of shares', 'graph_category nextcloud', 'num_fed_shares_received.label federated shares recieved', 'num_fed_shares_received.info current total of federated shares recieved', + 'num_fed_shares_received.min 0', 'num_fed_shares_sent.label federated shares sent', 'num_fed_shares_sent.info current total of federated shares sent', + 'num_fed_shares_sent.min 0', 'num_shares.label total number of shares', 'num_shares.info current over all total of shares', + 'num_shares.min 0', 'num_shares_groups.label group shares', 'num_shares_groups.info current total of group shares', + 'num_shares_groups.min 0', 'num_shares_link.label link shares', 'num_shares_link.info current total of shares through a link', + 'num_shares_link.min 0', 'num_shares_link_no_password.label link shares without a password', 'num_shares_link_no_password.info current total of shares through a link without a password protection', + 'num_shares_link_no_password.min 0', 'num_shares_user.label user shares', - 'num_shares_user.info current total of user shares' + 'num_shares_user.info current total of user shares', + 'num_shares_user.min 0' ], 'dbsize': [ 'multigraph nextcloud_dbsize', @@ -72,16 +82,18 @@ class NextcloudMultiGraph: 'db_size.label database size in byte', 'db_size.info users connected in the last 5 minutes', 'db_size.draw AREA', + 'db_size.min 0' ], 'available_updates': [ 'multigraph nextcloud_available_updates', 'graph_title Nextcloud available App updates', - 'graph_args --base 1024 -l 0', + 'graph_args --base 1000 -l 0', 'graph_vlabel updates available', 'graph_info graph showing the number of available app updates', 'graph_category nextcloud', 'num_updates_available.label available app updates', 'num_updates_available.info number of available app updates', + 'num_updates_available.min 0' ] } @@ -115,65 +127,56 @@ class NextcloudMultiGraph: data['nextcloud_dbsize'].append('db_size.value %s' % dbsize) # precaution for Nextcloud versions prior to version 14 - try: + version = api_response['ocs']['data']['nextcloud']['system']['version'].split(sep=".") + + if int(version[0]) >= 14: num_updates_available = api_response['ocs']['data']['nextcloud']['system']['apps']['num_updates_available'] - data['nextcloud_available_updates'].append('multigraph nextcloud_available_updates') data['nextcloud_available_updates'].append('num_updates_available.value %s' % num_updates_available) - except KeyError: - return False return data def run(self): - # read the configuration from munin environment - URL = os.environ['url'] - auth = (os.environ['username'], os.environ['password']) - # init requests session with specific header and credentials with requests.Session() as s: - s.auth = auth - s.headers.update({'Accept': 'application/json'}) - s.stream = False + # read credentials from env + s.auth = (os.environ.get('username'), os.environ.get('password')) - # request data from api - r = s.get(URL) + # update header for json + s.headers.update({'Accept': 'application/json'}) - # if status code is successful close connection and continue - if r.status_code == 200: - s.close() - api_response = r.json() + # request the data + r = s.get(os.environ.get('url')) - result = self.get_data(api_response) + # if status code is successful continue + if r.status_code == 200: + api_response = r.json() + result = self.get_data(api_response) - for key in result.keys(): - print('\n'.join(result[key])) + for key in result.keys(): + print('\n'.join(result[key])) - elif r.status_code == 996: - print('server error') - elif r.status_code == 997: - print('not authorized') - elif r.status_code == 998: - print('not found') - else: - print('unknown error') + elif r.status_code == 996: + print('server error') + elif r.status_code == 997: + print('not authorized') + elif r.status_code == 998: + print('not found') + else: + print('unknown error') def main(self): - if (sys.argv.__len__() == 2) and (sys.argv[1] == "config"): - for key in self.config().keys(): - print('\n'.join(self.config()[key])) - try: - if os.environ['MUNIN_CAP_DIRTYCONFIG'] == '1': + # check if first argument is config or autoconf if not fetch data + if sys.argv.__len__() >= 2: + if sys.argv[1] == "config": + for key in self.config().keys(): + print('\n'.join(self.config()[key])) + if os.environ.get('MUNIN_CAP_DIRTYCONFIG') == '1': self.run() - except KeyError: - pass - - elif (sys.argv.__len__() == 2) and (sys.argv[1] == 'autoconf'): - # check host if env variables are set - try: - if None not in {os.environ['url'], os.environ['username'], os.environ['password']}: + elif sys.argv[1] == 'autoconf': + if None in [os.environ.get('username'), os.environ.get('password')]: + print('env variables are missing') + else: print('yes') - except KeyError: - print('no env configuration options are missing') else: self.run() diff --git a/nextcloud_shares b/nextcloud_shares index 8e5173f..0dc6dbe 100755 --- a/nextcloud_shares +++ b/nextcloud_shares @@ -23,24 +23,31 @@ class NextcloudShares: config = { 'shares': [ 'graph_title Nextcloud Shares', - 'graph_args --base 1024 -l 0', + 'graph_args --base 1000 -l 0', 'graph_vlabel number of shares', 'graph_info graph showing the number of shares', 'graph_category nextcloud', 'num_fed_shares_received.label federated shares recieved', 'num_fed_shares_received.info current total of federated shares recieved', + 'num_fed_shares_received.min 0', 'num_fed_shares_sent.label federated shares sent', 'num_fed_shares_sent.info current total of federated shares sent', + 'num_fed_shares_sent.min 0', 'num_shares.label total number of shares', 'num_shares.info current over all total of shares', + 'num_shares.min 0', 'num_shares_groups.label group shares', 'num_shares_groups.info current total of group shares', + 'num_shares_groups.min 0', 'num_shares_link.label link shares', 'num_shares_link.info current total of shares through a link', + 'num_shares_link.min 0', 'num_shares_link_no_password.label link shares without a password', 'num_shares_link_no_password.info current total of shares through a link without a password protection', + 'num_shares_link_no_password.min 0', 'num_shares_user.label user shares', - 'num_shares_user.info current total of user shares' + 'num_shares_user.info current total of user shares', + 'num_shares_user.min 0' ] } @@ -63,55 +70,47 @@ class NextcloudShares: return data def run(self): - # read the configuration from munin environment - URL = os.environ['url'] - auth = (os.environ['username'], os.environ['password']) - # init requests session with specific header and credentials with requests.Session() as s: - s.auth = auth + # read credentials from env + s.auth = (os.environ.get('username'), os.environ.get('password')) + + # update header for json s.headers.update({'Accept': 'application/json'}) - s.stream = False - # request data from api - r = s.get(URL) + # request the data + r = s.get(os.environ.get('url')) - # if status code is successful close connection and continue - if r.status_code == 200: - s.close() - api_response = r.json() + # if status code is successful continue + if r.status_code == 200: + api_response = r.json() + result = self.get_data(api_response) - result = self.get_data(api_response) + for key in result.keys(): + print('\n'.join(result[key])) - for key in result.keys(): - print('\n'.join(result[key])) - - elif r.status_code == 996: - print('server error') - elif r.status_code == 997: - print('not authorized') - elif r.status_code == 998: - print('not found') - else: - print('unknown error') + elif r.status_code == 996: + print('server error') + elif r.status_code == 997: + print('not authorized') + elif r.status_code == 998: + print('not found') + else: + print('unknown error') def main(self): - if (sys.argv.__len__() == 2) and (sys.argv[1] == "config"): - for key in self.config().keys(): - print('\n'.join(self.config()[key])) - try: - if os.environ['MUNIN_CAP_DIRTYCONFIG'] == '1': + # check if first argument is config or autoconf if not fetch data + if sys.argv.__len__() >= 2: + if sys.argv[1] == "config": + for key in self.config().keys(): + print('\n'.join(self.config()[key])) + if os.environ.get('MUNIN_CAP_DIRTYCONFIG') == '1': self.run() - except KeyError: - pass - - elif (sys.argv.__len__() == 2) and (sys.argv[1] == 'autoconf'): - # check host if env variables are set - try: - if None not in {os.environ['url'], os.environ['username'], os.environ['password']}: + elif sys.argv[1] == 'autoconf': + if None in [os.environ.get('username'), os.environ.get('password')]: + print('env variables are missing') + else: print('yes') - except KeyError: - print('no env configuration options are missing') else: self.run() diff --git a/nextcloud_users b/nextcloud_users index 1e62dc3..ef638c6 100755 --- a/nextcloud_users +++ b/nextcloud_users @@ -22,17 +22,20 @@ class NextcloudUsers: config = { 'users': [ 'graph_title Nextcloud User Activity', - 'graph_args --base 1024 -l 0', + 'graph_args --base 1000 -l 0', 'graph_printf %.0lf', 'graph_vlabel connected users', 'graph_info graph showing the number of connected user', 'graph_category nextcloud', 'last5minutes.label last 5 minutes', 'last5minutes.info users connected in the last 5 minutes', + 'last5minutes.min 0', 'last1hour.label last hour', 'last1hour.info users connected in the last hour', + 'last1hour.min 0', 'last24hours.label last 24 hours', - 'last24hours.info users connected in the last 24 hours' + 'last24hours.info users connected in the last 24 hours', + 'last24hours.min 0' ] } @@ -50,55 +53,47 @@ class NextcloudUsers: return data def run(self): - # read the configuration from munin environment - URL = os.environ['url'] - auth = (os.environ['username'], os.environ['password']) - # init requests session with specific header and credentials with requests.Session() as s: - s.auth = auth + # read credentials from env + s.auth = (os.environ.get('username'), os.environ.get('password')) + + # update header for json s.headers.update({'Accept': 'application/json'}) - s.stream = False - # request data from api - r = s.get(URL) + # request the data + r = s.get(os.environ.get('url')) - # if status code is successful close connection and continue - if r.status_code == 200: - s.close() - api_response = r.json() + # if status code is successful continue + if r.status_code == 200: + api_response = r.json() + result = self.get_data(api_response) - result = self.get_data(api_response) + for key in result.keys(): + print('\n'.join(result[key])) - for key in result.keys(): - print('\n'.join(result[key])) - - elif r.status_code == 996: - print('server error') - elif r.status_code == 997: - print('not authorized') - elif r.status_code == 998: - print('not found') - else: - print('unknown error') + elif r.status_code == 996: + print('server error') + elif r.status_code == 997: + print('not authorized') + elif r.status_code == 998: + print('not found') + else: + print('unknown error') def main(self): - if (sys.argv.__len__() == 2) and (sys.argv[1] == "config"): - for key in self.config().keys(): - print('\n'.join(self.config()[key])) - try: - if os.environ['MUNIN_CAP_DIRTYCONFIG'] == '1': + # check if first argument is config or autoconf if not fetch data + if sys.argv.__len__() >= 2: + if sys.argv[1] == "config": + for key in self.config().keys(): + print('\n'.join(self.config()[key])) + if os.environ.get('MUNIN_CAP_DIRTYCONFIG') == '1': self.run() - except KeyError: - pass - - elif (sys.argv.__len__() == 2) and (sys.argv[1] == 'autoconf'): - # check host if env variables are set - try: - if None not in {os.environ['url'], os.environ['username'], os.environ['password']}: + elif sys.argv[1] == 'autoconf': + if None in [os.environ.get('username'), os.environ.get('password')]: + print('env variables are missing') + else: print('yes') - except KeyError: - print('no env configuration options are missing') else: self.run() -- cgit v1.2.3-18-g5258