Skip to content

fix(datasource-metrics): update metric name to show datasource details #4076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 7, 2025
Merged

fix(datasource-metrics): update metric name to show datasource details #4076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9341a9
fix(ui): update metric name to show datasource details
michael-wirth Feb 24, 2025
8b2e291
fix lint
andreasfritz Feb 28, 2025
f9a3080
fix: datasource panel layout
SteKoe Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 46 additions & 43 deletions spring-boot-admin-server-ui/src/main/frontend/views/instances/details/details-datasource.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,41 +21,46 @@
$t('instances.details.datasource.title', { dataSource: dataSource })
"
>
<div>
<sba-alert v-if="error" :error="error" :title="$t('term.fetch_failed')" />
<sba-alert v-if="error" :error="error" :title="$t('term.fetch_failed')" />

<div v-if="current" class="level datasource-current">
<div class="level-item has-text-centered">
<div>
<p
class="heading has-bullet has-bullet-info"
v-text="$t('instances.details.datasource.active_connections')"
/>
<p v-text="current.active" />
</div>
</div>
<div class="level-item has-text-centered">
<div>
<p
class="heading"
v-text="$t('instances.details.datasource.min_connections')"
/>
<p v-text="current.min" />
</div>
</div>
<div class="level-item has-text-centered">
<div>
<p
class="heading"
v-text="$t('instances.details.datasource.max_connections')"
/>
<p v-if="current.max >= 0" v-text="current.max" />
<p v-else v-text="$t('instances.details.datasource.unlimited')" />
</div>
</div>
</div>
<datasource-chart v-if="chartData.length > 0" :data="chartData" />
</div>
<dl
v-if="current"
class="px-4 py-3 sm:grid sm:grid-cols-6 sm:gap-4 sm:px-6"
>
<dt
class="text-sm font-medium text-gray-500 sm:col-span-4"
v-text="$t('instances.details.datasource.active_connections')"
/>
<dd
class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2"
v-text="current.active"
/>

<dt
class="text-sm font-medium text-gray-500 sm:col-span-4"
v-text="$t('instances.details.datasource.min_connections')"
/>
<dd
class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2"
v-text="current.min"
/>

<dt
class="text-sm font-medium text-gray-500 sm:col-span-4"
v-text="$t('instances.details.datasource.max_connections')"
/>
<dd
class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2"
v-if="current.max >= 0"
v-text="current.max"
/>
<dd
class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2"
v-else
v-text="$t('instances.details.datasource.unlimited')"
/>
</dl>
<datasource-chart v-if="chartData.length > 0" :data="chartData" />
</sba-panel>
</template>

Expand Down Expand Up @@ -91,17 +96,15 @@ export default {
methods: {
async fetchMetrics() {
const responseActive = this.instance.fetchMetric(
'data.source.active.connections',
{ name: this.dataSource },
);
const responseMin = this.instance.fetchMetric(
'data.source.min.connections',
{ name: this.dataSource },
);
const responseMax = this.instance.fetchMetric(
'data.source.max.connections',
'jdbc.connections.active',
{ name: this.dataSource },
);
const responseMin = this.instance.fetchMetric('jdbc.connections.min', {
name: this.dataSource,
});
const responseMax = this.instance.fetchMetric('jdbc.connections.max', {
name: this.dataSource,
});

return {
active: (await responseActive).data.measurements[0].value,
Expand Down
2 changes: 1 addition & 1 deletion ...ng-boot-admin-server-ui/src/main/frontend/views/instances/details/details-datasources.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default {
methods: {
async fetchDataSources() {
const response = await this.instance.fetchMetric(
'data.source.active.connections',
'jdbc.connections.active',
);
return response.data.availableTags.filter((tag) => tag.tag === 'name')[0]
.values;
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-server-ui/src/main/frontend/views/instances/details/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default {
return this.hasMetric('cache.gets');
},
hasDatasources() {
return this.hasMetric('data.source.active.connections');
return this.hasMetric('jdbc.connections.active');
},
hasGc() {
return this.hasMetric('jvm.gc.pause');
Expand Down
Loading