Merge pull request #246 from globocom/remove_td_agent

otherpirate · web-flow · commit 3258f2f2ed75 · 2017-01-11T10:41:36.000-02:00
Remove td agent
diff --git a/dbaas/drivers/mongodb.py b/dbaas/drivers/mongodb.py
@@ -349,4 +349,4 @@ def switch_master(self):
             pass
 
     def get_database_agents(self):
-        return ['td-agent', 'monit']
+        return []
diff --git a/dbaas/drivers/redis.py b/dbaas/drivers/redis.py
@@ -347,4 +347,4 @@ def switch_master(self):
             raise Exception(str(output))
 
     def get_database_agents(self):
-        return ['td-agent', 'httpd', 'monit']
+        return ['httpd']
diff --git a/dbaas/drivers/replication_topologies/mysql.py b/dbaas/drivers/replication_topologies/mysql.py
@@ -64,7 +64,7 @@ def set_read_ip(self, driver, instance):
         raise NotImplementedError
 
     def get_database_agents(self):
-        return ['td-agent', 'mysql_statsd', 'monit']
+        return ['monit']
 
 
 class MySQLSingle(BaseMysql):
diff --git a/dbaas/workflow/settings.py b/dbaas/workflow/settings.py
@@ -45,7 +45,6 @@
     'workflow.steps.mysql.flipperfox_migration.config_backup_log.ConfigBackupLog',
     'workflow.steps.mysql.flipperfox_migration.acl_database_bind.BindNewInstances',
     'workflow.steps.mysql.flipperfox_migration.replicate_old_acls.ReplicateOldAcl',
-    'workflow.steps.mysql.flipperfox_migration.td_agent.StopTDAgent',
 )
 
 
@@ -60,8 +59,6 @@
     'workflow.steps.mysql.flipperfox_migration.set_infra_endpoint.SetInfraEndpoint',
     'workflow.steps.mysql.flipperfox_migration.update_zabbix_monitoring.UpdateZabbixMonitoring',
     'workflow.steps.mysql.flipperfox_migration.switch_dns.SwitchDNS',
-    'workflow.steps.mysql.flipperfox_migration.td_agent.StartTDAgent',
-    'workflow.steps.mysql.flipperfox_migration.start_mysql_statsd.StartMySQLStasD',
 
 )
 
diff --git a/dbaas/workflow/steps/mongodb/deploy/init_database.py b/dbaas/workflow/steps/mongodb/deploy/init_database.py
@@ -30,11 +30,6 @@ def do(self, workflow_dict):
             workflow_dict['replicasetname'] = 'ReplicaSet_' + \
                 workflow_dict['databaseinfra'].name
 
-            statsd_credentials = get_credentials_for(
-                environment=workflow_dict['environment'],
-                credential_type=CredentialType.STATSD)
-
-            statsd_host, statsd_port = statsd_credentials.endpoint.split(':')
             mongodb_password = get_credentials_for(environment=workflow_dict['environment'],
                                                    credential_type=CredentialType.MONGODB).password
 
@@ -60,8 +55,6 @@ def do(self, workflow_dict):
                         'HOST': workflow_dict['hosts'][index].hostname.split('.')[0],
                         'DATABASENAME': workflow_dict['name'],
                         'ENGINE': 'mongodb',
-                        'STATSD_HOST': statsd_host,
-                        'STATSD_PORT': statsd_port,
                         'IS_HA': workflow_dict['databaseinfra'].plan.is_ha
                     }
                     databaserule = 'ARBITER'
@@ -73,8 +66,6 @@ def do(self, workflow_dict):
                         'DATABASENAME': workflow_dict['name'],
                         'ENGINE': 'mongodb',
                         'DBPASSWORD': mongodb_password,
-                        'STATSD_HOST': statsd_host,
-                        'STATSD_PORT': statsd_port,
                         'IS_HA': workflow_dict['databaseinfra'].plan.is_ha
                     }
 
