Merge branch 'master' into elesbom-auto-update-ssl-core

Author: EliakinCosta

dbaas/drivers/replication_topologies/base.py

@@ -113,7 +113,7 @@ def get_upgrade_steps_final(self):
                 'workflow.steps.util.db_monitor.UpdateInfraVersion',
                 'workflow.steps.util.db_monitor.EnableMonitoring',
                 'workflow.steps.util.zabbix.DestroyAlarms',
-                'workflow.steps.util.zabbix.CreateAlarms',
+                'workflow.steps.util.zabbix.CreateAlarmsForUpgrade',
             ),
         }]
 

dbaas/logical/views.py

@@ -22,8 +22,8 @@
 from drivers.errors import CredentialAlreadyExists
 from physical.models import (
     Host, DiskOffering, Environment, Plan, Offering,
-    EnginePatch,
-    )
+    EnginePatch
+)
 from util import get_credentials_for
 from notification.tasks import TaskRegister, execute_scheduled_maintenance
 from notification.models import TaskHistory
@@ -653,9 +653,13 @@ def database_metrics(request, context, database):
         endpoint = credential.endpoint
         datasource = credential.get_parameter_by_name('environment')
 
+    engine_type = (
+        database.engine_type if not database.engine_type == "mysql_percona" else "mysql"
+    )
+
     grafana_url_zabbix = '{}/dashboard/{}?{}={}&{}={}&{}={}&{}={}'.format(
         endpoint,
-        credential.project.format(database.engine_type),
+        credential.project.format(engine_type),
         credential.get_parameter_by_name('db_param'), instance.dns,
         credential.get_parameter_by_name('os_param'),
         instance.hostname.hostname,
@@ -673,7 +677,8 @@ def database_metrics(request, context, database):
     print "grafana_url_zabbix:{}", grafana_url_zabbix
 
     dashboard = credential.get_parameter_by_name('sofia_dbaas_database_dashboard')
-    dashboard = dashboard.format(database.engine_type)
+
+    dashboard = dashboard.format(engine_type)
     url = "{}/{}?var-host_name={}&var-datasource={}".format(
         credential.endpoint,
         dashboard,

dbaas/workflow/steps/util/metric_collector.py

@@ -33,7 +33,8 @@ def script_variables(self):
             if len(self.host.instances.all()) > 1:
                 create_telegraf_config = False
         create_default_file = self.instance.instance_type in (
-            self.instance.MYSQL, self.instance.MONGODB, self.instance.REDIS)
+            self.instance.MYSQL, self.instance.MONGODB, self.instance.REDIS,
+            self.instance.MYSQL_PERCONA)
         variables = {
             'HOSTNAME': self.host.hostname.split('.')[0],
             'HOSTADDRESS': self.host.address,