From 9c9bb88c9181f0f9342ed0b8ce1ed7654e622ada Mon Sep 17 00:00:00 2001
From: crusader <crusader@loafle.com>
Date: Fri, 20 Apr 2018 12:07:24 +0900
Subject: [PATCH] ing

---
 crawler/crawler.go                            | 50 +++++++++++++++++++
 .../cassandra/CassandraHealthCrawler.go       | 10 +++-
 crawler/health/dns/DNSHealthCrawler.go        | 10 +++-
 crawler/health/ftp/FTPHealthCrawler.go        | 10 +++-
 crawler/health/http/HTTPHealthCrawler.go      | 10 +++-
 crawler/health/imap/IMAPHealthCrawler.go      | 10 +++-
 crawler/health/ldap/LDAPHealthCrawler.go      | 10 +++-
 .../health/mongodb/MongoDBHealthCrawler.go    | 10 +++-
 crawler/health/mysql/MySQLHealthCrawler.go    | 10 +++-
 .../health/netbios/NetBIOSHealthCrawler.go    | 10 +++-
 crawler/health/oracle/OracleHealthCrawler.go  | 10 +++-
 crawler/health/pop/POPHealthCrawler.go        | 10 +++-
 .../postgresql/PostgreSQLHealthCrawler.go     | 10 +++-
 crawler/health/redis/RedisHealthCrawler.go    | 10 +++-
 crawler/health/rmi/RMIHealthCrawler.go        | 10 +++-
 crawler/health/smb/SMBHealthCrawler.go        | 10 +++-
 crawler/health/smtp/SMTPHealthCrawler.go      | 10 +++-
 crawler/health/snmp/v2/SNMPHealthCrawler.go   | 10 +++-
 crawler/health/snmp/v3/SNMPHealthCrawler.go   | 10 +++-
 .../sqlserver/SQLServerHealthCrawler.go       | 10 +++-
 crawler/health/ssh/SSHHealthCrawler.go        | 10 +++-
 crawler/health/telnet/TelnetHealthCrawler.go  | 10 +++-
 crawler/health/wmi/WMIHealthCrawler.go        | 10 +++-
 crawler/ssh/SSHCrawler.go                     | 15 ++++--
 crawler/ssh/SSHCrawler_test.json              |  2 +-
 25 files changed, 261 insertions(+), 26 deletions(-)

