Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-boot-admin
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-boot-admin
Commits
f751359c
Commit
f751359c
authored
Jun 08, 2018
by
Johannes Edmeier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show warning for non-supported boot 1.x in metrics
parent
ccd0ca98
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
8 deletions
+27
-8
index.vue
...i/src/main/frontend/views/instances/auditevents/index.vue
+11
-1
index.vue
...er-ui/src/main/frontend/views/instances/metrics/index.vue
+16
-7
No files found.
spring-boot-admin-server-ui/src/main/frontend/views/instances/auditevents/index.vue
View file @
f751359c
...
...
@@ -26,6 +26,11 @@
<p
v-text=
"error.message"
/>
</div>
</div>
<div
v-if=
"isOldAuditevents"
class=
"message is-warning"
>
<div
class=
"message-body"
>
<p>
Audit Log is not supported for Spring Boot 1.x applications.
</p>
</div>
</div>
<auditevents-list
v-if=
"events"
:instance=
"instance"
:events=
"events"
/>
</div>
</section>
...
...
@@ -79,6 +84,7 @@
hasLoaded
:
false
,
error
:
null
,
events
:
null
,
isOldAuditevents
:
false
}),
methods
:
{
async
fetchAuditevents
()
{
...
...
@@ -104,7 +110,11 @@
error
:
error
=>
{
vm
.
hasLoaded
=
true
;
console
.
warn
(
'Fetching audit events failed:'
,
error
);
vm
.
error
=
error
;
if
(
error
.
response
.
headers
[
'content-type'
].
includes
(
'application/vnd.spring-boot.actuator.v2'
))
{
vm
.
error
=
error
;
}
else
{
vm
.
isOldAuditevents
=
true
;
}
}
});
},
...
...
spring-boot-admin-server-ui/src/main/frontend/views/instances/metrics/index.vue
View file @
f751359c
...
...
@@ -26,9 +26,13 @@
<p
v-text=
"error.message"
/>
</div>
</div>
<form
@
submit
.
prevent=
"handleSubmit"
class=
"field"
>
<div
class=
"field"
v-if=
"availableMetrics.length > 0"
>
<div
v-if=
"isOldMetrics"
class=
"message is-warning"
>
<div
class=
"message-body"
>
<p>
Metrics are not supported for Spring Boot 1.x applications.
</p>
</div>
</div>
<form
@
submit
.
prevent=
"handleSubmit"
class=
"field"
v-else-if=
"availableMetrics.length > 0"
>
<div
class=
"field"
>
<div
class=
"control"
>
<div
class=
"select"
>
<select
v-model=
"selectedMetric"
>
...
...
@@ -116,7 +120,8 @@
selectedMetric
:
null
,
stateFetchingTags
:
null
,
availableTags
:
null
,
selectedTags
:
null
selectedTags
:
null
,
isOldMetrics
:
false
}),
created
()
{
this
.
fetchMetricIndex
();
...
...
@@ -179,9 +184,13 @@
this
.
error
=
null
;
try
{
const
res
=
await
this
.
instance
.
fetchMetrics
();
this
.
availableMetrics
=
res
.
data
.
names
;
this
.
availableMetrics
.
sort
();
this
.
selectedMetric
=
this
.
availableMetrics
[
0
];
if
(
res
.
headers
[
'content-type'
].
includes
(
'application/vnd.spring-boot.actuator.v2'
))
{
this
.
availableMetrics
=
res
.
data
.
names
;
this
.
availableMetrics
.
sort
();
this
.
selectedMetric
=
this
.
availableMetrics
[
0
];
}
else
{
this
.
isOldMetrics
=
true
;
}
}
catch
(
error
)
{
console
.
warn
(
'Fetching metric index failed:'
,
error
);
this
.
hasLoaded
=
true
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment