Copy version from golift to prometheus
This commit is contained in:
		
							parent
							
								
									a0203c9ae0
								
							
						
					
					
						commit
						f696ea08ae
					
				|  | @ -11,10 +11,11 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"github.com/prometheus/client_golang/prometheus" | 	"github.com/prometheus/client_golang/prometheus" | ||||||
| 	"github.com/prometheus/client_golang/prometheus/promhttp" | 	"github.com/prometheus/client_golang/prometheus/promhttp" | ||||||
| 	"github.com/prometheus/common/version" | 	promver "github.com/prometheus/common/version" | ||||||
| 	"github.com/unifi-poller/poller" | 	"github.com/unifi-poller/poller" | ||||||
| 	"github.com/unifi-poller/unifi" | 	"github.com/unifi-poller/unifi" | ||||||
| 	"github.com/unifi-poller/webserver" | 	"github.com/unifi-poller/webserver" | ||||||
|  | 	"golift.io/version" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // PluginName is the name of this plugin.
 | // PluginName is the name of this plugin.
 | ||||||
|  | @ -141,9 +142,12 @@ func (u *promUnifi) Run(c poller.Collect) error { | ||||||
| 	u.RogueAP = descRogueAP(u.Namespace + "_rogueap_") | 	u.RogueAP = descRogueAP(u.Namespace + "_rogueap_") | ||||||
| 
 | 
 | ||||||
| 	mux := http.NewServeMux() | 	mux := http.NewServeMux() | ||||||
|  | 	promver.Version = version.Version | ||||||
|  | 	promver.Revision = version.Revision | ||||||
|  | 	promver.Branch = version.Branch | ||||||
| 
 | 
 | ||||||
| 	webserver.UpdateOutput(&webserver.Output{Name: PluginName, Config: u.Config}) | 	webserver.UpdateOutput(&webserver.Output{Name: PluginName, Config: u.Config}) | ||||||
| 	prometheus.MustRegister(version.NewCollector(u.Namespace)) | 	prometheus.MustRegister(promver.NewCollector(u.Namespace)) | ||||||
| 	prometheus.MustRegister(u) | 	prometheus.MustRegister(u) | ||||||
| 	mux.Handle("/metrics", promhttp.HandlerFor(prometheus.DefaultGatherer, | 	mux.Handle("/metrics", promhttp.HandlerFor(prometheus.DefaultGatherer, | ||||||
| 		promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}, | 		promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}, | ||||||
|  |  | ||||||
|  | @ -12,4 +12,5 @@ require ( | ||||||
| 	golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc // indirect | 	golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc // indirect | ||||||
| 	golang.org/x/sys v0.0.0-20210415045647-66c3f260301c // indirect | 	golang.org/x/sys v0.0.0-20210415045647-66c3f260301c // indirect | ||||||
| 	golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72 // indirect | 	golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72 // indirect | ||||||
|  | 	golift.io/version v0.0.2 // indirect | ||||||
| ) | ) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue