Merge pull request #919 from ripienaar/0150

(misc) Release 0.15.0
choria-io · Jul 1, 2020 · b06614e · b06614e
2 parents cce8159 + 5f2974c
commit b06614e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 |Date      |Issue |Description                                                                                              |
 |----------|------|---------------------------------------------------------------------------------------------------------|
+|2020/07/01|      |Release 0.15.0                                                                                           |
+|2020/06/29|913   |Support preparing for shutdown by closing connections and emiting shutdown events when embedded          |
+|2020/06/26|895   |Support NATS JetStream Streaming Server in Choria Broker                                                 |
+|2020/06/24|907   |Support arm5 and 7 Debian packages                                                                       |
+|2020/06/20|895   |Support Nagios compatible plugins in the new `nagios` autonomous agent watcher                           |
+|2020/06/16|893   |Server instances embedded in other software can now be shutdown using `Shutdown()`                       |
+|2020/06/15|887   |Track nodes expired by maintenance in the tally helper                                                   |
+|2020/06/13|      |Improve FQDN resolution when running in a kubernetes pod                                                 |
+|2020/06/12|879   |Allow the public name of the network broker to be configured                                             |
+|2020/06/12|877   |Support cert-manager.io as security provider                                                             |
+|2020/06/07|865   |Correctly handle provisioning by SRV domain                                                              |
+|2020/06/07|863   |Allow provisioning brokers to have user/password authentication                                          |
+|2020/05/14|860   |Perform backoffs between reconnects to the network broker                                                |
+|2020/04/22|857   |Cosmetic improvements to windows packages                                                                |
 |2020/04/19|      |Release 0.14.0                                                                                           |
 |2020/04/16|854   |Correctly report insecure builds                                                                         |
 |2020/04/07|852   |Install `choria` binary in /usr/bin and not /usr/sbin                                                    |

diff --git a/aagent/watchers/nagioswatcher/nagios.go b/aagent/watchers/nagioswatcher/nagios.go
@@ -304,9 +304,9 @@ func (w *Watcher) Run(ctx context.Context, wg *sync.WaitGroup) {
 	defer wg.Done()
 
 	if w.textFileDir != "" {
-		w.machine.Infof(w.name, "nagios watcher for %s starting, updating prometheus in %s", w.plugin, w.textFileDir)
+		w.machine.Infof(w.name, "nagios watcher starting, updating prometheus in %s", w.textFileDir)
 	} else {
-		w.machine.Infof(w.name, "nagios watcher for %s starting", w.plugin)
+		w.machine.Infof(w.name, "nagios watcher starting, prometheus integration disabled")
 	}
 
 	if w.interval != 0 {

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.14
 require (
 	github.com/AlecAivazis/survey/v2 v2.0.7
 	github.com/Freman/eventloghook v0.0.0-20191003051739-e4d803b6b48b
-	github.com/choria-io/provisioning-agent v0.6.1-0.20200701085843-e4f75063ae58
+	github.com/choria-io/provisioning-agent v0.8.0
 	github.com/cloudevents/sdk-go v1.2.0
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/fatih/color v1.9.0

diff --git a/go.sum b/go.sum
@@ -60,8 +60,8 @@ github.com/choria-io/go-updater v0.0.3 h1:lGUG5DHV/HTl4bRwUY8t1MFuWKPosVRRJWkBF6
 github.com/choria-io/go-updater v0.0.3/go.mod h1:IK696pPQUWx7S/MZYckzPrG2hpDyV/Pkn46JS1n4rIw=
 github.com/choria-io/provisioning-agent v0.6.1-0.20200207105902-ddd40939efcf/go.mod h1:Nrvth8vuI8Ke75hoT8bUC1sx1LajwsmKru4XM+WWadQ=
 github.com/choria-io/provisioning-agent v0.6.1-0.20200607192407-bb64f91dc447/go.mod h1:an69xHBMG+8d64CBk9aO4lidb0hvA3doP9KOC1gQfP8=
-github.com/choria-io/provisioning-agent v0.6.1-0.20200701085843-e4f75063ae58 h1:2v6f4eOOUVzUoUxUPq0IUXGddzorhb0YvZvVKU83fGQ=
-github.com/choria-io/provisioning-agent v0.6.1-0.20200701085843-e4f75063ae58/go.mod h1:4JFFpkporF0NdiYfQb9yygoIjuuraZImpTzzqBTNCZg=
+github.com/choria-io/provisioning-agent v0.8.0 h1:trLMGFYDeZfGHj+DmWfpyHIvj6B5dnOcZLqkKi317hg=
+github.com/choria-io/provisioning-agent v0.8.0/go.mod h1:4JFFpkporF0NdiYfQb9yygoIjuuraZImpTzzqBTNCZg=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=