Skip to content

Commit 0290786

Browse files
committed
Bugfix - MySQL Percona is not showing metrics
1 parent 3b17730 commit 0290786

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

dbaas/logical/views.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
from drivers.errors import CredentialAlreadyExists
2323
from physical.models import (
2424
Host, DiskOffering, Environment, Plan, Offering,
25-
EnginePatch,
26-
)
25+
EnginePatch
26+
)
2727
from util import get_credentials_for
2828
from notification.tasks import TaskRegister
2929
from notification.models import TaskHistory
@@ -615,9 +615,13 @@ def database_metrics(request, context, database):
615615
endpoint = credential.endpoint
616616
datasource = credential.get_parameter_by_name('environment')
617617

618+
engine_type = (
619+
database.engine_type if not database.engine_type == "mysql_percona" else "mysql"
620+
)
621+
618622
grafana_url_zabbix = '{}/dashboard/{}?{}={}&{}={}&{}={}&{}={}'.format(
619623
endpoint,
620-
credential.project.format(database.engine_type),
624+
credential.project.format(engine_type),
621625
credential.get_parameter_by_name('db_param'), instance.dns,
622626
credential.get_parameter_by_name('os_param'),
623627
instance.hostname.hostname,
@@ -635,7 +639,8 @@ def database_metrics(request, context, database):
635639
print "grafana_url_zabbix:", grafana_url_zabbix
636640

637641
dashboard = credential.get_parameter_by_name('sofia_dbaas_database_dashboard')
638-
dashboard = dashboard.format(database.engine_type)
642+
643+
dashboard = dashboard.format(engine_type)
639644
url = "{}/{}?var-host_name={}&var-datasource={}".format(
640645
credential.endpoint,
641646
dashboard,

0 commit comments

Comments
 (0)