diff --git a/README.md b/README.md index 8f2eba9..f21fbe0 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,6 @@ #### Docker Env -* Build the `io.micrometer.publishing/prometheus-rsocket-proxy:0.8.0-snapshot` image locally from the `prometheus-rsocket-proxy` project: - -``` -./gradlew build docker -``` - * Build the `springcloud/spring-cloud-dataflow-prometheus-local:rsocket` image locally. Change directory to `src/main/resources/docker-compose/prometheus-local` and run: @@ -23,3 +17,7 @@ Change directory to `src/main/resources/docker-compose/` and run: ``` docker-compose -f ./docker-compose-rsocket.yml up ``` + +* Run the Demo application + +Run the Java main for `PrometheusRsocketDemoApplication` in the IDE or with `java -jar target/prometheus-rsocket-demo-0.0.1-SNAPSHOT` on the built project from the project root directory. diff --git a/pom.xml b/pom.xml index 5cf3a8c..47e72dd 100644 --- a/pom.xml +++ b/pom.xml @@ -16,26 +16,23 @@ 1.8 - 0.8.0-SNAPSHOT - 1.1.5 - io.micrometer.publishing + io.micrometer.prometheus prometheus-rsocket-spring ${prometheus-rsocket-spring.version} - io.micrometer.publishing + io.micrometer.prometheus prometheus-rsocket-client ${prometheus-rsocket-spring.version} io.micrometer micrometer-registry-prometheus - ${micrometer.version} org.springframework.boot @@ -72,7 +69,7 @@ spring-snapshots Spring Snapshots - https://repo.spring.io/libs-snapshot-local + https://repo.spring.io/snapshot true @@ -80,7 +77,7 @@ spring-milestones Spring Milestones - https://repo.spring.io/libs-milestone-local + https://repo.spring.io/milestone false diff --git a/src/main/resources/docker-compose/docker-compose-rsocket.yml b/src/main/resources/docker-compose/docker-compose-rsocket.yml index 1dbd5da..c402d49 100644 --- a/src/main/resources/docker-compose/docker-compose-rsocket.yml +++ b/src/main/resources/docker-compose/docker-compose-rsocket.yml @@ -6,18 +6,18 @@ services: # image: springcloud/spring-cloud-dataflow-grafana-prometheus:${DATAFLOW_VERSION} # container_name: grafana # ports: - - '3000:3000' +# - '3000:3000' prometheus: image: springcloud/spring-cloud-dataflow-prometheus-local:rsocket container_name: prometheus - volumes: - - 'scdf-targets:/etc/prometheus/' +# volumes: +# - 'scdf-targets:/etc/prometheus/' ports: - '9090:9090' prometheus-rsocket-proxy: - image: io.micrometer.publishing/prometheus-rsocket-proxy:0.8.0-snapshot + image: micrometermetrics/prometheus-rsocket-proxy:0.8.0-SNAPSHOT container_name: prometheus-rsocket-proxy expose: - '9096' @@ -30,5 +30,5 @@ services: environment: - server.port=9096 -volumes: - scdf-targets: +#volumes: +# scdf-targets: