prometheus-snap

Merge ~gary-wzl77/prometheus-snap:bump_version_to_2.8.0 into ~canonical-is-sa/prometheus-snap:prometheus2

  1. Git
  2. lp:~gary-wzl77/prometheus-snap
  3. bump_version_to_2.8.0
  4. Merge into prometheus2
Proposed by Gary.Wang
Status: Merged
Approved by: Paul Collins
Approved revision: 48220fc2d47a22f10b099bfd5f68ef5a7bf03258
Merged at revision: ab9b1b1d56aeeac59cf75c35d8647b4ac2dc9e23
Proposed branch: ~gary-wzl77/prometheus-snap:bump_version_to_2.8.0
Merge into: ~canonical-is-sa/prometheus-snap:prometheus2
Diff against target: 44 lines (+6/-4)
1 file modified
snapcraft.yaml (+6/-4)
Reviewer Review Type Date Requested Status
Junien F Approve
Laurent Sesquès Approve
Review via email: mp+364684@code.launchpad.net

Commit message

Bumped prometheus version to 2.8.0 and go compiler to 1.12

To post a comment you must log in.
Revision history for this message
Laurent Sesquès (sajoupa) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Laurent Sesquès (sajoupa) :
review: Needs Resubmitting
Revision history for this message
Laurent Sesquès (sajoupa) :
review: Approve
Revision history for this message
Junien F (axino) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Failed to merge change (unable to merge source repository due to conflicts), setting status to needs review.

Revision history for this message
Gary.Wang (gary-wzl77) wrote :

Hmmm, any ideas why these changes introduce conflicts when the target branch is `prometheus2`
Thanks.

Revision history for this message
Gary.Wang (gary-wzl77) wrote :

Bump.

@sajoupa @axino
Any chance you guys can take a look at this MP ?
I'm not sure how the mergebot is gonna work but at least no code conflicts on LP UI.
Please let me know anything I need to change against this MP

Thanks.

Revision history for this message
Paul Collins (pjdc) wrote :

The mergebot had a couple of problems merging this branch due to a couple of bugs. I've worked around them for now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapcraft.yaml b/snapcraft.yaml
2index d47e7e5..bf7b675 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -1,10 +1,11 @@
6 name: prometheus
7-version: 2.4.2
8+version: 2.8.0
9 grade: stable
10 summary: The Prometheus monitoring system and time series database
11 description: |
12 Prometheus is a systems and service monitoring system. It collects metrics from configured targets at given intervals, evaluates rule expressions, displays the results, and can trigger alerts if some condition is observed to be true.
13 confinement: strict
14+
15 apps:
16 prometheus:
17 command: 'bin/prometheus.wrapper'
18@@ -17,14 +18,15 @@ plugs:
19 content:
20 content: promreg
21 target: $SNAP_DATA/promreg
22+
23 parts:
24 go:
25- source-tag: go1.10
26+ source-tag: go1.12
27 prometheus:
28 after: [go]
29 plugin: go
30 source: https://github.com/prometheus/prometheus.git
31- source-tag: v2.4.2
32+ source-tag: v2.8.0
33 go-importpath: github.com/prometheus/prometheus
34 build: |
35 export "GOPATH=$PWD/../go"
36@@ -37,7 +39,7 @@ parts:
37 example-config:
38 plugin: dump
39 source: https://github.com/prometheus/prometheus.git
40- source-tag: v2.4.2
41+ source-tag: v2.8.0
42 source-type: git
43 organize:
44 documentation/examples/prometheus.yml: etc/prometheus/prometheus.yml.example

Subscribers

People subscribed via source and target branches

to all changes: