From 91eebb77744753bde5b4b83e7c7634ee47e5b859 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 27 Aug 2015 11:12:42 -0400
Subject: Revert "Zabbix API updates"

---
 filter_plugins/oo_zabbix_filters.py | 29 -----------------------------
 1 file changed, 29 deletions(-)

(limited to 'filter_plugins/oo_zabbix_filters.py')

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
@@ -59,17 +59,6 @@ class FilterModule(object):
                 return data[zabbix_item]['params']
         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,
         }
-- 
cgit v1.2.3