diff --git a/crawler/crawler.go b/crawler/crawler.go
index 7ea37c7..48d768c 100644
--- a/crawler/crawler.go
+++ b/crawler/crawler.go
@@ -2,12 +2,62 @@ package crawler
 
 import (
 	"git.loafle.net/overflow/crawler-go"
+
+	activedirectoryH "git.loafle.net/overflow/container_network/crawler/health/activedirectory"
+	cassandraH "git.loafle.net/overflow/container_network/crawler/health/cassandra"
+	dnsH "git.loafle.net/overflow/container_network/crawler/health/dns"
+	ftpH "git.loafle.net/overflow/container_network/crawler/health/ftp"
+	httpH "git.loafle.net/overflow/container_network/crawler/health/http"
+	imapH "git.loafle.net/overflow/container_network/crawler/health/imap"
+	ldapH "git.loafle.net/overflow/container_network/crawler/health/ldap"
+	mongodbH "git.loafle.net/overflow/container_network/crawler/health/mongodb"
+	mysqlH "git.loafle.net/overflow/container_network/crawler/health/mysql"
+	netbiosH "git.loafle.net/overflow/container_network/crawler/health/netbios"
+	oracleH "git.loafle.net/overflow/container_network/crawler/health/oracle"
+	popH "git.loafle.net/overflow/container_network/crawler/health/pop"
+	postgresqlH "git.loafle.net/overflow/container_network/crawler/health/postgresql"
+	redisH "git.loafle.net/overflow/container_network/crawler/health/redis"
+	rmiH "git.loafle.net/overflow/container_network/crawler/health/rmi"
+	smbH "git.loafle.net/overflow/container_network/crawler/health/smb"
+	smtpH "git.loafle.net/overflow/container_network/crawler/health/smtp"
+	snmpV2H "git.loafle.net/overflow/container_network/crawler/health/snmp/v2"
+	snmpV3H "git.loafle.net/overflow/container_network/crawler/health/snmp/v3"
+	sqlserverH "git.loafle.net/overflow/container_network/crawler/health/sqlserver"
+	sshH "git.loafle.net/overflow/container_network/crawler/health/ssh"
+	telnetH "git.loafle.net/overflow/container_network/crawler/health/telnet"
+	wmiH "git.loafle.net/overflow/container_network/crawler/health/wmi"
+	"git.loafle.net/overflow/container_network/crawler/ssh"
 )
 
 var crawlers map[string]crawler.Crawler
 
 func init() {
 	crawlers = make(map[string]crawler.Crawler, 0)
+
+	addCrawler(activedirectoryH.NewCrawler())
+	addCrawler(cassandraH.NewCrawler())
+	addCrawler(dnsH.NewCrawler())
+	addCrawler(ftpH.NewCrawler())
+	addCrawler(httpH.NewCrawler())
+	addCrawler(imapH.NewCrawler())
+	addCrawler(ldapH.NewCrawler())
+	addCrawler(mongodbH.NewCrawler())
+	addCrawler(mysqlH.NewCrawler())
+	addCrawler(netbiosH.NewCrawler())
+	addCrawler(oracleH.NewCrawler())
+	addCrawler(popH.NewCrawler())
+	addCrawler(postgresqlH.NewCrawler())
+	addCrawler(redisH.NewCrawler())
+	addCrawler(rmiH.NewCrawler())
+	addCrawler(smbH.NewCrawler())
+	addCrawler(smtpH.NewCrawler())
+	addCrawler(snmpV2H.NewCrawler())
+	addCrawler(snmpV3H.NewCrawler())
+	addCrawler(sqlserverH.NewCrawler())
+	addCrawler(sshH.NewCrawler())
+	addCrawler(telnetH.NewCrawler())
+	addCrawler(wmiH.NewCrawler())
+	addCrawler(ssh.NewCrawler())
 }
 
 func addCrawler(c crawler.Crawler) {
diff --git a/crawler/health/cassandra/CassandraHealthCrawler.go b/crawler/health/cassandra/CassandraHealthCrawler.go
index 4685e9c..cdb46e4 100644
--- a/crawler/health/cassandra/CassandraHealthCrawler.go
+++ b/crawler/health/cassandra/CassandraHealthCrawler.go
@@ -12,7 +12,15 @@ type CassandraHealthCrawler struct {
 }
 
 func (c *CassandraHealthCrawler) Name() string {
-	return "CASSANDRA_HEALTH_CRAWLER"
+	return "CASSANDRA_HEALTH"
+}
+
+func (c *CassandraHealthCrawler) String() string {
+	return "Cassandra Health Crawler"
+}
+
+func (c *CassandraHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *CassandraHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/dns/DNSHealthCrawler.go b/crawler/health/dns/DNSHealthCrawler.go
index fb051b5..5602c39 100644
--- a/crawler/health/dns/DNSHealthCrawler.go
+++ b/crawler/health/dns/DNSHealthCrawler.go
@@ -12,7 +12,15 @@ type DNSHealthCrawler struct {
 }
 
 func (c *DNSHealthCrawler) Name() string {
-	return "DNS_HEALTH_CRAWLER"
+	return "DNS_HEALTH"
+}
+
+func (c *DNSHealthCrawler) String() string {
+	return "DNS Health Crawler"
+}
+
+func (c *DNSHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *DNSHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/ftp/FTPHealthCrawler.go b/crawler/health/ftp/FTPHealthCrawler.go
index 49489ec..b5e227e 100644
--- a/crawler/health/ftp/FTPHealthCrawler.go
+++ b/crawler/health/ftp/FTPHealthCrawler.go
@@ -12,7 +12,15 @@ type FTPHealthCrawler struct {
 }
 
 func (c *FTPHealthCrawler) Name() string {
-	return "FTP_HEALTH_CRAWLER"
+	return "FTP_HEALTH"
+}
+
+func (c *FTPHealthCrawler) String() string {
+	return "FTP Health Crawler"
+}
+
+func (c *FTPHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *FTPHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/http/HTTPHealthCrawler.go b/crawler/health/http/HTTPHealthCrawler.go
index 9a0446b..ab4432a 100644
--- a/crawler/health/http/HTTPHealthCrawler.go
+++ b/crawler/health/http/HTTPHealthCrawler.go
@@ -12,7 +12,15 @@ type HTTPHealthCrawler struct {
 }
 
 func (c *HTTPHealthCrawler) Name() string {
-	return "HTTP_HEALTH_CRAWLER"
+	return "HTTP_HEALTH"
+}
+
+func (c *HTTPHealthCrawler) String() string {
+	return "HTTP Health Crawler"
+}
+
+func (c *HTTPHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *HTTPHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/imap/IMAPHealthCrawler.go b/crawler/health/imap/IMAPHealthCrawler.go
index cbce928..fa32089 100644
--- a/crawler/health/imap/IMAPHealthCrawler.go
+++ b/crawler/health/imap/IMAPHealthCrawler.go
@@ -12,7 +12,15 @@ type IMAPHealthCrawler struct {
 }
 
 func (c *IMAPHealthCrawler) Name() string {
-	return "IMAP_HEALTH_CRAWLER"
+	return "IMAP_HEALTH"
+}
+
+func (c *IMAPHealthCrawler) String() string {
+	return "IMAP Health Crawler"
+}
+
+func (c *IMAPHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *IMAPHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/ldap/LDAPHealthCrawler.go b/crawler/health/ldap/LDAPHealthCrawler.go
index bc3d751..3e0d227 100644
--- a/crawler/health/ldap/LDAPHealthCrawler.go
+++ b/crawler/health/ldap/LDAPHealthCrawler.go
@@ -12,7 +12,15 @@ type LDAPHealthCrawler struct {
 }
 
 func (c *LDAPHealthCrawler) Name() string {
-	return "LDAP_HEALTH_CRAWLER"
+	return "LDAP_HEALTH"
+}
+
+func (c *LDAPHealthCrawler) String() string {
+	return "Active Directory Health Crawler"
+}
+
+func (c *LDAPHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *LDAPHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/mongodb/MongoDBHealthCrawler.go b/crawler/health/mongodb/MongoDBHealthCrawler.go
index 60fca0d..5cca7d3 100644
--- a/crawler/health/mongodb/MongoDBHealthCrawler.go
+++ b/crawler/health/mongodb/MongoDBHealthCrawler.go
@@ -12,7 +12,15 @@ type MongoDBHealthCrawler struct {
 }
 
 func (c *MongoDBHealthCrawler) Name() string {
-	return "MONGODB_HEALTH_CRAWLER"
+	return "MONGODB_HEALTH"
+}
+
+func (c *MongoDBHealthCrawler) String() string {
+	return "MongoDB Health Crawler"
+}
+
+func (c *MongoDBHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *MongoDBHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/mysql/MySQLHealthCrawler.go b/crawler/health/mysql/MySQLHealthCrawler.go
index 38c2f36..8e6c19c 100644
--- a/crawler/health/mysql/MySQLHealthCrawler.go
+++ b/crawler/health/mysql/MySQLHealthCrawler.go
@@ -12,7 +12,15 @@ type MySQLHealthCrawler struct {
 }
 
 func (c *MySQLHealthCrawler) Name() string {
-	return "MYSQL_HEALTH_CRAWLER"
+	return "MYSQL_HEALTH"
+}
+
+func (c *MySQLHealthCrawler) String() string {
+	return "MySQL Health Crawler"
+}
+
+func (c *MySQLHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *MySQLHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/netbios/NetBIOSHealthCrawler.go b/crawler/health/netbios/NetBIOSHealthCrawler.go
index d2af2f0..ed2f36a 100644
--- a/crawler/health/netbios/NetBIOSHealthCrawler.go
+++ b/crawler/health/netbios/NetBIOSHealthCrawler.go
@@ -12,7 +12,15 @@ type NetBIOSHealthCrawler struct {
 }
 
 func (c *NetBIOSHealthCrawler) Name() string {
-	return "NETBIOS_HEALTH_CRAWLER"
+	return "NETBIOS_HEALTH"
+}
+
+func (c *NetBIOSHealthCrawler) String() string {
+	return "NetBIOS Health Crawler"
+}
+
+func (c *NetBIOSHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *NetBIOSHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/oracle/OracleHealthCrawler.go b/crawler/health/oracle/OracleHealthCrawler.go
index 35a66c2..6d83ec2 100644
--- a/crawler/health/oracle/OracleHealthCrawler.go
+++ b/crawler/health/oracle/OracleHealthCrawler.go
@@ -12,7 +12,15 @@ type OracleHealthCrawler struct {
 }
 
 func (c *OracleHealthCrawler) Name() string {
-	return "ORACLE_HEALTH_CRAWLER"
+	return "ORACLE_HEALTH"
+}
+
+func (c *OracleHealthCrawler) String() string {
+	return "Oracle Health Crawler"
+}
+
+func (c *OracleHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *OracleHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/pop/POPHealthCrawler.go b/crawler/health/pop/POPHealthCrawler.go
index db4e926..4766cef 100644
--- a/crawler/health/pop/POPHealthCrawler.go
+++ b/crawler/health/pop/POPHealthCrawler.go
@@ -12,7 +12,15 @@ type POPHealthCrawler struct {
 }
 
 func (c *POPHealthCrawler) Name() string {
-	return "POP_HEALTH_CRAWLER"
+	return "POP_HEALTH"
+}
+
+func (c *POPHealthCrawler) String() string {
+	return "POP Health Crawler"
+}
+
+func (c *POPHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *POPHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/postgresql/PostgreSQLHealthCrawler.go b/crawler/health/postgresql/PostgreSQLHealthCrawler.go
index b82ce6c..c0ca759 100644
--- a/crawler/health/postgresql/PostgreSQLHealthCrawler.go
+++ b/crawler/health/postgresql/PostgreSQLHealthCrawler.go
@@ -12,7 +12,15 @@ type PostgreSQLHealthCrawler struct {
 }
 
 func (c *PostgreSQLHealthCrawler) Name() string {
-	return "POSTGRESQL_HEALTH_CRAWLER"
+	return "POSTGRESQL_HEALTH"
+}
+
+func (c *PostgreSQLHealthCrawler) String() string {
+	return "PostgreSQL Health Crawler"
+}
+
+func (c *PostgreSQLHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *PostgreSQLHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/redis/RedisHealthCrawler.go b/crawler/health/redis/RedisHealthCrawler.go
index 1b113cb..0c9d6d3 100644
--- a/crawler/health/redis/RedisHealthCrawler.go
+++ b/crawler/health/redis/RedisHealthCrawler.go
@@ -12,7 +12,15 @@ type RedisHealthCrawler struct {
 }
 
 func (c *RedisHealthCrawler) Name() string {
-	return "REDIS_HEALTH_CRAWLER"
+	return "REDIS_HEALTH"
+}
+
+func (c *RedisHealthCrawler) String() string {
+	return "Redis Health Crawler"
+}
+
+func (c *RedisHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *RedisHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/rmi/RMIHealthCrawler.go b/crawler/health/rmi/RMIHealthCrawler.go
index c6eff3c..9230899 100644
--- a/crawler/health/rmi/RMIHealthCrawler.go
+++ b/crawler/health/rmi/RMIHealthCrawler.go
@@ -12,7 +12,15 @@ type RMIHealthCrawler struct {
 }
 
 func (c *RMIHealthCrawler) Name() string {
-	return "RMI_HEALTH_CRAWLER"
+	return "RMI_HEALTH"
+}
+
+func (c *RMIHealthCrawler) String() string {
+	return "RMI Health Crawler"
+}
+
+func (c *RMIHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *RMIHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/smb/SMBHealthCrawler.go b/crawler/health/smb/SMBHealthCrawler.go
index 6ddd96e..3de4b34 100644
--- a/crawler/health/smb/SMBHealthCrawler.go
+++ b/crawler/health/smb/SMBHealthCrawler.go
@@ -12,7 +12,15 @@ type SMBHealthCrawler struct {
 }
 
 func (c *SMBHealthCrawler) Name() string {
-	return "SMB_HEALTH_CRAWLER"
+	return "SMB_HEALTH"
+}
+
+func (c *SMBHealthCrawler) String() string {
+	return "SMB Health Crawler"
+}
+
+func (c *SMBHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *SMBHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/smtp/SMTPHealthCrawler.go b/crawler/health/smtp/SMTPHealthCrawler.go
index b32cb5b..8903fad 100644
--- a/crawler/health/smtp/SMTPHealthCrawler.go
+++ b/crawler/health/smtp/SMTPHealthCrawler.go
@@ -12,7 +12,15 @@ type SMTPHealthCrawler struct {
 }
 
 func (c *SMTPHealthCrawler) Name() string {
-	return "SMTP_HEALTH_CRAWLER"
+	return "SMTP_HEALTH"
+}
+
+func (c *SMTPHealthCrawler) String() string {
+	return "SMTP Health Crawler"
+}
+
+func (c *SMTPHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *SMTPHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/snmp/v2/SNMPHealthCrawler.go b/crawler/health/snmp/v2/SNMPHealthCrawler.go
index 17ede18..6a207db 100644
--- a/crawler/health/snmp/v2/SNMPHealthCrawler.go
+++ b/crawler/health/snmp/v2/SNMPHealthCrawler.go
@@ -12,7 +12,15 @@ type SNMPHealthCrawler struct {
 }
 
 func (c *SNMPHealthCrawler) Name() string {
-	return "SNMPV2C_HEALTH_CRAWLER"
+	return "SNMPV2C_HEALTH"
+}
+
+func (c *SNMPHealthCrawler) String() string {
+	return "SNMP V2C Health Crawler"
+}
+
+func (c *SNMPHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *SNMPHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/snmp/v3/SNMPHealthCrawler.go b/crawler/health/snmp/v3/SNMPHealthCrawler.go
index e970f0b..bdc8d2a 100644
--- a/crawler/health/snmp/v3/SNMPHealthCrawler.go
+++ b/crawler/health/snmp/v3/SNMPHealthCrawler.go
@@ -12,7 +12,15 @@ type SNMPHealthCrawler struct {
 }
 
 func (c *SNMPHealthCrawler) Name() string {
-	return "SNMPV3_HEALTH_CRAWLER"
+	return "SNMPV3_HEALTH"
+}
+
+func (c *SNMPHealthCrawler) String() string {
+	return "SNMP V3 Health Crawler"
+}
+
+func (c *SNMPHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *SNMPHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/sqlserver/SQLServerHealthCrawler.go b/crawler/health/sqlserver/SQLServerHealthCrawler.go
index 2675f45..ebf3fc1 100644
--- a/crawler/health/sqlserver/SQLServerHealthCrawler.go
+++ b/crawler/health/sqlserver/SQLServerHealthCrawler.go
@@ -12,7 +12,15 @@ type SQLServerHealthCrawler struct {
 }
 
 func (c *SQLServerHealthCrawler) Name() string {
-	return "SQLSERVER_HEALTH_CRAWLER"
+	return "SQLSERVER_HEALTH"
+}
+
+func (c *SQLServerHealthCrawler) String() string {
+	return "SQL Server Health Crawler"
+}
+
+func (c *SQLServerHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *SQLServerHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/ssh/SSHHealthCrawler.go b/crawler/health/ssh/SSHHealthCrawler.go
index e2fd545..75d720a 100644
--- a/crawler/health/ssh/SSHHealthCrawler.go
+++ b/crawler/health/ssh/SSHHealthCrawler.go
@@ -12,7 +12,15 @@ type SSHHealthCrawler struct {
 }
 
 func (c *SSHHealthCrawler) Name() string {
-	return "SSH_HEALTH_CRAWLER"
+	return "SSH_HEALTH"
+}
+
+func (c *SSHHealthCrawler) String() string {
+	return "SSH Health Crawler"
+}
+
+func (c *SSHHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *SSHHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/telnet/TelnetHealthCrawler.go b/crawler/health/telnet/TelnetHealthCrawler.go
index 565bc1b..06d6953 100644
--- a/crawler/health/telnet/TelnetHealthCrawler.go
+++ b/crawler/health/telnet/TelnetHealthCrawler.go
@@ -12,7 +12,15 @@ type TelnetHealthCrawler struct {
 }
 
 func (c *TelnetHealthCrawler) Name() string {
-	return "TELNET_HEALTH_CRAWLER"
+	return "TELNET_HEALTH"
+}
+
+func (c *TelnetHealthCrawler) String() string {
+	return "Telnet Health Crawler"
+}
+
+func (c *TelnetHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *TelnetHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/health/wmi/WMIHealthCrawler.go b/crawler/health/wmi/WMIHealthCrawler.go
index d8b6d52..ee5519a 100644
--- a/crawler/health/wmi/WMIHealthCrawler.go
+++ b/crawler/health/wmi/WMIHealthCrawler.go
@@ -12,7 +12,15 @@ type WMIHealthCrawler struct {
 }
 
 func (c *WMIHealthCrawler) Name() string {
-	return "WMI_HEALTH_CRAWLER"
+	return "WMI_HEALTH"
+}
+
+func (c *WMIHealthCrawler) String() string {
+	return "WMI Health Crawler"
+}
+
+func (c *WMIHealthCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *WMIHealthCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
diff --git a/crawler/ssh/SSHCrawler.go b/crawler/ssh/SSHCrawler.go
index aa5910b..e664e9c 100644
--- a/crawler/ssh/SSHCrawler.go
+++ b/crawler/ssh/SSHCrawler.go
@@ -5,11 +5,12 @@ import (
 	"bytes"
 	"fmt"
 
+	uuid "github.com/satori/go.uuid"
+
 	ocsm "git.loafle.net/overflow/commons-go/sensorconfig/model"
 	"git.loafle.net/overflow/container_network/crawler/ssh/client"
 	"git.loafle.net/overflow/container_network/crawler/ssh/parser"
 	crawler "git.loafle.net/overflow/crawler-go"
-	sensorConfigUtil "git.loafle.net/overflow/overflow_commons_go/modules/sensor_config/util"
 )
 
 type SSHCrawler struct {
@@ -17,7 +18,15 @@ type SSHCrawler struct {
 }
 
 func (c *SSHCrawler) Name() string {
-	return "SSH_CRAWLER"
+	return "SSH"
+}
+
+func (c *SSHCrawler) String() string {
+	return "SSH Crawler"
+}
+
+func (c *SSHCrawler) Auth(auth map[string]string) error {
+	return nil
 }
 
 func (c *SSHCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
@@ -64,7 +73,7 @@ func (c *SSHCrawler) Get(config *ocsm.SensorConfig) (map[string]string, error) {
 		}
 
 		if nil != rm {
-			mm := sensorConfigUtil.KeysToMap(item.Keys)
+			mm := ocsm.KeysToMap(item.Keys)
 			for key, value := range mm {
 				results[value] = rm[key]
 			}
diff --git a/crawler/ssh/SSHCrawler_test.json b/crawler/ssh/SSHCrawler_test.json
index 8db3b01..03a2e51 100644
--- a/crawler/ssh/SSHCrawler_test.json
+++ b/crawler/ssh/SSHCrawler_test.json
@@ -16,7 +16,7 @@
     "interval": "5"
   },
   "crawler": {
-    "name": "SSH_CRAWLER",
+    "name": "SSH",
     "container": "go_proxy"
   },
   "items": [{