diff options
author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-08-27 11:12:53 -0400 |
---|---|---|
committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-08-27 11:12:53 -0400 |
commit | 5c7e1366ad8ae67ef23117d296a65a6ee81ccd29 (patch) | |
tree | 043628b7a804ad66019129129cc0186289d80a28 /filter_plugins/oo_zabbix_filters.py | |
parent | d228350e4b9cc6b5341985940f12a50ec2847768 (diff) | |
parent | 91eebb77744753bde5b4b83e7c7634ee47e5b859 (diff) | |
download | openshift-5c7e1366ad8ae67ef23117d296a65a6ee81ccd29.tar.gz openshift-5c7e1366ad8ae67ef23117d296a65a6ee81ccd29.tar.bz2 openshift-5c7e1366ad8ae67ef23117d296a65a6ee81ccd29.tar.xz openshift-5c7e1366ad8ae67ef23117d296a65a6ee81ccd29.zip |
Merge pull request #517 from openshift/revert-513-zbxupdates
Revert "Zabbix API updates"
Diffstat (limited to 'filter_plugins/oo_zabbix_filters.py')
-rw-r--r-- | filter_plugins/oo_zabbix_filters.py | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/filter_plugins/oo_zabbix_filters.py b/filter_plugins/oo_zabbix_filters.py index c44b874e8..a473993a2 100644 --- a/filter_plugins/oo_zabbix_filters.py +++ b/filter_plugins/oo_zabbix_filters.py @@ -60,17 +60,6 @@ class FilterModule(object): return None @staticmethod - def oo_build_zabbix_collect(data, string, value): - ''' Build a list of dicts from a list of data matched on string attribute - ''' - rval = [] - for item in data: - if item[string] == value: - rval.append(item) - - return rval - - @staticmethod def oo_build_zabbix_list_dict(values, string): ''' Build a list of dicts with string as key for each value ''' @@ -79,22 +68,6 @@ class FilterModule(object): rval.append({string: value}) return rval - @staticmethod - def oo_remove_attr_from_list_dict(data, attr): - ''' Remove a specific attribute from a dict - ''' - attrs = [] - if isinstance(attr, str): - attrs.append(attr) - else: - attrs = attr - - for attribute in attrs: - for _entry in data: - _entry.pop(attribute, None) - - return data - def filters(self): ''' returns a mapping of filters to methods ''' return { @@ -103,6 +76,4 @@ class FilterModule(object): "oo_set_zbx_trigger_triggerid": self.oo_set_zbx_trigger_triggerid, "oo_build_zabbix_list_dict": self.oo_build_zabbix_list_dict, "create_data": self.create_data, - "oo_build_zabbix_collect": self.oo_build_zabbix_collect, - "oo_remove_attr_from_list_dict": self.oo_remove_attr_from_list_dict, } |