Update grafana/prometheus scripts to latest docker tags, move Spring …

…integration sample to its own sample project

samples/micrometer-samples-boot2/build.gradle

@@ -4,12 +4,7 @@ plugins {
 
 dependencyManagement {
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:2.2.0.RELEASE'
-    }
-    dependencies {
-        // not necessary in real Boot 1.5.x apps because reactor is shaded inside the
-        // published version of micrometer-registry-statsd
-        dependency 'io.projectreactor:reactor-core:3.2.2.RELEASE'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:2.2.6.RELEASE'
     }
 }
 
@@ -23,8 +18,6 @@ dependencies {
     implementation('org.springframework.boot:spring-boot-starter-actuator') {
         exclude group: 'io.micrometer', module: 'micrometer-core'
     }
-    implementation 'org.springframework.integration:spring-integration-ws'
-    implementation 'org.springframework.integration:spring-integration-xml'
 
     // For running on Java 9+
     runtimeOnly 'javax.xml.soap:javax.xml.soap-api:1.4.0'

samples/micrometer-samples-spring-integration/build.gradle

@@ -0,0 +1,25 @@
+plugins {
+    id "io.spring.dependency-management" version "1.0.3.RELEASE"
+}
+
+dependencyManagement {
+    imports {
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:2.2.6.RELEASE'
+    }
+}
+
+dependencies {
+    implementation project(":micrometer-core")
+    implementation project(":micrometer-registry-prometheus")
+
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation('org.springframework.boot:spring-boot-starter-actuator') {
+        exclude group: 'io.micrometer', module: 'micrometer-core'
+    }
+    implementation 'org.springframework.integration:spring-integration-ws'
+    implementation 'org.springframework.integration:spring-integration-xml'
+
+    // For running on Java 9+
+    runtimeOnly 'javax.xml.soap:javax.xml.soap-api:1.4.0'
+    runtimeOnly 'com.sun.xml.messaging.saaj:saaj-impl:1.5.1'
+}

samples/micrometer-samples-boot2/src/main/java/io/micrometer/boot2/samples/integration/SpringIntegrationApplication.java → samples/micrometer-samples-spring-integration/src/main/java/io/micrometer/spring/integration/samples/SpringIntegrationApplication.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.micrometer.boot2.samples.integration;
+package io.micrometer.spring.integration.samples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

scripts/grafana-datasource.yml

@@ -0,0 +1,8 @@
+apiVersion: 1
+
+datasources:
+- name: prometheus
+  type: prometheus
+  access: direct
+  url: http://10.200.10.1:9090
+  isDefault: true

scripts/grafana.sh

@@ -1,2 +1,4 @@
-#!/usr/bin/env bash
-docker run -i -p 3001:3000 grafana/grafana:5.1.0
+#!/bin/sh
+docker run -i -p 3000:3000 \
+-v $(pwd)/grafana-datasource.yml:/etc/grafana/provisioning/datasources/grafana-datasource.yml \
+grafana/grafana:6.7.2

scripts/prometheus.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 docker run -p 9090:9090 \
 -v $(pwd)/prometheus.yml:/etc/prometheus/prometheus.yml \
--v $(pwd)/prometheus_rules.yml:/etc/prometheus/prometheus_rules.yml \
-prom/prometheus:v2.2.0
+prom/prometheus:v2.17.1

scripts/prometheus.yml

@@ -7,25 +7,11 @@ scrape_configs:
     static_configs:
       - targets: ['localhost:9090']
 
-  - job_name: 'pushgateway'
-
-    scrape_interval: 10s
-    metrics_path: '/metrics'
-    honor_labels: true
-    static_configs:
-      - targets: ['10.200.10.1:9091']
-
-  - job_name: 'spring-boot1'
-
-    metrics_path: '/prometheus'
-    static_configs:
-      - targets: ['10.200.10.1:8080']
-
   - job_name: 'spring-boot2'
 
     metrics_path: '/actuator/prometheus'
     static_configs:
       - targets: ['10.200.10.1:8080']
 
 rule_files:
-  - prometheus_rules.yml
+  - prometheus_rules.yml

settings.gradle

@@ -3,7 +3,7 @@ rootProject.name = 'micrometer'
 include 'micrometer-core'
 include 'micrometer-jersey2'
 
-['core', 'boot2'].each { sample ->
+['core', 'boot2', 'spring-integration'].each { sample ->
     include "micrometer-samples-$sample"
     project(":micrometer-samples-$sample").projectDir = new File(rootProject.projectDir, "samples/micrometer-samples-$sample")
 }