[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[Naparuba]

The following commit has been merged in the debian/master branch:
commit da1e2b9687f51bd4450a729074dc0c93346ab2c1
Author: Naparuba <naparuba at gmail.com>
Date:   Tue Jan 10 08:52:48 2012 +0100

    Fix : remove useless old glpi importer module.

diff --git a/etc/shinken-specific.cfg b/etc/shinken-specific.cfg
index f7814b7..15a81b2 100755
--- a/etc/shinken-specific.cfg
+++ b/etc/shinken-specific.cfg
@@ -469,21 +469,6 @@ define module{
 }
 
 
-#You know GLPI? You can load your hosts from this app (
-#with the webservices plugins for GLPI, in xmlrpc mode)
-#All hosts read from this will be added to the others of the
-#standard flat file
-#Warning : just load host_name, experimental.
-define module{
-       module_name      GLPIImport
-       module_type      glpi_import
-       uri 		http://localhost/glpi/plugins/webservices/xmlrpc.php
-       login_name	glpi
-       login_password	glpi
-#       use_property       otherserial   ;optional. Will take use value from the otherserial
-#			   field in GLPI (Inventory number:  in the web interface)
-}
-
 #You know GLPI? You can load all configuration from this app(
 #with the webservices plugins for GLPI, in xmlrpc mode
 #and with plugin monitoring for GLPI)
diff --git a/shinken/modules/glpi_import_arbiter.py b/shinken/modules/glpi_import_arbiter.py
deleted file mode 100644
index 6cc6a14..0000000
--- a/shinken/modules/glpi_import_arbiter.py
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/python
-#Copyright (C) 2009 Gabes Jean, naparuba at gmail.com
-#
-#This file is part of Shinken.
-#
-#Shinken is free software: you can redistribute it and/or modify
-#it under the terms of the GNU Affero General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#Shinken is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU Affero General Public License for more details.
-#
-#You should have received a copy of the GNU Affero General Public License
-#along with Shinken.  If not, see <http://www.gnu.org/licenses/>.
-
-
-#This Class is a plugin for the Shinken Arbiter. It connect to
-#a GLPI with webservice (xmlrpc, SOAP is garbage) and take all
-#hosts. Simple way from now
-
-
-import xmlrpclib
-
-from shinken.basemodule import BaseModule
-
-
-properties = {
-    'daemons' : ['arbiter'],
-    'type' : 'glpi_import',
-    'external' : False,
-    'phases' : ['configuration'],
-    }
-
-
-#called by the plugin manager to get a broker
-def get_instance(plugin):
-    print "Get a Simple GLPI importer arbiter for plugin %s" % plugin.get_name()
-    uri = plugin.uri
-    login_name = plugin.login_name
-    login_password = plugin.login_password
-    if hasattr(plugin, 'use_property'):
-        use_property = plugin.use_property
-    else:
-        use_property = 'otherserial'
-    instance = Glpi_importer_arbiter(plugin, uri, login_name, login_password, use_property)
-    return instance
-
-
-
-#Just get hostname from a GLPI webservices
-class Glpi_importer_arbiter(BaseModule):
-    def __init__(self, mod_conf, uri, login_name, login_password, use_property):
-        BaseModule.__init__(self, mod_conf)
-        self.uri = uri
-        self.login_name = login_name
-        self.login_password = login_password
-        self.use_property = use_property
-
-
-    #Called by Arbiter to say 'let's prepare yourself guy'
-    def init(self):
-        print "I open the GLPI connection to %s" % self.uri
-        self.con = xmlrpclib.ServerProxy(self.uri)
-        print "Connection opened"
-        print "Authentification in progress"
-        arg = {'login_name' : self.login_name , 'login_password' : self.login_password}
-        res = self.con.glpi.doLogin(arg)
-        self.session = res['session']
-        print "My session number", self.session
-
-
-    #Ok, main function that will load hosts from GLPI
-    def get_objects(self):
-        r = {'hosts' : []}
-        arg = {'session' : self.session}
-        all_hosts = self.con.glpi.listComputers(arg)
-        print "Get all hosts", all_hosts
-        for host in all_hosts:
-            print "\n\n"
-            print "Host info in GLPI", host
-            arg = {'session' : self.session, 'computer' : host['id']}
-            host_info = self.con.glpi.getComputer(arg)
-            print "Host info", host_info
-            h = {'host_name' : host_info['name'],
-                 'alias' : host_info['name'],
-                 'address' : host_info['name'],
-                 }
-            #Then take use only if there is a value inside
-            if host_info[self.use_property] != '':
-                h['use'] = host_info[self.use_property]
-
-            r['hosts'].append(h)
-        print "Returning to Arbiter the hosts:", r
-        return r

-- 
UNNAMED PROJECT