diff --git a/apache_status/python_modules/apache_status.py b/apache_status/python_modules/apache_status.py index d718a92b..5d2ad522 100755 --- a/apache_status/python_modules/apache_status.py +++ b/apache_status/python_modules/apache_status.py @@ -7,6 +7,7 @@ import urllib2 import traceback import re +import copy # global to store state for "total accesses" METRICS = { @@ -14,7 +15,7 @@ 'data' : {} } -LAST_METRICS = dict(METRICS) +LAST_METRICS = copy.deepcopy(METRICS) METRICS_CACHE_MAX = 5 #Metric prefix @@ -106,7 +107,7 @@ def get_metrics(): traceback.print_exc() - LAST_METRICS = dict(METRICS) + LAST_METRICS = copy.deepcopy(METRICS) METRICS = { 'time': time.time(), 'data': metrics diff --git a/blueeyes_service/python_modules/blueeyes_service.py b/blueeyes_service/python_modules/blueeyes_service.py index 3b700eab..a8a11900 100755 --- a/blueeyes_service/python_modules/blueeyes_service.py +++ b/blueeyes_service/python_modules/blueeyes_service.py @@ -30,6 +30,7 @@ import os import re import time +import copy PARAMS = { @@ -43,7 +44,7 @@ 'time' : 0, 'data' : {} } -LAST_METRICS = dict(METRICS) +LAST_METRICS = copy.deepcopy(METRICS) METRICS_CACHE_TTL = 1 @@ -84,7 +85,7 @@ def get_metrics(): metrics = {} # update cache - LAST_METRICS = dict(METRICS) + LAST_METRICS = copy.deepcopy(METRICS) METRICS = { 'time': time.time(), 'data': metrics diff --git a/mongodb/python_modules/mongodb.py b/mongodb/python_modules/mongodb.py index faee1d09..7ef34bed 100755 --- a/mongodb/python_modules/mongodb.py +++ b/mongodb/python_modules/mongodb.py @@ -31,7 +31,7 @@ import socket import string import time - +import copy NAME_PREFIX = 'mongodb_' PARAMS = { @@ -42,7 +42,7 @@ 'time' : 0, 'data' : {} } -LAST_METRICS = dict(METRICS) +LAST_METRICS = copy.deepcopy(METRICS) METRICS_CACHE_TTL = 3 @@ -85,7 +85,7 @@ def get_metrics(): metrics = {} # update cache - LAST_METRICS = dict(METRICS) + LAST_METRICS = copy.deepcopy(METRICS) METRICS = { 'time': time.time(), 'data': metrics diff --git a/network/conntrack/python_modules/conntrack.py b/network/conntrack/python_modules/conntrack.py index 23598971..1fd04635 100644 --- a/network/conntrack/python_modules/conntrack.py +++ b/network/conntrack/python_modules/conntrack.py @@ -27,7 +27,7 @@ import os import time - +import copy NAME_PREFIX = 'conntrack_' PARAMS = { @@ -37,7 +37,7 @@ 'time' : 0, 'data' : {} } -LAST_METRICS = dict(METRICS) +LAST_METRICS = copy.deepcopy(METRICS) METRICS_CACHE_MAX = 5 def create_desc(skel, prop): @@ -67,7 +67,7 @@ def get_metrics(): metrics[values[0]] = 0 # update cache - LAST_METRICS = dict(METRICS) + LAST_METRICS = copy.deepcopy(METRICS) METRICS = { 'time': time.time(), 'data': metrics diff --git a/network/multi_interface/python_modules/multi_interface.py b/network/multi_interface/python_modules/multi_interface.py index 7fb6aca0..a7bf9bdf 100644 --- a/network/multi_interface/python_modules/multi_interface.py +++ b/network/multi_interface/python_modules/multi_interface.py @@ -2,6 +2,7 @@ import time import sys import os +import copy PARAMS = {} @@ -11,7 +12,7 @@ 'time' : 0, 'data' : {} } -LAST_METRICS = dict(METRICS) +LAST_METRICS = copy.deepcopy(METRICS) METRICS_CACHE_MAX = 5 INTERFACES = [] @@ -153,7 +154,7 @@ def get_metrics(): metrics[dev_name] = re.split("\s+", a[1].lstrip()) # update cache - LAST_METRICS = dict(METRICS) + LAST_METRICS = copy.deepcopy(METRICS) METRICS = { 'time': time.time(), 'data': metrics diff --git a/system/cpu_stats/python_modules/cpu_stats.py b/system/cpu_stats/python_modules/cpu_stats.py index 3f7e9f85..b34aa028 100644 --- a/system/cpu_stats/python_modules/cpu_stats.py +++ b/system/cpu_stats/python_modules/cpu_stats.py @@ -3,6 +3,7 @@ import os import re import time +import copy METRICS = { 'time' : 0, @@ -23,7 +24,7 @@ 'rcu' : 10 } -LAST_METRICS = dict(METRICS) +LAST_METRICS = copy.deepcopy(METRICS) METRICS_CACHE_MAX = 5 @@ -53,7 +54,7 @@ def get_metrics(): metrics[parts[0]] = list(parts[1:]) # update cache - LAST_METRICS = dict(METRICS) + LAST_METRICS = copy.deepcopy(METRICS) METRICS = { 'time': time.time(), 'data': metrics diff --git a/system/mem_fragmentation/python_modules/mem_fragmentation.py b/system/mem_fragmentation/python_modules/mem_fragmentation.py index 33ccee70..36633860 100644 --- a/system/mem_fragmentation/python_modules/mem_fragmentation.py +++ b/system/mem_fragmentation/python_modules/mem_fragmentation.py @@ -1,6 +1,7 @@ import sys import re import time +import copy PARAMS = {} @@ -15,7 +16,7 @@ buddyinfo_file = "/proc/buddyinfo" -LAST_METRICS = dict(METRICS) +LAST_METRICS = copy.deepcopy(METRICS) METRICS_CACHE_MAX = 5 stats_pos = {} @@ -82,7 +83,7 @@ def get_metrics(): file.close # update cache - LAST_METRICS = dict(METRICS) + LAST_METRICS = copy.deepcopy(METRICS) METRICS = { 'time': time.time(), 'data': values diff --git a/system/vm_stats/python_modules/vm_stats.py b/system/vm_stats/python_modules/vm_stats.py index 79b50066..3e0595b0 100644 --- a/system/vm_stats/python_modules/vm_stats.py +++ b/system/vm_stats/python_modules/vm_stats.py @@ -1,8 +1,7 @@ import sys -#import traceback -#import os import re import time +import copy PARAMS = {} @@ -12,7 +11,7 @@ 'time' : 0, 'data' : {} } -LAST_METRICS = dict(METRICS) +LAST_METRICS = copy.deepcopy(METRICS) METRICS_CACHE_MAX = 5 ############################################################################### @@ -47,7 +46,7 @@ def get_metrics(): metrics[parts[0]] = parts[1] # update cache - LAST_METRICS = dict(METRICS) + LAST_METRICS = copy.deepcopy(METRICS) METRICS = { 'time': time.time(), 'data': metrics diff --git a/tokyo_tyrant/python_modules/tokyo_tyrant.py b/tokyo_tyrant/python_modules/tokyo_tyrant.py index 62844762..3cd7fb50 100755 --- a/tokyo_tyrant/python_modules/tokyo_tyrant.py +++ b/tokyo_tyrant/python_modules/tokyo_tyrant.py @@ -27,7 +27,7 @@ import os import time - +import copy NAME_PREFIX = 'tokyo_tyrant_' PARAMS = { @@ -37,7 +37,7 @@ 'time' : 0, 'data' : {} } -LAST_METRICS = dict(METRICS) +LAST_METRICS = copy.deepcopy(METRICS) METRICS_CACHE_MAX = 1 @@ -61,7 +61,7 @@ def get_metrics(): metrics[values[0]] = values[1] # update cache - LAST_METRICS = dict(METRICS) + LAST_METRICS = copy.deepcopy(METRICS) METRICS = { 'time': time.time(), 'data': metrics diff --git a/varnish/python_modules/varnish.py b/varnish/python_modules/varnish.py index 7c4ca3b6..e84ef0d6 100755 --- a/varnish/python_modules/varnish.py +++ b/varnish/python_modules/varnish.py @@ -27,7 +27,7 @@ import os import time - +import copy NAME_PREFIX = 'varnish_' PARAMS = { @@ -37,7 +37,7 @@ 'time' : 0, 'data' : {} } -LAST_METRICS = dict(METRICS) +LAST_METRICS = copy.deepcopy(METRICS) METRICS_CACHE_MAX = 5 def create_desc(skel, prop): @@ -67,7 +67,7 @@ def get_metrics(): metrics[values[0]] = 0 # update cache - LAST_METRICS = dict(METRICS) + LAST_METRICS = copy.deepcopy(METRICS) METRICS = { 'time': time.time(), 'data': metrics