Skip to content

Commit

Permalink
feat(#1510): implement grouping of services in wallboard
Browse files Browse the repository at this point in the history
  • Loading branch information
SteKoe committed Aug 16, 2024
1 parent d2f064f commit b3be5b2
Show file tree
Hide file tree
Showing 268 changed files with 20,861 additions and 14,595 deletions.
19 changes: 14 additions & 5 deletions .github/workflows/build-feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,37 @@ on:
- master
- 1.*
- 2.*
pull_request:

jobs:
build:

strategy:
matrix:
os: [ubuntu-latest]

runs-on: ${{ matrix.os }}
steps:

- name: free disk space
run: |
df -h
sudo swapoff -a
sudo rm -f /swapfile
sudo apt clean
docker rmi $(docker image ls -aq)
df -h
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '17'
cache: 'maven'

- name: Cache node modules
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand All @@ -42,6 +51,6 @@ jobs:
run: |
mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
files: "'*/jacoco.xml'"
16 changes: 8 additions & 8 deletions .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ jobs:
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '17'
cache: 'maven'

- name: Cache node modules
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand All @@ -41,7 +41,7 @@ jobs:
run: |
mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
files: "'*/jacoco.xml'"

Expand All @@ -53,14 +53,14 @@ jobs:
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '17'
cache: 'maven'

- name: Cache node modules
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand All @@ -84,7 +84,7 @@ jobs:
run: echo ${{ steps.project.outputs.version }}

- name: Deploy Asciidoc docs output to GitHub Pages
uses: JamesIves/github-pages-deploy-action@v4.4.3
uses: JamesIves/github-pages-deploy-action@v4.6.3
with:
branch: gh-pages # The branch the action should deploy to.
folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/build-pullrequest.yml

This file was deleted.

32 changes: 25 additions & 7 deletions .github/workflows/release-to-maven-central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,21 @@ jobs:
steps:
- run: echo "Will start a Maven Central upload with version ${{ github.event.inputs.releaseversion }}"

- name: free disk space
run: |
df -h
sudo swapoff -a
sudo rm -f /swapfile
sudo apt clean
docker rmi $(docker image ls -aq)
df -h
- uses: actions/checkout@v4

- name: Set up settings.xml for Maven Central Repository
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '17'
server-id: oss.sonatype.org
server-username: MAVEN_USERNAME
Expand All @@ -34,7 +43,7 @@ jobs:
cache: 'maven'

- name: Cache node modules
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand All @@ -56,15 +65,15 @@ jobs:
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

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

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

- name: free disk space
run: |
df -h
sudo swapoff -a
sudo rm -f /swapfile
sudo apt clean
docker rmi $(docker image ls -aq)
df -h
- name: Generate changelog
id: changelog
uses: metcalfc/changelog-generator@v4.1.0
uses: metcalfc/changelog-generator@v4.3.1
with:
myToken: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -124,7 +142,7 @@ jobs:
mvn versions:commit
- name: Commit new SNAPSHOT version
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
3 changes: 1 addition & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ Monitoring Python applications is available using [Pyctuator](https://github.com
## Compatibility Matrix
In the Spring Boot Admin Server App, the Spring Boot Admin's version matches the major and minor versions of Spring Boot.

| Spring Boot Version | Spring Boot Admin |
|---------------------|--------------------|
| 2.6 | 2.6.Y |
| 2.7 | 2.7.Y |
| 3.0 | 3.0.Y |
| Spring Boot Version | Spring Boot Admin |
|---------------------|-------------------|
| 2.7 | 2.7.Y |
| 3.0 | 3.0.Y |
| ... | ... |
| 3.3 | 3.3.Y |

Nevertheless, it is possible to monitor any version of a Spring Boot service independently of the underlying Spring Boot version in the service.
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.
Expand Down
Loading

0 comments on commit b3be5b2

Please sign in to comment.