diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-02-23 18:04:58 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-02-23 18:05:12 +0100 |
| commit | fd2f62993d4fae153f792ad545379612a3a2755e (patch) | |
| tree | a8377857549ab095ec1d2892a8aba70b5f3e347c /server/sonar-web | |
| parent | f96a64f1feb89d3570c64cbd01f0c6154b4d4239 (diff) | |
| download | sonarqube-fd2f62993d4fae153f792ad545379612a3a2755e.tar.gz sonarqube-fd2f62993d4fae153f792ad545379612a3a2755e.zip | |
SONAR-5936 improve Elasticsearch information displayed in System Info
Diffstat (limited to 'server/sonar-web')
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/controllers/system_controller.rb | 3 | ||||
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/views/system/_monitor.html.erb | 29 |
2 files changed, 25 insertions, 7 deletions
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/system_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/system_controller.rb index aad178a17c9..929d1a6fcc9 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/system_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/system_controller.rb @@ -27,8 +27,7 @@ class SystemController < ApplicationController Java::OrgSonarServerPlatform::Platform.component(Java::OrgSonarServerPlatformMonitoring::SonarQubeMonitor.java_class), Java::OrgSonarServerPlatform::Platform.component(Java::OrgSonarServerPlatformMonitoring::DatabaseMonitor.java_class), Java::OrgSonarServerPlatform::Platform.component(Java::OrgSonarServerPlatformMonitoring::SystemMonitor.java_class), - Java::OrgSonarServerPlatform::Platform.component(Java::OrgSonarServerPlatformMonitoring::EsClusterMonitor.java_class), - Java::OrgSonarServerPlatform::Platform.component(Java::OrgSonarServerPlatformMonitoring::EsNodesMonitor.java_class), + Java::OrgSonarServerPlatform::Platform.component(Java::OrgSonarServerPlatformMonitoring::EsMonitor.java_class), Java::OrgSonarServerPlatform::Platform.component(Java::OrgSonarServerPlatformMonitoring::JvmPropertiesMonitor.java_class) ] end diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/system/_monitor.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/system/_monitor.html.erb index 3765dfa9b2c..4d2c377723e 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/system/_monitor.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/system/_monitor.html.erb @@ -5,11 +5,30 @@ </tr> </thead> <tbody> - <% monitor.attributes().entrySet().each do |attribute| %> - <tr class="<%= cycle('even','odd') -%>"> - <td width="25%" nowrap="nowrap"><%= h attribute.getKey() -%></td> - <td width="75%"><%= h attribute.getValue() -%></td> - </tr> + <% monitor.attributes().to_hash.each do |attribute_key, attribute_value| %> + + <% if attribute_value.respond_to?(:to_hash) + attribute_value.to_hash.each do |group_key, group_value| + %> + <tr class="<%= cycle('even','odd', :name => monitor.name()) -%>"> + <td width="25%" nowrap="nowrap"><%= h "#{attribute_key} - #{group_key}" -%></td> + <td width="75%"> + <table> + <% group_value.to_hash.each do |group_attr_key, group_attr_value| %> + <tr><td style="padding: 2px 10px 2px 0"><%= h group_attr_key -%></td><td><%= h group_attr_value -%></td></tr> + <% end %> + </table> + </td> + </tr> + <% end %> + + <% else %> + <tr class="<%= cycle('even','odd', :name => monitor.name()) -%>"> + <td width="25%" nowrap="nowrap"><%= h attribute_key -%></td> + <td width="75%"><%= h attribute_value -%></td> + </tr> + <% end %> + <% end %> </tbody> </table> |