Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion spring-boot-admin-docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<goal>npm</goal>
</goals>
<configuration>
<arguments>ci --prefer-offline --no-audit</arguments>
<arguments>ci --prefer-offline --no-progress --no-audit --silent</arguments>
</configuration>
</execution>
<execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ project, which adds security.

To register your application at the server, you can either include the Spring Boot Admin Client or
use [Spring Cloud Discovery](https://spring.io/projects/spring-cloud) (e.g. Eureka, Consul, …​). There is also
an [option to use static configuration on server side](../server#spring-cloud-discovery-static-config).
an [option to use static configuration on server side](../server/01-server.md#static-configuration-using-simplediscoveryclient).

#### Using Spring Boot Admin Client

Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-docs/src/site/docs/server/01-server.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spring:

### Other DiscoveryClients

Spring Boot Admin supports all other implementations of Spring Cloud’s `DiscoveryClient` ([Eureka](https://docs.spring.io/spring-cloud-netflix/docs/current/reference/html/#service-discovery-eureka-clients/), [Zookeeper](https://docs.spring.io/spring-cloud-zookeeper/docs/current/reference/html/#spring-cloud-zookeeper-discovery), [Consul](https://docs.spring.io/spring-cloud-consul/docs/current/reference/html/#spring-cloud-consul-discovery), [Kubernetes](https://docs.spring.io/spring-cloud-kubernetes/docs/current/reference/html/#discoveryclient-for-kubernetes), …​). You need to add it to the Spring Boot Admin Server and configure it properly. An [example setup using Eureka](/docs/index#discover-clients-via-spring-cloud-discovery) is shown above.
Spring Boot Admin supports all other implementations of Spring Cloud’s `DiscoveryClient` ([Eureka](https://docs.spring.io/spring-cloud-netflix/docs/current/reference/html/#service-discovery-eureka-clients/), [Zookeeper](https://docs.spring.io/spring-cloud-zookeeper/docs/current/reference/html/#spring-cloud-zookeeper-discovery), [Consul](https://docs.spring.io/spring-cloud-consul/docs/current/reference/html/#spring-cloud-consul-discovery), [Kubernetes](https://docs.spring.io/spring-cloud-kubernetes/docs/current/reference/html/#discoveryclient-for-kubernetes), …​). An [example setup using Eureka](../installation-and-setup/index.md#using-spring-cloud-discovery) is shown above.

### Converting ServiceInstances

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spring:

### Other DiscoveryClients

Spring Boot Admin supports all other implementations of Spring Cloud’s `DiscoveryClient` ([Eureka](https://docs.spring.io/spring-cloud-netflix/docs/current/reference/html/#service-discovery-eureka-clients/), [Zookeeper](https://docs.spring.io/spring-cloud-zookeeper/docs/current/reference/html/#spring-cloud-zookeeper-discovery), [Consul](https://docs.spring.io/spring-cloud-consul/docs/current/reference/html/#spring-cloud-consul-discovery), [Kubernetes](https://docs.spring.io/spring-cloud-kubernetes/docs/current/reference/html/#discoveryclient-for-kubernetes), …​). You need to add it to the Spring Boot Admin Server and configure it properly. An [example setup using Eureka](/docs/index#discover-clients-via-spring-cloud-discovery) is shown above.
Spring Boot Admin supports all other implementations of Spring Cloud’s `DiscoveryClient` ([Eureka](https://docs.spring.io/spring-cloud-netflix/docs/current/reference/html/#service-discovery-eureka-clients/), [Zookeeper](https://docs.spring.io/spring-cloud-zookeeper/docs/current/reference/html/#spring-cloud-zookeeper-discovery), [Consul](https://docs.spring.io/spring-cloud-consul/docs/current/reference/html/#spring-cloud-consul-discovery), [Kubernetes](https://docs.spring.io/spring-cloud-kubernetes/docs/current/reference/html/#discoveryclient-for-kubernetes), …​). You need to add it to the Spring Boot Admin Server and configure it properly. An [example setup using Eureka](../installation-and-setup/index.md#using-spring-cloud-discovery) is shown above.

### Converting ServiceInstances

Expand Down
3 changes: 2 additions & 1 deletion spring-boot-admin-docs/src/site/docusaurus.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ const config: Config = {
baseUrl: process.env.VERSION ? `/${process.env.VERSION}/` : '/',
organizationName: 'codecentric',
projectName: 'spring-boot-admin',
onBrokenLinks: 'throw',
onBrokenLinks: 'warn',
onBrokenMarkdownLinks: 'warn',
onBrokenAnchors: 'warn',
i18n: {
defaultLocale: "en",
locales: ["en"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<goal>npm</goal>
</goals>
<configuration>
<arguments>ci</arguments>
<arguments>ci --prefer-offline --no-progress --no-audit --silent</arguments>
</configuration>
</execution>
<execution>
Expand Down
32 changes: 1 addition & 31 deletions spring-boot-admin-server-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@
<goal>npm</goal>
</goals>
<configuration>
<!-- needs to be installed instead of ci as of a bug in npm; https://github.com/npm/cli/issues/4828 -->
<arguments>i --no-progress --no-audit --quiet --silent</arguments>
<arguments>ci --prefer-offline --no-progress --no-audit --silent</arguments>
</configuration>
</execution>
<execution>
Expand Down Expand Up @@ -132,35 +131,6 @@
</execution>
</executions>
</plugin>
<plugin>
<!-- Delete some node_modules due to a bug in npm optionalDependencies -->
<!-- see bug in npm https://github.com/npm/cli/issues/4828 -->
<artifactId>maven-clean-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>auto-clean</id>
<phase>initialize</phase>
<goals>
<goal>clean</goal>
</goals>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>
<filesets>
<fileset>
<directory>node_modules</directory>
</fileset>
<fileset>
<directory>./</directory>
<includes>
<include>package-lock.json</include>
</includes>
</fileset>
</filesets>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
Expand Down
Loading