From b510b4e76c31ba6ed6c576c566144690aaff8a58 Mon Sep 17 00:00:00 2001 From: Matt Van Dijk Date: Tue, 8 Mar 2016 12:29:11 -0500 Subject: [PATCH] Cluster details page should list all endpoints Currently only one endpoint is shown in the cluster details tab. Instead, this should be a comma-separated list. Make the appropriate change to the MongoDB and redis templates. Change-Id: I85c67119174e576134862e7d971b6b9df3f674ac Closes-bug: #1554623 --- .../cluster-endpoints-52bbb9f1c146ae97.yaml | 4 ++++ .../_detail_overview_mongodb.html | 17 +++++++---------- .../_detail_overview_redis.html | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 releasenotes/notes/cluster-endpoints-52bbb9f1c146ae97.yaml diff --git a/releasenotes/notes/cluster-endpoints-52bbb9f1c146ae97.yaml b/releasenotes/notes/cluster-endpoints-52bbb9f1c146ae97.yaml new file mode 100644 index 0000000..be9eecb --- /dev/null +++ b/releasenotes/notes/cluster-endpoints-52bbb9f1c146ae97.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - Display all endpoints in the dashboard's cluster + details endpoint list. diff --git a/trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview_mongodb.html b/trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview_mongodb.html index 4a1a800..6d32d17 100644 --- a/trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview_mongodb.html +++ b/trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview_mongodb.html @@ -7,18 +7,15 @@
{% with cluster.ip.0 as ip %}
{% trans "Host" %}
-
{% if not ip %} - {% trans "Not Assigned" %} -
+
{% trans "Not Assigned" %}
{% else %} - {{ ip }} - -
{% trans "Database Port" %}
-
27017
-
{% trans "Connection Examples" %}
-
mongo --host {{ ip }}
-
mongodb://[{% trans "USERNAME" %}:{% trans "PASSWORD" %}@]{{ ip }}:27017/{% trans "DATABASE" %}
+
{{ cluster.ip|join:', ' }}
+
{% trans "Database Port" %}
+
27017
+
{% trans "Connection Examples" %}
+
mongo --host {{ ip }}
+
mongodb://[{% trans "USERNAME" %}:{% trans "PASSWORD" %}@]{{ ip }}:27017/{% trans "DATABASE" %}
{% endif %} {% endwith %}
diff --git a/trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview_redis.html b/trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview_redis.html index 6178b92..78f814b 100644 --- a/trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview_redis.html +++ b/trove_dashboard/content/database_clusters/templates/database_clusters/_detail_overview_redis.html @@ -10,7 +10,7 @@ {% if not ip %}
{% trans "Not Assigned" %}
{% else %} -
{{ ip }}
+
{{ cluster.ip|join:', ' }}
{% trans "Connection Examples" %}
redis-cli -h {{ ip }}
{% endif %}