Add order to JMXFetch status keys

DataDog · Sep 1, 2023 · 8ca1650 · 8ca1650
1 parent 465511c
commit 8ca1650
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/cmd/agent/gui/views/templates/generalStatus.tmpl b/cmd/agent/gui/views/templates/generalStatus.tmpl
@@ -184,7 +184,14 @@
  {{ $check -}}<br>
  {{- range $instance := $instances }}
  {{- range $k,$v := $instance }}
- {{ $k }} : {{ $v }}<br>
+ - instance_name: {{ .instance_name }}<br>
+ instance_bean_count: {{ .instance_bean_count }}<br>
+ instance_attribute_count: {{ .instance_attribute_count }}<br>
+ instance_metric_count: {{ .instance_metric_count }}<br>
+ metric_count: {{ .metric_count }}<br>
+ service_check_count: {{ .service_check_count }}<br>
+ message: {{ .message }}<br>
+ status: {{ .status }}<br>
  {{- end -}}
  {{- end -}}
  {{- end }}

diff --git a/pkg/status/templates/jmxfetch.tmpl b/pkg/status/templates/jmxfetch.tmpl
@@ -30,9 +30,14 @@ JMXFetch
  {{- range $check,$instances := .checks.initialized_checks }}
  {{ $check -}}
  {{- range $instance := $instances }}
- {{- range $k,$v := $instance }}
- {{ $k }} : {{ $v }}
- {{- end -}}
+ - instance_name: {{ .instance_name }}
+ instance_bean_count: {{ .instance_bean_count }}
+ instance_attribute_count: {{ .instance_attribute_count }}
+ instance_metric_count: {{ .instance_metric_count }}
+ metric_count: {{ .metric_count }}
+ service_check_count: {{ .service_check_count }}
+ message: {{ .message }}
+ status: {{ .status }}
  {{- end -}}
  {{- end }}
  {{- end }}