Skip to content

Commit fe0a5cc

Browse files
committed
Prometheus 2.0 support
Starting from this release, DFM is using Prometheus 2.x. Existing users need to migrate their data or choose to start over. Please visit the [migration](http://monitor.dockerflow.com/config/) section of the documentation for more info. Big thanks to @thomasjpfan for this PR.[release]
1 parent 7dcb90e commit fe0a5cc

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

Jenkinsfile

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,15 @@ pipeline {
2424
branch "master"
2525
}
2626
steps {
27-
withCredentials([usernamePassword(
28-
credentialsId: "docker",
29-
usernameVariable: "USER",
30-
passwordVariable: "PASS"
31-
)]) {
32-
sh "docker login -u $USER -p $PASS"
33-
}
34-
sh "docker tag vfarcic/docker-flow-monitor vfarcic/docker-flow-monitor:${currentBuild.displayName}"
27+
dockerLogin()
28+
sh "docker tag vfarcic/docker-flow-monitor vfarcic/docker-flow-monitor:2-${currentBuild.displayName}"
3529
sh "docker image push vfarcic/docker-flow-monitor:latest"
36-
sh "docker image push vfarcic/docker-flow-monitor:${currentBuild.displayName}"
37-
sh "docker tag vfarcic/docker-flow-monitor-docs vfarcic/docker-flow-monitor-docs:${currentBuild.displayName}"
30+
sh "docker image push vfarcic/docker-flow-monitor:2-${currentBuild.displayName}"
31+
sh "docker tag vfarcic/docker-flow-monitor-docs vfarcic/docker-flow-monitor-docs:2-${currentBuild.displayName}"
3832
sh "docker image push vfarcic/docker-flow-monitor-docs:latest"
39-
sh "docker image push vfarcic/docker-flow-monitor-docs:${currentBuild.displayName}"
33+
sh "docker image push vfarcic/docker-flow-monitor-docs:2-${currentBuild.displayName}"
34+
dockerLogout()
35+
dfReleaseGithub("docker-flow-monitor")
4036
}
4137
}
4238
stage("deploy") {
@@ -47,8 +43,8 @@ pipeline {
4743
label "prod"
4844
}
4945
steps {
50-
sh "docker service update --image vfarcic/docker-flow-monitor:${currentBuild.displayName} monitor_monitor"
51-
sh "docker service update --image vfarcic/docker-flow-monitor-docs:${currentBuild.displayName} monitor_docs"
46+
sh "docker service update --image vfarcic/docker-flow-monitor:2-${currentBuild.displayName} monitor_monitor"
47+
sh "docker service update --image vfarcic/docker-flow-monitor-docs:2-${currentBuild.displayName} monitor_docs"
5248
}
5349
}
5450
}

stacks/docker-flow-monitor-tutorial.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3"
33
services:
44

55
monitor:
6-
image: vfarcic/docker-flow-monitor
6+
image: vfarcic/docker-flow-monitor:${TAG:-latest}
77
environment:
88
- LISTENER_ADDRESS=swarm-listener
99
- GLOBAL_SCRAPE_INTERVAL=10s

0 commit comments

Comments
 (0)