Skip to content

Commit b3be5b2

Browse files
SteKoeSteKoe
committed
feat(#1510): implement grouping of services in wallboard
1 parent d2f064f commit b3be5b2

File tree

268 files changed

+20861
-14595
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+20861
-14595
lines changed

‎.github/workflows/build-feature.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,37 @@ on:
66
- master
77
- 1.*
88
- 2.*
9+
pull_request:
910

1011
jobs:
1112
build:
12-
1313
strategy:
1414
matrix:
1515
os: [ubuntu-latest]
1616

1717
runs-on: ${{ matrix.os }}
1818
steps:
1919

20+
- name: free disk space
21+
run: |
22+
df -h
23+
sudo swapoff -a
24+
sudo rm -f /swapfile
25+
sudo apt clean
26+
docker rmi $(docker image ls -aq)
27+
df -h
28+
2029
- uses: actions/checkout@v4
2130

2231
- name: Set up JDK 17
23-
uses: actions/setup-java@v3
32+
uses: actions/setup-java@v4
2433
with:
25-
distribution: 'adopt'
34+
distribution: 'temurin'
2635
java-version: '17'
2736
cache: 'maven'
2837

2938
- name: Cache node modules
30-
uses: actions/cache@v3
39+
uses: actions/cache@v4
3140
env:
3241
cache-name: cache-node-modules
3342
with:
@@ -42,6 +51,6 @@ jobs:
4251
run: |
4352
mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
4453
45-
- uses: codecov/codecov-action@v3
54+
- uses: codecov/codecov-action@v4
4655
with:
4756
files: "'*/jacoco.xml'"

‎.github/workflows/build-main.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jobs:
1919
- uses: actions/checkout@v4
2020

2121
- name: Set up JDK 17
22-
uses: actions/setup-java@v3
22+
uses: actions/setup-java@v4
2323
with:
24-
distribution: 'adopt'
24+
distribution: 'temurin'
2525
java-version: '17'
2626
cache: 'maven'
2727

2828
- name: Cache node modules
29-
uses: actions/cache@v3
29+
uses: actions/cache@v4
3030
env:
3131
cache-name: cache-node-modules
3232
with:
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
4343
44-
- uses: codecov/codecov-action@v3
44+
- uses: codecov/codecov-action@v4
4545
with:
4646
files: "'*/jacoco.xml'"
4747

@@ -53,14 +53,14 @@ jobs:
5353
- uses: actions/checkout@v4
5454

5555
- name: Set up JDK 17
56-
uses: actions/setup-java@v3
56+
uses: actions/setup-java@v4
5757
with:
58-
distribution: 'adopt'
58+
distribution: 'temurin'
5959
java-version: '17'
6060
cache: 'maven'
6161

6262
- name: Cache node modules
63-
uses: actions/cache@v3
63+
uses: actions/cache@v4
6464
env:
6565
cache-name: cache-node-modules
6666
with:
@@ -84,7 +84,7 @@ jobs:
8484
run: echo ${{ steps.project.outputs.version }}
8585

8686
- name: Deploy Asciidoc docs output to GitHub Pages
87-
uses: JamesIves/github-pages-deploy-action@v4.4.3
87+
uses: JamesIves/github-pages-deploy-action@v4.6.3
8888
with:
8989
branch: gh-pages # The branch the action should deploy to.
9090
folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.

‎.github/workflows/build-pullrequest.yml‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎.github/workflows/release-to-maven-central.yml‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,21 @@ jobs:
1919
steps:
2020
- run: echo "Will start a Maven Central upload with version ${{ github.event.inputs.releaseversion }}"
2121

22+
- name: free disk space
23+
run: |
24+
df -h
25+
sudo swapoff -a
26+
sudo rm -f /swapfile
27+
sudo apt clean
28+
docker rmi $(docker image ls -aq)
29+
df -h
30+
2231
- uses: actions/checkout@v4
2332

2433
- name: Set up settings.xml for Maven Central Repository
25-
uses: actions/setup-java@v3
34+
uses: actions/setup-java@v4
2635
with:
27-
distribution: 'adopt'
36+
distribution: 'temurin'
2837
java-version: '17'
2938
server-id: oss.sonatype.org
3039
server-username: MAVEN_USERNAME
@@ -34,7 +43,7 @@ jobs:
3443
cache: 'maven'
3544

3645
- name: Cache node modules
37-
uses: actions/cache@v3
46+
uses: actions/cache@v4
3847
env:
3948
cache-name: cache-node-modules
4049
with:
@@ -56,15 +65,15 @@ jobs:
5665
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
5766

5867
- name: Deploy Asciidoc docs output to GitHub Pages
59-
uses: JamesIves/github-pages-deploy-action@v4.4.3
68+
uses: JamesIves/github-pages-deploy-action@v4.6.3
6069
with:
6170
branch: gh-pages # The branch the action should deploy to.
6271
folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
6372
target-folder: ${{ github.event.inputs.releaseversion }}
6473
clean: true # Automatically remove deleted files from the deploy branch
6574

6675
- name: Deploy Asciidoc docs output to GitHub Pages
67-
uses: JamesIves/github-pages-deploy-action@v4.4.3
76+
uses: JamesIves/github-pages-deploy-action@v4.6.3
6877
if: github.event.inputs.copyDocsToCurrent == 'true'
6978
with:
7079
branch: gh-pages # The branch the action should deploy to.
@@ -80,9 +89,18 @@ jobs:
8089
steps:
8190
- uses: actions/checkout@v4
8291

92+
- name: free disk space
93+
run: |
94+
df -h
95+
sudo swapoff -a
96+
sudo rm -f /swapfile
97+
sudo apt clean
98+
docker rmi $(docker image ls -aq)
99+
df -h
100+
83101
- name: Generate changelog
84102
id: changelog
85-
uses: metcalfc/changelog-generator@v4.1.0
103+
uses: metcalfc/changelog-generator@v4.3.1
86104
with:
87105
myToken: ${{ secrets.GITHUB_TOKEN }}
88106

@@ -124,7 +142,7 @@ jobs:
124142
mvn versions:commit
125143
126144
- name: Commit new SNAPSHOT version
127-
uses: stefanzweifel/git-auto-commit-action@v4
145+
uses: stefanzweifel/git-auto-commit-action@v5
128146
env:
129147
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
130148
with:

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip

‎README.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ Monitoring Python applications is available using [Pyctuator](https://github.com
1212
## Compatibility Matrix
1313
In the Spring Boot Admin Server App, the Spring Boot Admin's version matches the major and minor versions of Spring Boot.
1414

15-
| Spring Boot Version | Spring Boot Admin |
16-
|---------------------|--------------------|
17-
| 2.6 | 2.6.Y |
18-
| 2.7 | 2.7.Y |
19-
| 3.0 | 3.0.Y |
15+
| Spring Boot Version | Spring Boot Admin |
16+
|---------------------|-------------------|
17+
| 2.7 | 2.7.Y |
18+
| 3.0 | 3.0.Y |
19+
| ... | ... |
20+
| 3.3 | 3.3.Y |
2021

2122
Nevertheless, it is possible to monitor any version of a Spring Boot service independently of the underlying Spring Boot version in the service.
2223
Hence, it is possible to run Spring Boot Admin Server version 2.6 and monitor a service that is running on Spring Boot 2.3 using Spring Boot Admin Client version 2.3.

0 commit comments

Comments
 (0)