diff --git a/dbaas/workflow/steps/mongodb/upgrade/change_storage_engine_ha.py b/dbaas/workflow/steps/mongodb/upgrade/change_storage_engine_ha.py
@@ -12,7 +12,6 @@
 from workflow.steps.mongodb.util import build_stop_database_script
 from workflow.steps.mongodb.util import build_clean_data_data_script
 from workflow.steps.mongodb.util import build_wait_admin_be_created_script
-from workflow.steps.util import td_agent_script
 
 
 LOG = logging.getLogger(__name__)
@@ -68,7 +67,6 @@ def change_instance_binaries(self, instance):
         script += build_clean_data_data_script()
         script += build_start_database_script()
         script += build_wait_admin_be_created_script()
-        script += td_agent_script(option='restart')
 
         context_dict = {
         }
diff --git a/dbaas/workflow/steps/mongodb/upgrade/change_storage_engine_single.py b/dbaas/workflow/steps/mongodb/upgrade/change_storage_engine_single.py
@@ -14,7 +14,6 @@
 from workflow.steps.mongodb.util import build_start_database_script
 from workflow.steps.mongodb.util import build_stop_database_script
 from workflow.steps.mongodb.util import build_clean_data_data_script
-from workflow.steps.util import td_agent_script
 
 
 LOG = logging.getLogger(__name__)
@@ -38,7 +37,6 @@ def do(self, workflow_dict):
             script += build_mongorestore_database_script()
             script += build_enable_authentication_single_instance_script()
             script += build_restart_database_script()
-            script += td_agent_script(option='restart')
 
             context_dict = {
             }
diff --git a/dbaas/workflow/steps/mongodb/upgrade/upgrade_mongodb_26_to_30_ha.py b/dbaas/workflow/steps/mongodb/upgrade/upgrade_mongodb_26_to_30_ha.py
@@ -83,7 +83,6 @@ def change_instance_binaries(self, instance, connect_string, is_primary):
         script += util.build_change_release_alias_script()
         script += util.build_start_database_script(wait_time=30)
         script += util.build_change_limits_script()
-        script += util.build_remove_reprecated_index_counter_metrics()
 
         if is_primary:
             script += util.build_authschemaupgrade_script()
diff --git a/dbaas/workflow/steps/mongodb/upgrade/upgrade_mongodb_26_to_30_single.py b/dbaas/workflow/steps/mongodb/upgrade/upgrade_mongodb_26_to_30_single.py
@@ -34,7 +34,6 @@ def do(self, workflow_dict):
             script += util.build_authschemaupgrade_script()
             script += util.build_addrole_mongo3_script()
             script += util.build_change_limits_script()
-            script += util.build_remove_reprecated_index_counter_metrics()
 
             context_dict = {
                 'SOURCE_PATH': '/mnt/software/db/mongodb',
diff --git a/dbaas/workflow/steps/mongodb/util/__init__.py b/dbaas/workflow/steps/mongodb/util/__init__.py
@@ -340,11 +340,3 @@ def build_change_mongodb_conf_file_script():
         line=$((line + 1))
         sed -i ${line}'i\httpinterface = true' /data/mongodb.conf
     """
-
-
-def build_remove_reprecated_index_counter_metrics():
-    return """
-        sed -i '271,315 d' /etc/td-agent/td-agent.conf
-        sleep 20
-        /etc/init.d/td-agent start
-    """
diff --git a/dbaas/workflow/steps/mysql/deploy/init_database.py b/dbaas/workflow/steps/mysql/deploy/init_database.py
@@ -23,11 +23,6 @@ def __unicode__(self):
 
     def do(self, workflow_dict):
         try:
-            statsd_credentials = get_credentials_for(
-                environment=workflow_dict['environment'],
-                credential_type=CredentialType.STATSD)
-
-            statsd_host, statsd_port = statsd_credentials.endpoint.split(':')
 
             for index, hosts in enumerate(permutations(workflow_dict['hosts'])):
 
@@ -55,8 +50,6 @@ def do(self, workflow_dict):
                                                       credential_type=CredentialType.MYSQL).password,
                     'HOST': workflow_dict['hosts'][index].hostname.split('.')[0],
                     'ENGINE': 'mysql',
-                    'STATSD_HOST': statsd_host,
-                    'STATSD_PORT': statsd_port,
                 }
 
                 if len(workflow_dict['hosts']) > 1:
diff --git a/dbaas/workflow/steps/mysql/deploy/init_database_foxha.py b/dbaas/workflow/steps/mysql/deploy/init_database_foxha.py
@@ -23,11 +23,6 @@ def __unicode__(self):
 
     def do(self, workflow_dict):
         try:
-            statsd_credentials = get_credentials_for(
-                environment=workflow_dict['environment'],
-                credential_type=CredentialType.STATSD)
-
-            statsd_host, statsd_port = statsd_credentials.endpoint.split(':')
 
             for index, hosts in enumerate(permutations(workflow_dict['hosts'])):
 
@@ -57,8 +52,6 @@ def do(self, workflow_dict):
                                                       credential_type=CredentialType.MYSQL).password,
                     'HOST': workflow_dict['hosts'][index].hostname.split('.')[0],
                     'ENGINE': 'mysql',
-                    'STATSD_HOST': statsd_host,
-                    'STATSD_PORT': statsd_port,
                 }
 
                 if len(workflow_dict['hosts']) > 1:
diff --git a/dbaas/workflow/steps/mysql/flipperfox_migration/config_files.py b/dbaas/workflow/steps/mysql/flipperfox_migration/config_files.py
@@ -52,22 +52,6 @@ def do(self, workflow_dict):
                                     remotepath="/etc/my.cnf"):
                     raise Exception("FTP Error")
 
-                if not scp_get_file(server=source_host.address,
-                                    username=source_cs_host_attr.vm_user,
-                                    password=source_cs_host_attr.vm_password,
-                                    localpath="{}/mysql_statsd.conf".format(
-                                        localpath),
-                                    remotepath="/etc/mysql_statsd/mysql_statsd.conf"):
-                    raise Exception("FTP Error")
-
-                if not scp_get_file(server=source_host.address,
-                                    username=source_cs_host_attr.vm_user,
-                                    password=source_cs_host_attr.vm_password,
-                                    localpath="{}/td-agent.conf".format(
-                                        localpath),
-                                    remotepath="/etc/td-agent/td-agent.conf"):
-                    raise Exception("FTP Error")
-
                 target_host = source_host.future_host
                 LOG.info(target_host)
                 target_cs_host_attr = CS_HostAttr.objects.get(host=target_host)
@@ -79,22 +63,6 @@ def do(self, workflow_dict):
                                     remotepath="/etc/my.cnf"):
                     raise Exception("FTP Error")
 
-                if not scp_put_file(server=target_host.address,
-                                    username=target_cs_host_attr.vm_user,
-                                    password=target_cs_host_attr.vm_password,
-                                    localpath="{}/mysql_statsd.conf".format(
-                                        localpath),
-                                    remotepath="/etc/mysql_statsd/mysql_statsd.conf"):
-                    raise Exception("FTP Error")
-
-                if not scp_put_file(server=target_host.address,
-                                    username=target_cs_host_attr.vm_user,
-                                    password=target_cs_host_attr.vm_password,
-                                    localpath="{}/td-agent.conf".format(
-                                        localpath),
-                                    remotepath="/etc/td-agent/td-agent.conf"):
-                    raise Exception("FTP Error")
-
                 script = test_bash_script_error()
                 script += build_server_id_conf_script()
 
diff --git a/dbaas/workflow/steps/mysql/flipperfox_migration/start_mkheartbeat.py b/dbaas/workflow/steps/mysql/flipperfox_migration/start_mkheartbeat.py
@@ -23,7 +23,7 @@ def do(self, workflow_dict):
                 future_host = source_host.future_host
                 hosts_option = [(source_host, 'stop'), (future_host, 'start')]
                 for host, option in hosts_option:
-                    LOG.info("Starting td_agent on host {}".format(host))
+                    LOG.info("Starting mk-heartbeat-daemon on host {}".format(host))
 
                     cs_host_attr = CS_HostAttr.objects.get(host=host)
                     context_dict = {}
@@ -40,7 +40,7 @@ def do(self, workflow_dict):
                                                       output=output)
                     LOG.info(output)
                     if return_code != 0:
-                        LOG.error("Error starting mysql_statsd")
+                        LOG.error("Error starting mk-heartbeat-daemon")
                         LOG.error(str(output))
 
             return True
@@ -59,7 +59,7 @@ def undo(self, workflow_dict):
                 future_host = source_host.future_host
                 hosts_option = [(future_host, 'stop'), (source_host, 'start')]
                 for host, option in hosts_option:
-                    LOG.info("Starting td_agent on host {}".format(host))
+                    LOG.info("Starting mk-heartbeat-daemon on host {}".format(host))
 
                     cs_host_attr = CS_HostAttr.objects.get(host=host)
                     context_dict = {}
@@ -76,7 +76,7 @@ def undo(self, workflow_dict):
                                                       output=output)
                     LOG.info(output)
                     if return_code != 0:
-                        LOG.error("Error starting mysql_statsd")
+                        LOG.error("Error starting mk-heartbeat-daemon")
                         LOG.error(str(output))
 
             return True
diff --git a/dbaas/workflow/steps/mysql/flipperfox_migration/start_mysql_statsd.py b/dbaas/workflow/steps/mysql/flipperfox_migration/start_mysql_statsd.py
diff --git a/dbaas/workflow/steps/mysql/flipperfox_migration/td_agent.py b/dbaas/workflow/steps/mysql/flipperfox_migration/td_agent.py
diff --git a/dbaas/workflow/steps/mysql/util/__init__.py b/dbaas/workflow/steps/mysql/util/__init__.py
diff --git a/dbaas/workflow/steps/redis/deploy/init_database.py b/dbaas/workflow/steps/redis/deploy/init_database.py
diff --git a/dbaas/workflow/steps/redis/util/__init__.py b/dbaas/workflow/steps/redis/util/__init__.py
diff --git a/dbaas/workflow/steps/util/__init__.py b/dbaas/workflow/steps/util/__init__.py
diff --git a/dbaas/workflow/steps/util/deploy/restart_td_agent.py b/dbaas/workflow/steps/util/deploy/restart_td_agent.py

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@`
`45`	`45`	`'workflow.steps.mysql.flipperfox_migration.config_backup_log.ConfigBackupLog',`
`46`	`46`	`'workflow.steps.mysql.flipperfox_migration.acl_database_bind.BindNewInstances',`
`47`	`47`	`'workflow.steps.mysql.flipperfox_migration.replicate_old_acls.ReplicateOldAcl',`
`48`		`- 'workflow.steps.mysql.flipperfox_migration.td_agent.StopTDAgent',`
`49`	`48`	`)`
`50`	`49`
`51`	`50`
`@@ -60,8 +59,6 @@`
`60`	`59`	`'workflow.steps.mysql.flipperfox_migration.set_infra_endpoint.SetInfraEndpoint',`
`61`	`60`	`'workflow.steps.mysql.flipperfox_migration.update_zabbix_monitoring.UpdateZabbixMonitoring',`
`62`	`61`	`'workflow.steps.mysql.flipperfox_migration.switch_dns.SwitchDNS',`
`63`		`- 'workflow.steps.mysql.flipperfox_migration.td_agent.StartTDAgent',`
`64`		`- 'workflow.steps.mysql.flipperfox_migration.start_mysql_statsd.StartMySQLStasD',`
`65`	`62`
`66`	`63`	`)`
`67`	`64`