Hello community,
here is the log from the commit of package prometheus-ha_cluster_exporter for
openSUSE:Factory checked in at 2020-03-12 23:07:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/prometheus-ha_cluster_exporter (Old)
and /work/SRC/openSUSE:Factory/.prometheus-ha_cluster_exporter.new.3160
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prometheus-ha_cluster_exporter"
Thu Mar 12 23:07:54 2020 rev:3 rq:784301 version:1.0.0beta8
Changes:
--------
---
/work/SRC/openSUSE:Factory/prometheus-ha_cluster_exporter/prometheus-ha_cluster_exporter.changes
2020-03-01 21:28:10.076575238 +0100
+++
/work/SRC/openSUSE:Factory/.prometheus-ha_cluster_exporter.new.3160/prometheus-ha_cluster_exporter.changes
2020-03-12 23:12:31.223328995 +0100
@@ -1,0 +2,13 @@
+Thu Mar 12 11:45:23 2020 UTC - [email protected]
+
+- Release 1.0.0beta8
+
+ ## Changed
+ - Reduced log verbosity of collect cycles to `DEBUG` level. (#137)
+ - Moved OBS related files to `packaging/obs`. (#139)
+
+ ## Fixed
+ - Pacemaker CIB parsing errors with some time values. (#138)
+ - Regression in CI changelog generator. (#136)
+
+-------------------------------------------------------------------
Old:
----
prometheus-ha_cluster_exporter-1.0.0beta7.tar.gz
New:
----
prometheus-ha_cluster_exporter-1.0.0beta8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ prometheus-ha_cluster_exporter.spec ++++++
--- /var/tmp/diff_new_pack.Fbw2ac/_old 2020-03-12 23:12:31.839329239 +0100
+++ /var/tmp/diff_new_pack.Fbw2ac/_new 2020-03-12 23:12:31.839329239 +0100
@@ -18,7 +18,7 @@
Name: prometheus-ha_cluster_exporter
# Version will be processed via set_version source service
-Version: 1.0.0beta7
+Version: 1.0.0beta8
Release: 0
Summary: Prometheus exporter for Pacemaker HA clusters metrics
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Fbw2ac/_old 2020-03-12 23:12:31.863329248 +0100
+++ /var/tmp/diff_new_pack.Fbw2ac/_new 2020-03-12 23:12:31.863329248 +0100
@@ -2,13 +2,13 @@
<service name="tar_scm" mode="disabled">
<param
name="url">git://github.com/ClusterLabs/ha_cluster_exporter.git</param>
<param name="scm">git</param>
- <param name="revision">1.0.0beta7</param>
+ <param name="revision">1.0.0beta8</param>
<param name="exclude">.git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="filename">prometheus-ha_cluster_exporter</param>
</service>
<service name="set_version" mode="disabled">
- <param name="version">1.0.0beta7</param>
+ <param name="version">1.0.0beta8</param>
<param name="file">prometheus-ha_cluster_exporter.spec</param>
</service>
<service name="recompress" mode="disabled">
++++++ prometheus-ha_cluster_exporter-1.0.0beta7.tar.gz ->
prometheus-ha_cluster_exporter-1.0.0beta8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/.ci/gh_release_to_obs_changeset.py
new/prometheus-ha_cluster_exporter-1.0.0beta8/.ci/gh_release_to_obs_changeset.py
---
old/prometheus-ha_cluster_exporter-1.0.0beta7/.ci/gh_release_to_obs_changeset.py
2020-02-28 15:13:37.000000000 +0100
+++
new/prometheus-ha_cluster_exporter-1.0.0beta8/.ci/gh_release_to_obs_changeset.py
2020-03-12 11:53:02.000000000 +0100
@@ -55,8 +55,11 @@
temp.seek(0)
if args.file:
- with open(args.file, "a+") as prev:
- old = prev.read()
+ try:
+ with open(args.file, "r") as prev:
+ old = prev.read()
+ except FileNotFoundError:
+ old = ""
with open(args.file, "w") as new:
for line in temp:
new.write(line)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/.ci/obs/_service
new/prometheus-ha_cluster_exporter-1.0.0beta8/.ci/obs/_service
--- old/prometheus-ha_cluster_exporter-1.0.0beta7/.ci/obs/_service
2020-02-28 15:13:37.000000000 +0100
+++ new/prometheus-ha_cluster_exporter-1.0.0beta8/.ci/obs/_service
1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-<services>
- <service name="tar_scm" mode="disabled">
- <param
name="url">git://github.com/ClusterLabs/ha_cluster_exporter.git</param>
- <param name="scm">git</param>
- <param name="revision">%%VERSION%%</param>
- <param name="exclude">.git</param>
- <param name="versionformat">@PARENT_TAG@</param>
- <param name="filename">prometheus-ha_cluster_exporter</param>
- </service>
- <service name="set_version" mode="disabled">
- <param name="version">%%VERSION%%</param>
- <param name="file">prometheus-ha_cluster_exporter.spec</param>
- </service>
- <service name="recompress" mode="disabled">
- <param name="file">*.tar</param>
- <param name="compression">gz</param>
- </service>
- <service name="go_modules" mode="disabled" />
-</services>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/.ci/obs/prometheus-ha_cluster_exporter.spec
new/prometheus-ha_cluster_exporter-1.0.0beta8/.ci/obs/prometheus-ha_cluster_exporter.spec
---
old/prometheus-ha_cluster_exporter-1.0.0beta7/.ci/obs/prometheus-ha_cluster_exporter.spec
2020-02-28 15:13:37.000000000 +0100
+++
new/prometheus-ha_cluster_exporter-1.0.0beta8/.ci/obs/prometheus-ha_cluster_exporter.spec
1970-01-01 01:00:00.000000000 +0100
@@ -1,92 +0,0 @@
-#
-# Copyright 2019-2020 SUSE LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-Name: prometheus-ha_cluster_exporter
-# Version will be processed via set_version source service
-Version: 0
-Release: 0
-License: Apache-2.0
-Summary: Prometheus exporter for Pacemaker HA clusters metrics
-Group: System/Monitoring
-Url: https://github.com/ClusterLabs/ha_cluster_exporter
-Source: %{name}-%{version}.tar.gz
-Source1: vendor.tar.gz
-ExclusiveArch: aarch64 x86_64 ppc64le s390x
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: go >= 1.11
-Provides: ha_cluster_exporter = %{version}-%{release}
-Provides: prometheus(ha_cluster_exporter) = %{version}-%{release}
-# Unlike C/C++ packages, Golang packages do not have header files. They are
statically built so the main package is also the devel package.
-Provides: %{name}-devel = %{version}
-Provides: %{name}-devel-static = %{version}
-
-# Make sure that the binary is not getting stripped.
-%undefine _build_create_debug
-%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
-
-%description
-Prometheus exporter for Pacemaker HA clusters metrics
-
-%prep
-%setup -q # unpack project sources
-%setup -q -T -D -a 1 # unpack go dependencies in vendor.tar.gz, which was
prepared by the source services
-
-%define shortname ha_cluster_exporter
-
-%build
-
-export CGO_ENABLED=0
-go build -mod=vendor \
- -ldflags="-s -w -X main.version=%{version}" \
- -o %{shortname}
-
-%install
-
-# Install the binary.
-install -D -m 0755 %{shortname} "%{buildroot}%{_bindir}/%{shortname}"
-
-# Install the systemd unit
-install -D -m 0644 %{shortname}.service %{buildroot}%{_unitdir}/%{name}.service
-
-# Install compat wrapper for legacy init systems
-install -Dd -m 0755 %{buildroot}%{_sbindir}
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
-
-%pre
-%service_add_pre %{name}.service
-
-%post
-%service_add_post %{name}.service
-
-%preun
-%service_del_preun %{name}.service
-
-%postun
-%service_del_postun %{name}.service
-
-%files
-%defattr(-,root,root)
-%doc *.md
-%doc doc/*
-%if 0%{?suse_version} >= 1500
-%license LICENSE
-%else
-%doc LICENSE
-%endif
-%{_bindir}/%{shortname}
-%{_unitdir}/%{name}.service
-%{_sbindir}/rc%{name}
-
-%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/prometheus-ha_cluster_exporter-1.0.0beta7/Makefile
new/prometheus-ha_cluster_exporter-1.0.0beta8/Makefile
--- old/prometheus-ha_cluster_exporter-1.0.0beta7/Makefile 2020-02-28
15:13:37.000000000 +0100
+++ new/prometheus-ha_cluster_exporter-1.0.0beta8/Makefile 2020-03-12
11:53:02.000000000 +0100
@@ -66,7 +66,7 @@
build/obs:
osc checkout $(OBS_PROJECT)/$(OBS_PACKAGE) -o build/obs
rm -f build/obs/*.tar.gz
- cp -rv .ci/obs/* build/obs/
+ cp -rv packaging/obs/* build/obs/
sed -i 's/%%VERSION%%/$(VERSION)/' build/obs/_service
cd build/obs; osc service runall
.ci/gh_release_to_obs_changeset.py $(REPOSITORY) -a $(AUTHOR) -t
$(VERSION) -f build/obs/$(OBS_PACKAGE).changes || true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/collector/corosync/corosync.go
new/prometheus-ha_cluster_exporter-1.0.0beta8/collector/corosync/corosync.go
---
old/prometheus-ha_cluster_exporter-1.0.0beta7/collector/corosync/corosync.go
2020-02-28 15:13:37.000000000 +0100
+++
new/prometheus-ha_cluster_exporter-1.0.0beta8/collector/corosync/corosync.go
2020-03-12 11:53:02.000000000 +0100
@@ -39,7 +39,7 @@
}
func (c *corosyncCollector) Collect(ch chan<- prometheus.Metric) {
- log.Infoln("Collecting corosync metrics...")
+ log.Debugln("Collecting corosync metrics...")
err := c.collectRingErrorsTotal(ch)
if err != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/collector/drbd/drbd.go
new/prometheus-ha_cluster_exporter-1.0.0beta8/collector/drbd/drbd.go
--- old/prometheus-ha_cluster_exporter-1.0.0beta7/collector/drbd/drbd.go
2020-02-28 15:13:37.000000000 +0100
+++ new/prometheus-ha_cluster_exporter-1.0.0beta8/collector/drbd/drbd.go
2020-03-12 11:53:02.000000000 +0100
@@ -83,7 +83,7 @@
}
func (c *drbdCollector) Collect(ch chan<- prometheus.Metric) {
- log.Infoln("Collecting DRBD metrics...")
+ log.Debugln("Collecting DRBD metrics...")
c.recordDrbdSplitBrainMetric(ch)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/collector/pacemaker/cib/data.go
new/prometheus-ha_cluster_exporter-1.0.0beta8/collector/pacemaker/cib/data.go
---
old/prometheus-ha_cluster_exporter-1.0.0beta7/collector/pacemaker/cib/data.go
2020-02-28 15:13:37.000000000 +0100
+++
new/prometheus-ha_cluster_exporter-1.0.0beta8/collector/pacemaker/cib/data.go
2020-03-12 11:53:02.000000000 +0100
@@ -46,11 +46,12 @@
InstanceAttributes []Attribute `xml:"instance_attributes>nvpair"`
MetaAttributes []Attribute `xml:"meta_attributes>nvpair"`
Operations []struct {
- Id string `xml:"id,attr"`
- Name string `xml:"name,attr"`
- Role string `xml:"role,attr"`
- Interval int `xml:"interval,attr"`
- Timeout int `xml:"timeout,attr"`
+ Id string `xml:"id,attr"`
+ Name string `xml:"name,attr"`
+ Role string `xml:"role,attr"`
+ // todo: interval and timeout are time based vars. We should in
future parse them correctly insteaf of string
+ Interval string `xml:"interval,attr"`
+ Timeout string `xml:"timeout,attr"`
} `xml:"operations>op"`
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/collector/pacemaker/cib/parser_test.go
new/prometheus-ha_cluster_exporter-1.0.0beta8/collector/pacemaker/cib/parser_test.go
---
old/prometheus-ha_cluster_exporter-1.0.0beta7/collector/pacemaker/cib/parser_test.go
2020-02-28 15:13:37.000000000 +0100
+++
new/prometheus-ha_cluster_exporter-1.0.0beta8/collector/pacemaker/cib/parser_test.go
2020-03-12 11:53:02.000000000 +0100
@@ -34,26 +34,26 @@
assert.Equal(t, 5,
len(data.Configuration.Resources.Masters[0].Primitive.Operations))
assert.Equal(t, "rsc_SAPHana_PRD_HDB00-start-0",
data.Configuration.Resources.Masters[0].Primitive.Operations[0].Id)
assert.Equal(t, "start",
data.Configuration.Resources.Masters[0].Primitive.Operations[0].Name)
- assert.Equal(t, 0,
data.Configuration.Resources.Masters[0].Primitive.Operations[0].Interval)
- assert.Equal(t, 3600,
data.Configuration.Resources.Masters[0].Primitive.Operations[0].Timeout)
+ assert.Equal(t, "0",
data.Configuration.Resources.Masters[0].Primitive.Operations[0].Interval)
+ assert.Equal(t, "3600",
data.Configuration.Resources.Masters[0].Primitive.Operations[0].Timeout)
assert.Equal(t, "rsc_SAPHana_PRD_HDB00-stop-0",
data.Configuration.Resources.Masters[0].Primitive.Operations[1].Id)
assert.Equal(t, "stop",
data.Configuration.Resources.Masters[0].Primitive.Operations[1].Name)
- assert.Equal(t, 0,
data.Configuration.Resources.Masters[0].Primitive.Operations[1].Interval)
- assert.Equal(t, 3600,
data.Configuration.Resources.Masters[0].Primitive.Operations[1].Timeout)
+ assert.Equal(t, "0",
data.Configuration.Resources.Masters[0].Primitive.Operations[1].Interval)
+ assert.Equal(t, "3600",
data.Configuration.Resources.Masters[0].Primitive.Operations[1].Timeout)
assert.Equal(t, "rsc_SAPHana_PRD_HDB00-promote-0",
data.Configuration.Resources.Masters[0].Primitive.Operations[2].Id)
assert.Equal(t, "promote",
data.Configuration.Resources.Masters[0].Primitive.Operations[2].Name)
- assert.Equal(t, 0,
data.Configuration.Resources.Masters[0].Primitive.Operations[2].Interval)
- assert.Equal(t, 3600,
data.Configuration.Resources.Masters[0].Primitive.Operations[2].Timeout)
+ assert.Equal(t, "0",
data.Configuration.Resources.Masters[0].Primitive.Operations[2].Interval)
+ assert.Equal(t, "3600",
data.Configuration.Resources.Masters[0].Primitive.Operations[2].Timeout)
assert.Equal(t, "rsc_SAPHana_PRD_HDB00-monitor-60",
data.Configuration.Resources.Masters[0].Primitive.Operations[3].Id)
assert.Equal(t, "monitor",
data.Configuration.Resources.Masters[0].Primitive.Operations[3].Name)
assert.Equal(t, "Master",
data.Configuration.Resources.Masters[0].Primitive.Operations[3].Role)
- assert.Equal(t, 60,
data.Configuration.Resources.Masters[0].Primitive.Operations[3].Interval)
- assert.Equal(t, 700,
data.Configuration.Resources.Masters[0].Primitive.Operations[3].Timeout)
+ assert.Equal(t, "60",
data.Configuration.Resources.Masters[0].Primitive.Operations[3].Interval)
+ assert.Equal(t, "700",
data.Configuration.Resources.Masters[0].Primitive.Operations[3].Timeout)
assert.Equal(t, "rsc_SAPHana_PRD_HDB00-monitor-61",
data.Configuration.Resources.Masters[0].Primitive.Operations[4].Id)
assert.Equal(t, "monitor",
data.Configuration.Resources.Masters[0].Primitive.Operations[4].Name)
assert.Equal(t, "Slave",
data.Configuration.Resources.Masters[0].Primitive.Operations[4].Role)
- assert.Equal(t, 61,
data.Configuration.Resources.Masters[0].Primitive.Operations[4].Interval)
- assert.Equal(t, 700,
data.Configuration.Resources.Masters[0].Primitive.Operations[4].Timeout)
+ assert.Equal(t, "61",
data.Configuration.Resources.Masters[0].Primitive.Operations[4].Interval)
+ assert.Equal(t, "700",
data.Configuration.Resources.Masters[0].Primitive.Operations[4].Timeout)
assert.Equal(t, "test", data.Configuration.Resources.Primitives[2].Id)
assert.Equal(t, "ocf", data.Configuration.Resources.Primitives[2].Class)
assert.Equal(t, "heartbeat",
data.Configuration.Resources.Primitives[2].Provider)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/collector/pacemaker/pacemaker.go
new/prometheus-ha_cluster_exporter-1.0.0beta8/collector/pacemaker/pacemaker.go
---
old/prometheus-ha_cluster_exporter-1.0.0beta7/collector/pacemaker/pacemaker.go
2020-02-28 15:13:37.000000000 +0100
+++
new/prometheus-ha_cluster_exporter-1.0.0beta8/collector/pacemaker/pacemaker.go
2020-03-12 11:53:02.000000000 +0100
@@ -44,7 +44,7 @@
}
func (c *pacemakerCollector) Collect(ch chan<- prometheus.Metric) {
- log.Infoln("Collecting pacemaker metrics...")
+ log.Debugln("Collecting pacemaker metrics...")
crmMon, err := c.crmMonParser.Parse()
if err != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/collector/sbd/sbd.go
new/prometheus-ha_cluster_exporter-1.0.0beta8/collector/sbd/sbd.go
--- old/prometheus-ha_cluster_exporter-1.0.0beta7/collector/sbd/sbd.go
2020-02-28 15:13:37.000000000 +0100
+++ new/prometheus-ha_cluster_exporter-1.0.0beta8/collector/sbd/sbd.go
2020-03-12 11:53:02.000000000 +0100
@@ -46,7 +46,7 @@
}
func (c *sbdCollector) Collect(ch chan<- prometheus.Metric) {
- log.Infoln("Collecting SBD metrics...")
+ log.Debugln("Collecting SBD metrics...")
sbdConfiguration, err := readSdbFile(c.sbdConfigPath)
if err != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/ha_cluster_exporter.go
new/prometheus-ha_cluster_exporter-1.0.0beta8/ha_cluster_exporter.go
--- old/prometheus-ha_cluster_exporter-1.0.0beta7/ha_cluster_exporter.go
2020-02-28 15:13:37.000000000 +0100
+++ new/prometheus-ha_cluster_exporter-1.0.0beta8/ha_cluster_exporter.go
2020-03-12 11:53:02.000000000 +0100
@@ -14,41 +14,9 @@
"github.com/ClusterLabs/ha_cluster_exporter/collector/drbd"
"github.com/ClusterLabs/ha_cluster_exporter/collector/pacemaker"
"github.com/ClusterLabs/ha_cluster_exporter/collector/sbd"
+ "github.com/ClusterLabs/ha_cluster_exporter/internal"
)
-// Landing Page (for /)
-func landingpage(w http.ResponseWriter, r *http.Request) {
- body := []byte(`<html>
-<head>
- <title>ClusterLabs Linux HA Cluster Exporter</title>
-</head>
-<body>
- <h1>ClusterLabs Linux HA Cluster </h1>
- <p><a href="metrics">Metrics</a></p>
- <br />
- <h2>More information:</h2>
- <p><a
href="https://github.com/ClusterLabs/ha_cluster_exporter";>github.com/ClusterLabs/ha_cluster_exporter</a></p>
-</body>
-</html>
-`)
- w.Write(body)
-}
-
-func loglevel(level string) {
- switch level {
- case "error":
- log.SetLevel(log.ErrorLevel)
- case "warn":
- log.SetLevel(log.WarnLevel)
- case "info":
- log.SetLevel(log.InfoLevel)
- case "debug":
- log.SetLevel(log.DebugLevel)
- default:
- log.Warnln("Unrecognized minimum log level; using 'info' as
default")
- }
-}
-
func init() {
config.SetConfigName("ha_cluster_exporter")
config.AddConfigPath("./")
@@ -88,7 +56,7 @@
log.Info("Using config file: ", config.ConfigFileUsed())
}
- loglevel(config.GetString("log-level"))
+ internal.SetLogLevel(config.GetString("log-level"))
pacemakerCollector, err := pacemaker.NewCollector(
config.GetString("crm-mon-path"),
@@ -133,7 +101,7 @@
fullListenAddress := fmt.Sprintf("%s:%s", config.Get("address"),
config.Get("port"))
- http.HandleFunc("/", landingpage)
+ http.HandleFunc("/", internal.Landing)
http.Handle("/metrics", promhttp.Handler())
log.Infof("Serving metrics on %s", fullListenAddress)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/internal/landing.go
new/prometheus-ha_cluster_exporter-1.0.0beta8/internal/landing.go
--- old/prometheus-ha_cluster_exporter-1.0.0beta7/internal/landing.go
1970-01-01 01:00:00.000000000 +0100
+++ new/prometheus-ha_cluster_exporter-1.0.0beta8/internal/landing.go
2020-03-12 11:53:02.000000000 +0100
@@ -0,0 +1,21 @@
+package internal
+
+import "net/http"
+
+func Landing(w http.ResponseWriter, r *http.Request) {
+ w.Write([]byte(`
+<html>
+<head>
+ <title>ClusterLabs Linux HA Cluster Exporter</title>
+</head>
+<body>
+ <h1>ClusterLabs Linux HA Cluster Exporter</h1>
+ <h2>Prometheus exporter for Pacemaker based Linux HA clusters</h2>
+ <ul>
+ <li><a href="metrics">Metrics</a></li>
+ <li><a
href="https://github.com/ClusterLabs/ha_cluster_exporter";
target="_blank">GitHub</a></li>
+ </ul>
+</body>
+</html>
+`))
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/internal/log.go
new/prometheus-ha_cluster_exporter-1.0.0beta8/internal/log.go
--- old/prometheus-ha_cluster_exporter-1.0.0beta7/internal/log.go
1970-01-01 01:00:00.000000000 +0100
+++ new/prometheus-ha_cluster_exporter-1.0.0beta8/internal/log.go
2020-03-12 11:53:02.000000000 +0100
@@ -0,0 +1,18 @@
+package internal
+
+import log "github.com/sirupsen/logrus"
+
+func SetLogLevel(level string) {
+ switch level {
+ case "error":
+ log.SetLevel(log.ErrorLevel)
+ case "warn":
+ log.SetLevel(log.WarnLevel)
+ case "info":
+ log.SetLevel(log.InfoLevel)
+ case "debug":
+ log.SetLevel(log.DebugLevel)
+ default:
+ log.Warnln("Unrecognized minimum log level; using 'info' as
default")
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/packaging/obs/_service
new/prometheus-ha_cluster_exporter-1.0.0beta8/packaging/obs/_service
--- old/prometheus-ha_cluster_exporter-1.0.0beta7/packaging/obs/_service
1970-01-01 01:00:00.000000000 +0100
+++ new/prometheus-ha_cluster_exporter-1.0.0beta8/packaging/obs/_service
2020-03-12 11:53:02.000000000 +0100
@@ -0,0 +1,19 @@
+<services>
+ <service name="tar_scm" mode="disabled">
+ <param
name="url">git://github.com/ClusterLabs/ha_cluster_exporter.git</param>
+ <param name="scm">git</param>
+ <param name="revision">%%VERSION%%</param>
+ <param name="exclude">.git</param>
+ <param name="versionformat">@PARENT_TAG@</param>
+ <param name="filename">prometheus-ha_cluster_exporter</param>
+ </service>
+ <service name="set_version" mode="disabled">
+ <param name="version">%%VERSION%%</param>
+ <param name="file">prometheus-ha_cluster_exporter.spec</param>
+ </service>
+ <service name="recompress" mode="disabled">
+ <param name="file">*.tar</param>
+ <param name="compression">gz</param>
+ </service>
+ <service name="go_modules" mode="disabled" />
+</services>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/prometheus-ha_cluster_exporter-1.0.0beta7/packaging/obs/prometheus-ha_cluster_exporter.spec
new/prometheus-ha_cluster_exporter-1.0.0beta8/packaging/obs/prometheus-ha_cluster_exporter.spec
---
old/prometheus-ha_cluster_exporter-1.0.0beta7/packaging/obs/prometheus-ha_cluster_exporter.spec
1970-01-01 01:00:00.000000000 +0100
+++
new/prometheus-ha_cluster_exporter-1.0.0beta8/packaging/obs/prometheus-ha_cluster_exporter.spec
2020-03-12 11:53:02.000000000 +0100
@@ -0,0 +1,92 @@
+#
+# Copyright 2019-2020 SUSE LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+Name: prometheus-ha_cluster_exporter
+# Version will be processed via set_version source service
+Version: 0
+Release: 0
+License: Apache-2.0
+Summary: Prometheus exporter for Pacemaker HA clusters metrics
+Group: System/Monitoring
+Url: https://github.com/ClusterLabs/ha_cluster_exporter
+Source: %{name}-%{version}.tar.gz
+Source1: vendor.tar.gz
+ExclusiveArch: aarch64 x86_64 ppc64le s390x
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: go >= 1.11
+Provides: ha_cluster_exporter = %{version}-%{release}
+Provides: prometheus(ha_cluster_exporter) = %{version}-%{release}
+# Unlike C/C++ packages, Golang packages do not have header files. They are
statically built so the main package is also the devel package.
+Provides: %{name}-devel = %{version}
+Provides: %{name}-devel-static = %{version}
+
+# Make sure that the binary is not getting stripped.
+%undefine _build_create_debug
+%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
+
+%description
+Prometheus exporter for Pacemaker HA clusters metrics
+
+%prep
+%setup -q # unpack project sources
+%setup -q -T -D -a 1 # unpack go dependencies in vendor.tar.gz, which was
prepared by the source services
+
+%define shortname ha_cluster_exporter
+
+%build
+
+export CGO_ENABLED=0
+go build -mod=vendor \
+ -ldflags="-s -w -X main.version=%{version}" \
+ -o %{shortname}
+
+%install
+
+# Install the binary.
+install -D -m 0755 %{shortname} "%{buildroot}%{_bindir}/%{shortname}"
+
+# Install the systemd unit
+install -D -m 0644 %{shortname}.service %{buildroot}%{_unitdir}/%{name}.service
+
+# Install compat wrapper for legacy init systems
+install -Dd -m 0755 %{buildroot}%{_sbindir}
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
+
+%pre
+%service_add_pre %{name}.service
+
+%post
+%service_add_post %{name}.service
+
+%preun
+%service_del_preun %{name}.service
+
+%postun
+%service_del_postun %{name}.service
+
+%files
+%defattr(-,root,root)
+%doc *.md
+%doc doc/*
+%if 0%{?suse_version} >= 1500
+%license LICENSE
+%else
+%doc LICENSE
+%endif
+%{_bindir}/%{shortname}
+%{_unitdir}/%{name}.service
+%{_sbindir}/rc%{name}
+
+%changelog
++++++ vendor.tar.gz ++++++
