branch develop updated (926d024 -> 53db6d5)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository mum. See http://git.chorem.org/mum.git from 926d024 OK pour connexion et lancement des modules avec cette connexion new 2547482 correction updated_packages et message du websocket_container new 48badcd hostpage : bouton si os non détecté new 5db3e57 les modules de détection sont chargés de la même manière que les autres new 53db6d5 hostpage : launch full detection => OK The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 53db6d574b84884f134d1ea1d85d6a8847e2fe36 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu Mar 12 14:52:21 2015 +0100 hostpage : launch full detection => OK commit 5db3e57ddb62f176b5c5bc9734ec8009f4d2740f Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu Mar 12 14:38:20 2015 +0100 les modules de détection sont chargés de la même manière que les autres commit 48badcdb6af53dad361eb0fbfe30f01dd0fff841 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu Mar 12 12:06:08 2015 +0100 hostpage : bouton si os non détecté commit 2547482fe1e77e4771589a08e37e8cd6d4fc11e2 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu Mar 12 11:35:46 2015 +0100 correction updated_packages et message du websocket_container Summary of changes: app/app.py | 3 + app/module_loader.py | 71 ++++++++++++++-------- app/modules/connection_modules/ssh.py | 1 - app/modules/detection_modules/__init__.py | 3 +- .../{unix => }/drive_detection.py | 22 +++++-- .../{unix => }/kernel_detection.py | 15 ++++- .../detection_modules/{unix => }/os_detection.py | 14 ++++- app/modules/detection_modules/unix/__init__.py | 2 - .../detection_modules/unix/cpu_detection.py | 18 ------ .../detection_modules/unix/network_detection.py | 18 ------ app/modules/monitoring_modules/updated_packages.py | 5 +- .../notification_modules/websocket_container.py | 2 +- app/process_monitoring.py | 3 +- static/js/controllers/hostPageCtrl.js | 14 +++++ views/hostpage.html | 5 +- 15 files changed, 113 insertions(+), 83 deletions(-) rename app/modules/detection_modules/{unix => }/drive_detection.py (79%) rename app/modules/detection_modules/{unix => }/kernel_detection.py (53%) rename app/modules/detection_modules/{unix => }/os_detection.py (73%) delete mode 100644 app/modules/detection_modules/unix/__init__.py delete mode 100644 app/modules/detection_modules/unix/cpu_detection.py delete mode 100644 app/modules/detection_modules/unix/network_detection.py -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 2547482fe1e77e4771589a08e37e8cd6d4fc11e2 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu Mar 12 11:35:46 2015 +0100 correction updated_packages et message du websocket_container --- app/modules/monitoring_modules/updated_packages.py | 5 +---- app/modules/notification_modules/websocket_container.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/modules/monitoring_modules/updated_packages.py b/app/modules/monitoring_modules/updated_packages.py index 4359b5c..87953fd 100644 --- a/app/modules/monitoring_modules/updated_packages.py +++ b/app/modules/monitoring_modules/updated_packages.py @@ -30,8 +30,5 @@ class UpdatedPackages: cmd = "apt-get upgrade -s" stdout = self.conn.exec_command(cmd) tab_res = stdout.split(':') - if len(tab_res) == 2: - res_check = False - else: - res_check = True + res_check = len(tab_res) <= 2 self.db.add_check(self.conn.get_addr_host(), "updated_packages", res_check) \ No newline at end of file diff --git a/app/modules/notification_modules/websocket_container.py b/app/modules/notification_modules/websocket_container.py index 28dce07..b23abed 100644 --- a/app/modules/notification_modules/websocket_container.py +++ b/app/modules/notification_modules/websocket_container.py @@ -16,4 +16,4 @@ class WebSocketContainer: def notify_state_change(self): for ws in self.ws_set: - ws.send(json.dumps({"RES_HOST_DEMAND": self.db.get_hosts()})) \ No newline at end of file + ws.send(json.dumps({"RES_GET_HOSTS": self.db.get_hosts()})) \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 48badcdb6af53dad361eb0fbfe30f01dd0fff841 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu Mar 12 12:06:08 2015 +0100 hostpage : bouton si os non détecté --- app/app.py | 2 +- static/js/controllers/hostPageCtrl.js | 10 ++++++++++ views/hostpage.html | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/app.py b/app/app.py index f712f68..3057687 100755 --- a/app/app.py +++ b/app/app.py @@ -171,6 +171,6 @@ if __name__ == '__main__': ml.load_all_monitoring_modules() ml.load_all_connection_modules() wsc = WebSocketContainer(ml.get_db()) - process_monitoring.init(ml, wsc) + #process_monitoring.init(ml, wsc) port = int(os.environ.get('PORT', 1337)) run(host='0.0.0.0', port=port, debug=True, server=GeventWebSocketServer) \ No newline at end of file diff --git a/static/js/controllers/hostPageCtrl.js b/static/js/controllers/hostPageCtrl.js index b905f2c..635d059 100644 --- a/static/js/controllers/hostPageCtrl.js +++ b/static/js/controllers/hostPageCtrl.js @@ -57,6 +57,16 @@ mumApp.controller('hostPageCtrl', function($scope, $rootScope, $routeParams, $mo }); }); + // monitoring data are updated + /*$scope.$on("hostsUpdate", function (event, args) { + $scope.$apply(function(){ + for(i=0 ; i<args.length()) ; i++){ + if(args[i][]) + $scope.items['monitoring'] = args['monitoring']; + } + }); + });*/ + // save custom informations $scope.save_custom_infos = function(){ var args = {}; diff --git a/views/hostpage.html b/views/hostpage.html index b5af0d7..2286641 100644 --- a/views/hostpage.html +++ b/views/hostpage.html @@ -37,6 +37,9 @@ ng-repeat="(key, val) in mod"> <td>{{key}}</td> <td>{{val}}</td> + <td ng-show="(key == 'os') && (val == 'unknown')"> + <button type="button" class="btn btn-info btn-xs">Please indicate the OS</button> + </td> </tr> </table> </accordion-group> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 5db3e57ddb62f176b5c5bc9734ec8009f4d2740f Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu Mar 12 14:38:20 2015 +0100 les modules de détection sont chargés de la même manière que les autres --- app/app.py | 1 + app/module_loader.py | 73 ++++++++++++++-------- app/modules/detection_modules/__init__.py | 3 +- .../{unix => }/drive_detection.py | 22 +++++-- .../{unix => }/kernel_detection.py | 15 ++++- .../detection_modules/{unix => }/os_detection.py | 14 ++++- app/modules/detection_modules/unix/__init__.py | 2 - .../detection_modules/unix/cpu_detection.py | 18 ------ .../detection_modules/unix/network_detection.py | 18 ------ app/process_monitoring.py | 3 +- static/js/controllers/hostPageCtrl.js | 4 +- 11 files changed, 95 insertions(+), 78 deletions(-) diff --git a/app/app.py b/app/app.py index 3057687..c37b3c5 100755 --- a/app/app.py +++ b/app/app.py @@ -170,6 +170,7 @@ if __name__ == '__main__': ml = ModuleLoader(process_monitoring.add_to_waiting_list, process_monitoring.remove_to_waiting_list) ml.load_all_monitoring_modules() ml.load_all_connection_modules() + ml.load_all_detection_modules() wsc = WebSocketContainer(ml.get_db()) #process_monitoring.init(ml, wsc) port = int(os.environ.get('PORT', 1337)) diff --git a/app/module_loader.py b/app/module_loader.py index 10da678..3eca78e 100644 --- a/app/module_loader.py +++ b/app/module_loader.py @@ -33,6 +33,7 @@ class ModuleLoader: self.public_keys_loc = dict_conf['public_keys_location'] self.db = self.load_db(add_func, rem_func, self.public_keys_loc) self.loaded_mod_moni = {} # See load_all_monitoring_modules + self.loaded_mod_detect = {} # See load_all_detection_modules self.loaded_mod_conn = {} # See load_all_connection_modules def load_db(self, add_func, rem_func, key_loc): @@ -83,26 +84,43 @@ class ModuleLoader: modules.CommandNotFoundException) return mod_inst - def run_all_detection_modules(self, os, conn, db, ws): + def load_all_detection_modules(self): """ - Instanciates and runs every detection_modules listed in the __init__.py file of the package corresponding to - the operating system entered in parameters. - :param os: the oprating system of the host - :param conn: an instance of a connection module - :param db: an instance of a storage module - :param ws: a websocket connection if the function have been called from a client. Is None otherwise + Instanciates and stores the informations about each monitoring modules avaliable on the loaded_mod_detect attribute + """ + for importer, mod_name, ispkg in pkgutil.iter_modules(["app/modules/detection_modules/"]): + print mod_name + if mod_name not in sys.modules and not mod_name == 'nmap_detection': + try: + loaded_mod = __import__("modules.detection_modules." + mod_name, fromlist=[mod_name]) + class_name = getattr(loaded_mod, "get_class_name")() + mod_inst = getattr(loaded_mod, class_name)(None, None) + infos_mod = {} + infos_mod['imported'] = loaded_mod + infos_mod['class_name'] = getattr(mod_inst, 'get_name')() + infos_mod['compatible_os'] = getattr(mod_inst, 'get_compatible_os')() + self.loaded_mod_detect[mod_name] = infos_mod + except AttributeError: + print "Error : internal detection module " + mod_name + " could not have been loaded. " + print self.loaded_mod_detect + + def run_all_detection_modules(self, addr_host): """ - __import__("modules.detection_modules." + os) - pack_mod_os = __import__("modules.detection_modules." + os, fromlist=modules.detection_modules.__all__) - for mod_name in pack_mod_os.__all__: - mod = __import__ ("modules.detection_modules." + os + "." + mod_name, fromlist=modules.detection_modules.unix.__all__) # on charge le module - mod_instance = getattr(mod, mod_name)(conn, db) # on appelle le constructeur - try: - mod_instance.run_detection() - except modules.CommandNotFoundException.CommandNotFoundException as cnfe: - print cnfe.__str__() - if ws is not None: - ws.send(json.dumps({"ERROR": cnfe.__str__()})) + Instanciates and runs the run_detection() method from each detection modules loaded on loaded_mod_detect + :param + """ + db = self.get_db() + conn = self.create_connection(addr_host) + if conn is not None: + for mod_name in self.loaded_mod_detect: + mod_inst = getattr(self.loaded_mod_moni[mod_name]['imported'], + self.loaded_mod_moni[mod_name]['class_name'])(conn, db) + try: + mod_inst.check() + except modules.ModuleNotCompatibleException.ModuleNotCompatibleException as mnce: + print mnce.__str__() + except modules.CommandNotFoundException.CommandNotFoundException as cnfe: + print cnfe.__str__() def load_all_monitoring_modules(self): """ @@ -165,15 +183,16 @@ class ModuleLoader: mod_inst.check() else: conn = self.create_connection(addr_host) - mod_inst = getattr(self.loaded_mod_moni[mod_name]['imported'], - self.loaded_mod_moni[mod_name]['class_name'])(conn, db, - modules.ModuleNotCompatibleException) - try: - mod_inst.check() - except modules.ModuleNotCompatibleException.ModuleNotCompatibleException as mnce: - print mnce.__str__() - except modules.CommandNotFoundException.CommandNotFoundException as cnfe: - print cnfe.__str__() + if conn is not None: + mod_inst = getattr(self.loaded_mod_moni[mod_name]['imported'], + self.loaded_mod_moni[mod_name]['class_name'])(conn, db, + modules.ModuleNotCompatibleException) + try: + mod_inst.check() + except modules.ModuleNotCompatibleException.ModuleNotCompatibleException as mnce: + print mnce.__str__() + except modules.CommandNotFoundException.CommandNotFoundException as cnfe: + print cnfe.__str__() def get_monitoring_modules_list(self): """ diff --git a/app/modules/detection_modules/__init__.py b/app/modules/detection_modules/__init__.py index 9735bce..6ed406e 100644 --- a/app/modules/detection_modules/__init__.py +++ b/app/modules/detection_modules/__init__.py @@ -1,2 +1 @@ -__author__ = 'aguilbaud' -__all__ = ['unix'] \ No newline at end of file +__author__ = 'aguilbaud' \ No newline at end of file diff --git a/app/modules/detection_modules/unix/drive_detection.py b/app/modules/detection_modules/drive_detection.py similarity index 79% rename from app/modules/detection_modules/unix/drive_detection.py rename to app/modules/detection_modules/drive_detection.py index 18d548e..b246bde 100644 --- a/app/modules/detection_modules/unix/drive_detection.py +++ b/app/modules/detection_modules/drive_detection.py @@ -2,15 +2,27 @@ __author__ = 'aguilbaud' import json -class drive_detection: +def get_class_name(): + return "DriveDetection" + + +class DriveDetection: + """ + Retourne les informations des partitions systeme sous la forme : + {"sr0": {"mountpoint": "none", "type": "rom", "name": "sr0", "size": "1024M"} + """ + def __init__(self, conn, db): self.conn = conn self.db = db + self.name = get_class_name() + self.compatible_os = ['linux', 'unix'] - ''' - Retourne les informations des partitions systeme sous la forme : - {"sr0": {"mountpoint": "none", "type": "rom", "name": "sr0", "size": "1024M"} - ''' + def get_name(self): + return self.name + + def get_compatible_os(self): + return self.compatible_os # Informations sur les partitions def run_detection(self): diff --git a/app/modules/detection_modules/unix/kernel_detection.py b/app/modules/detection_modules/kernel_detection.py similarity index 53% rename from app/modules/detection_modules/unix/kernel_detection.py rename to app/modules/detection_modules/kernel_detection.py index 037098a..b7d26bd 100644 --- a/app/modules/detection_modules/unix/kernel_detection.py +++ b/app/modules/detection_modules/kernel_detection.py @@ -1,10 +1,23 @@ __author__ = 'aguilbaud' import json -class kernel_detection: + +def get_class_name(): + return "KernelDetection" + + +class KernelDetection: def __init__(self, conn, db): self.conn = conn self.db = db + self.name = get_class_name() + self.compatible_os = ['linux', 'unix'] + + def get_name(self): + return self.name + + def get_compatible_os(self): + return self.compatible_os def run_detection(self): cmd = "cat /proc/version" diff --git a/app/modules/detection_modules/unix/os_detection.py b/app/modules/detection_modules/os_detection.py similarity index 73% rename from app/modules/detection_modules/unix/os_detection.py rename to app/modules/detection_modules/os_detection.py index 6126250..20492a4 100644 --- a/app/modules/detection_modules/unix/os_detection.py +++ b/app/modules/detection_modules/os_detection.py @@ -2,10 +2,22 @@ __author__ = 'aguilbaud' import json -class os_detection: +def get_class_name(): + return "OSDetection" + + +class OSDetection: def __init__(self, conn, db): self.conn = conn self.db = db + self.name = get_class_name() + self.compatible_os = ['linux', 'unix'] + + def get_name(self): + return self.name + + def get_compatible_os(self): + return self.compatible_os def run_detection(self): dict_total = {} diff --git a/app/modules/detection_modules/unix/__init__.py b/app/modules/detection_modules/unix/__init__.py deleted file mode 100644 index cb82579..0000000 --- a/app/modules/detection_modules/unix/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -__author__ = 'aguilbaud' -__all__ = ['drive_detection', 'kernel_detection', 'os_detection'] \ No newline at end of file diff --git a/app/modules/detection_modules/unix/cpu_detection.py b/app/modules/detection_modules/unix/cpu_detection.py deleted file mode 100644 index d578583..0000000 --- a/app/modules/detection_modules/unix/cpu_detection.py +++ /dev/null @@ -1,18 +0,0 @@ -__author__ = 'aguilbaud' -import json - - -class cpu_detection: - def __init__(self, conn, db): - self.conn = conn - self.db = db - - def run_detection(self): - dict_total = {} - cmd = "lshw -class cpu -json" - stdout = self.conn.exec_command(cmd) - all_res = json.loads(stdout) - for key in all_res: - if type(all_res[key]) != "dict": - dict_total[key] = all_res[key] - self.db.save_detection(self.conn.get_addr_host(), "cpu_detection", json.dumps(dict_total)) \ No newline at end of file diff --git a/app/modules/detection_modules/unix/network_detection.py b/app/modules/detection_modules/unix/network_detection.py deleted file mode 100644 index 9143464..0000000 --- a/app/modules/detection_modules/unix/network_detection.py +++ /dev/null @@ -1,18 +0,0 @@ -__author__ = 'aguilbaud' -import json - - -class cpu_detection: - def __init__(self, conn, db): - self.conn = conn - self.db = db - - def run_detection(self): - dict_total = {} - cmd = "lshw -class network -json" - stdout = self.conn.exec_command(cmd) - all_res = json.loads(stdout) - for key in all_res: - if type(all_res[key]) != "dict": - dict_total[key] = all_res[key] - self.db.save_detection(self.conn.get_addr_host(), "network_detection", json.dumps(dict_total)) \ No newline at end of file diff --git a/app/process_monitoring.py b/app/process_monitoring.py index a4e852d..ffc51a8 100644 --- a/app/process_monitoring.py +++ b/app/process_monitoring.py @@ -98,8 +98,7 @@ class RunMonitoring(threading.Thread): sys.stdout.flush() self.ml.run_one_monitoring_module(dict_mod['mod_name'], dict_mod['addr'], None, None) else: - print "Launching " + str(dict_mod['os']) + "." + \ - str(dict_mod['mod_name']) + " on " + str(dict_mod['addr']) + print "Launching " + str(dict_mod['mod_name']) + " on " + str(dict_mod['addr']) sys.stdout.flush() self.ml.run_one_monitoring_module(dict_mod['mod_name'], dict_mod['addr'], None, None) self.wsc.notify_state_change() \ No newline at end of file diff --git a/static/js/controllers/hostPageCtrl.js b/static/js/controllers/hostPageCtrl.js index 635d059..a009be5 100644 --- a/static/js/controllers/hostPageCtrl.js +++ b/static/js/controllers/hostPageCtrl.js @@ -58,14 +58,14 @@ mumApp.controller('hostPageCtrl', function($scope, $rootScope, $routeParams, $mo }); // monitoring data are updated - /*$scope.$on("hostsUpdate", function (event, args) { + $scope.$on("hostsUpdate", function (event, args) { $scope.$apply(function(){ for(i=0 ; i<args.length()) ; i++){ if(args[i][]) $scope.items['monitoring'] = args['monitoring']; } }); - });*/ + }); // save custom informations $scope.save_custom_infos = function(){ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 53db6d574b84884f134d1ea1d85d6a8847e2fe36 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu Mar 12 14:52:21 2015 +0100 hostpage : launch full detection => OK --- app/app.py | 4 +++- app/module_loader.py | 8 +++----- app/modules/connection_modules/ssh.py | 1 - static/js/controllers/hostPageCtrl.js | 8 ++++++-- views/hostpage.html | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/app.py b/app/app.py index c37b3c5..3f2df3d 100755 --- a/app/app.py +++ b/app/app.py @@ -128,6 +128,8 @@ def receive(ws): for code in msg: if code == "NMAP_SCAN_DEMAND": start_first_detection(msg["NMAP_SCAN_DEMAND"], ml, ws) + elif code == "LAUNCH_FULL_DETECTION": + ml.run_all_detection_modules(msg["LAUNCH_FULL_DETECTION"]) elif code == "GET_HOSTS": db = ml.get_db() ws.send(json.dumps({"RES_GET_HOSTS": db.get_hosts()})) @@ -172,6 +174,6 @@ if __name__ == '__main__': ml.load_all_connection_modules() ml.load_all_detection_modules() wsc = WebSocketContainer(ml.get_db()) - #process_monitoring.init(ml, wsc) + process_monitoring.init(ml, wsc) port = int(os.environ.get('PORT', 1337)) run(host='0.0.0.0', port=port, debug=True, server=GeventWebSocketServer) \ No newline at end of file diff --git a/app/module_loader.py b/app/module_loader.py index 3eca78e..c1a587c 100644 --- a/app/module_loader.py +++ b/app/module_loader.py @@ -89,7 +89,6 @@ class ModuleLoader: Instanciates and stores the informations about each monitoring modules avaliable on the loaded_mod_detect attribute """ for importer, mod_name, ispkg in pkgutil.iter_modules(["app/modules/detection_modules/"]): - print mod_name if mod_name not in sys.modules and not mod_name == 'nmap_detection': try: loaded_mod = __import__("modules.detection_modules." + mod_name, fromlist=[mod_name]) @@ -102,7 +101,6 @@ class ModuleLoader: self.loaded_mod_detect[mod_name] = infos_mod except AttributeError: print "Error : internal detection module " + mod_name + " could not have been loaded. " - print self.loaded_mod_detect def run_all_detection_modules(self, addr_host): """ @@ -113,10 +111,10 @@ class ModuleLoader: conn = self.create_connection(addr_host) if conn is not None: for mod_name in self.loaded_mod_detect: - mod_inst = getattr(self.loaded_mod_moni[mod_name]['imported'], - self.loaded_mod_moni[mod_name]['class_name'])(conn, db) + mod_inst = getattr(self.loaded_mod_detect[mod_name]['imported'], + self.loaded_mod_detect[mod_name]['class_name'])(conn, db) try: - mod_inst.check() + mod_inst.run_detection() except modules.ModuleNotCompatibleException.ModuleNotCompatibleException as mnce: print mnce.__str__() except modules.CommandNotFoundException.CommandNotFoundException as cnfe: diff --git a/app/modules/connection_modules/ssh.py b/app/modules/connection_modules/ssh.py index 8806756..ce3c576 100644 --- a/app/modules/connection_modules/ssh.py +++ b/app/modules/connection_modules/ssh.py @@ -13,7 +13,6 @@ class SSH: self.CommandNotFoundException = cnfe if params is not None: key_path = str(key_loc) + str(params['public_key']) - print key_path key = paramiko.RSAKey.from_private_key_file(key_path) self.ssh = paramiko.SSHClient() self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) diff --git a/static/js/controllers/hostPageCtrl.js b/static/js/controllers/hostPageCtrl.js index a009be5..8bb2a78 100644 --- a/static/js/controllers/hostPageCtrl.js +++ b/static/js/controllers/hostPageCtrl.js @@ -49,6 +49,10 @@ mumApp.controller('hostPageCtrl', function($scope, $rootScope, $routeParams, $mo return($scope.addr_host); }; + $scope.launch_detection = function(){ + $rootScope.$broadcast("sendViaWs", JSON.stringify({"LAUNCH_FULL_DETECTION": $scope.addr_host})); + } + // receiving the host informations $scope.$on("hostInfos", function (event, args) { $scope.$apply(function(){ @@ -57,7 +61,7 @@ mumApp.controller('hostPageCtrl', function($scope, $rootScope, $routeParams, $mo }); }); - // monitoring data are updated + /* // monitoring data are updated $scope.$on("hostsUpdate", function (event, args) { $scope.$apply(function(){ for(i=0 ; i<args.length()) ; i++){ @@ -65,7 +69,7 @@ mumApp.controller('hostPageCtrl', function($scope, $rootScope, $routeParams, $mo $scope.items['monitoring'] = args['monitoring']; } }); - }); + });*/ // save custom informations $scope.save_custom_infos = function(){ diff --git a/views/hostpage.html b/views/hostpage.html index 2286641..3e67cce 100644 --- a/views/hostpage.html +++ b/views/hostpage.html @@ -3,7 +3,7 @@ <h1 class="page-header">Current state of {{addr_host}} <small>{{items.hostname}}</small></h1> <button type="button" class="btn btn-primary btn-xs" ng-click="open_modal_block()">Activate/Deactivate</button> <button type="button" class="btn btn-primary btn-xs" ng-click="open_modal_conn()">Connection settings</button> - <button type="button" class="btn btn-info btn-xs">Launch a new detection</button> + <button type="button" class="btn btn-info btn-xs" ng-click="launch_detection()">Launch a full detection</button> <button type="button" class="btn btn-danger btn-xs" ng-click="call_func('remove_host', [addr_host])">Remove this host</button> <table class="table table-condensed table-hover"> <thead> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm