refactor and optimizations

* refactored all plugins to use the same methods
* optimized api calls in the multigraph plugin to reduce load
* used dict instead of list for performance
+ added munin dirtyconfig capability to all plugins

1 files changed, 53 insertions, 21 deletions

diff --git a/nextcloud_dbsize b/nextcloud_dbsize
index 986e658..fc4f035 100755
--- a/nextcloud_dbsize
+++ b/nextcloud_dbsize
@@ -18,24 +18,33 @@ import os
 
 
 class NextcloudDB:
-	if (sys.argv.__len__() == 2) and (sys.argv[1] == "config"):
-		print('graph_title Nextcloud Database Size')
-		print('graph_args --base 1024 -l 0')
-		print('graph_vlabel size in byte')
-		print('graph_info graph showing the database size in byte')
-		print('graph_category nextcloud')
-
-		print('db_size.label database size in byte')
-		print('db_size.info users connected in the last 5 minutes')
-		print('db_size.draw AREA')
-	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']}:
-				print('yes')
-		except KeyError:
-			print('no env configuration options are missing')
-	else:
+	def config(self):
+		config = {
+			'dbsize': [
+				'graph_title Nextcloud Database Size',
+				'graph_args --base 1024 -l 0',
+				'graph_vlabel size in byte',
+				'graph_info graph showing the database size in byte',
+				'graph_category nextcloud',
+				'db_size.label database size in byte',
+				'db_size.info users connected in the last 5 minutes',
+				'db_size.draw AREA',
+			]
+		}
+
+		return config
+
+	def get_data(self, api_response):
+		data ={
+			'nextcloud_dbsize': [],
+		}
+
+		dbsize = api_response['ocs']['data']['server']['database']['size']
+		data['nextcloud_dbsize'].append('db_size.value %s' % dbsize)
+
+		return data
+
+	def run(self):
 		# read the configuration from munin environment
 		URL = os.environ['url']
 		auth = (os.environ['username'], os.environ['password'])
@@ -53,8 +62,11 @@ class NextcloudDB:
 		if r.status_code == 200:
 			s.close()
 			api_response = r.json()
-			db_size = api_response['ocs']['data']['server']['database']['size']
-			print('db_size.value %s' % db_size)
+
+			result = self.get_data(api_response)
+
+			for key in result.keys():
+				print('\n'.join(result[key]))
 
 		elif r.status_code == 996:
 			print('server error')
@@ -65,7 +77,27 @@ class NextcloudDB:
 		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':
+					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']}:
+					print('yes')
+			except KeyError:
+				print('no env configuration options are missing')
+		else:
+			self.run()
+
 
 if __name__ == "__main__":
-	NextcloudDB()
+	NextcloudDB().main()
 	quit(0)