unteem/php-fpm-exporter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

:goberserk: go fmt all the things

Browse source
This commit is contained in:
Enrico Stahn 2018-02-19 10:53:19 +11:00
parent fb9a7ebb02
commit 0bf1933886
No known key found for this signature in database
GPG key ID: 5263621C269A50DE
6 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/get.go
View file

@ -14,13 +14,13 @@
package cmd package cmd
import ( import (
"github.com/spf13/cobra" "encoding/json"
"fmt"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
"github.com/gosuri/uitable" "github.com/gosuri/uitable"
"fmt"
"time"
"encoding/json"
"github.com/hipages/php-fpm_exporter/phpfpm" "github.com/hipages/php-fpm_exporter/phpfpm"
"github.com/spf13/cobra"
"time"
) )
// Configuration variables // Configuration variables
@ -98,6 +98,6 @@ func init() {
// Cobra supports local flags which will only run when this command // Cobra supports local flags which will only run when this command
// is called directly, e.g.: // is called directly, e.g.:
getCmd.Flags().StringSliceVar(&scrapeURIs, "phpfpm.scrape-uri", []string{"tcp://127.0.0.1:9000/status"},"FastCGI address, e.g. unix:///tmp/php.sock;/status or tcp://127.0.0.1:9000/status") getCmd.Flags().StringSliceVar(&scrapeURIs, "phpfpm.scrape-uri", []string{"tcp://127.0.0.1:9000/status"}, "FastCGI address, e.g. unix:///tmp/php.sock;/status or tcp://127.0.0.1:9000/status")
getCmd.Flags().StringVar(&output, "out", "text","Output format. One of: text, json, spew") getCmd.Flags().StringVar(&output, "out", "text", "Output format. One of: text, json, spew")
} }

8
cmd/root.go
View file

@ -17,17 +17,17 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/hipages/php-fpm_exporter/phpfpm"
"github.com/mitchellh/go-homedir" "github.com/mitchellh/go-homedir"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/sirupsen/logrus"
"github.com/hipages/php-fpm_exporter/phpfpm"
) )
var log = logrus.New() var log = logrus.New()
var ( var (
cfgFile string cfgFile string
logLevel string logLevel string
) )
@ -35,7 +35,7 @@ var (
var RootCmd = &cobra.Command{ var RootCmd = &cobra.Command{
Use: "php-fpm_exporter", Use: "php-fpm_exporter",
Short: "Exports php-fpm metrics for prometheus", Short: "Exports php-fpm metrics for prometheus",
Long: `php-fpm_exporter exports prometheus compatible metrics from php-fpm.`, Long: `php-fpm_exporter exports prometheus compatible metrics from php-fpm.`,
// Uncomment the following line if your bare application // Uncomment the following line if your bare application
// has an action associated with it: // has an action associated with it:
// Run: func(cmd *cobra.Command, args []string) { }, // Run: func(cmd *cobra.Command, args []string) { },

18
cmd/server.go
View file

@ -14,11 +14,11 @@
package cmd package cmd
import ( import (
"github.com/spf13/cobra"
"github.com/prometheus/client_golang/prometheus"
"net/http"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/hipages/php-fpm_exporter/phpfpm" "github.com/hipages/php-fpm_exporter/phpfpm"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/spf13/cobra"
"net/http"
) )
// Configuration variables // Configuration variables
@ -77,9 +77,9 @@ func init() {
// Cobra supports local flags which will only run when this command // Cobra supports local flags which will only run when this command
// is called directly, e.g.: // is called directly, e.g.:
serverCmd.Flags().StringVar(&listeningAddress, "web.listen-address", ":9253", "Address on which to expose metrics and web interface.") serverCmd.Flags().StringVar(&listeningAddress, "web.listen-address", ":9253", "Address on which to expose metrics and web interface.")
serverCmd.Flags().StringVar(&metricsEndpoint, "web.telemetry-path", "/metrics", "Path under which to expose metrics.") serverCmd.Flags().StringVar(&metricsEndpoint, "web.telemetry-path", "/metrics", "Path under which to expose metrics.")
serverCmd.Flags().StringSliceVar(&scrapeURIs, "phpfpm.scrape-uri", []string{"tcp://127.0.0.1:9000/status"},"FastCGI address, e.g. unix:///tmp/php.sock;/status or tcp://127.0.0.1:9000/status") serverCmd.Flags().StringSliceVar(&scrapeURIs, "phpfpm.scrape-uri", []string{"tcp://127.0.0.1:9000/status"}, "FastCGI address, e.g. unix:///tmp/php.sock;/status or tcp://127.0.0.1:9000/status")
serverCmd.Flags().StringSliceVar(&customLabelNames, "phpfpm.label-name", []string{},"Name of the custom label that will be inserted.") serverCmd.Flags().StringSliceVar(&customLabelNames, "phpfpm.label-name", []string{}, "Name of the custom label that will be inserted.")
serverCmd.Flags().StringSliceVar(&customLabelValues, "phpfpm.label-value", []string{},"Value of the custom label that will be inserted.") serverCmd.Flags().StringSliceVar(&customLabelValues, "phpfpm.label-value", []string{}, "Value of the custom label that will be inserted.")
} }

2
cmd/version.go
View file

@ -23,7 +23,7 @@ import (
var versionCmd = &cobra.Command{ var versionCmd = &cobra.Command{
Use: "version", Use: "version",
Short: "Print the version number of php-fpm_exporter", Short: "Print the version number of php-fpm_exporter",
Long: `All software has versions. This is php-fpm_exporter's'`, Long: `All software has versions. This is php-fpm_exporter's'`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
fmt.Println("php-fpm_exporter v0.9 -- HEAD") fmt.Println("php-fpm_exporter v0.9 -- HEAD")
}, },

2
phpfpm/exporter.go
View file

@ -1,9 +1,9 @@
package phpfpm package phpfpm
import ( import (
"sync"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"net/http" "net/http"
"sync"
) )
const ( const (

21
phpfpm/phpfpm.go
View file

@ -14,14 +14,14 @@
package phpfpm package phpfpm
import ( import (
"net/url" "encoding/json"
"fmt"
"github.com/tomasen/fcgi_client" "github.com/tomasen/fcgi_client"
"io/ioutil" "io/ioutil"
"encoding/json" "net/url"
"time"
"fmt"
"strconv" "strconv"
"sync" "sync"
"time"
) )
var log logger var log logger
@ -32,14 +32,13 @@ type logger interface {
} }
type PoolManager struct { type PoolManager struct {
pools []Pool `json:"pools"` pools []Pool `json:"pools"`
} }
type Pool struct { type Pool struct {
// The address of the pool, e.g. tcp://127.0.0.1:9000 or unix:///tmp/php-fpm.sock // The address of the pool, e.g. tcp://127.0.0.1:9000 or unix:///tmp/php-fpm.sock
Address string Address string
CollectionError error CollectionError error
Name string `json:"pool"` Name string `json:"pool"`
ProcessManager string `json:"process manager"` ProcessManager string `json:"process manager"`
StartTime Timestamp `json:"start time"` StartTime Timestamp `json:"start time"`
@ -84,7 +83,7 @@ func (pm *PoolManager) Update() (err error) {
started := time.Now() started := time.Now()
for idx, _ := range pm.pools { for idx := range pm.pools {
wg.Add(1) wg.Add(1)
go func(p *Pool) { go func(p *Pool) {
defer wg.Done() defer wg.Done()
@ -107,7 +106,9 @@ func (pm *PoolManager) Pools() []Pool {
// Implement custom Marshaler due to "pools" being unexported // Implement custom Marshaler due to "pools" being unexported
func (pm PoolManager) MarshalJSON() ([]byte, error) { func (pm PoolManager) MarshalJSON() ([]byte, error) {
return json.Marshal(struct{Pools []Pool `json:"pools"` }{Pools: pm.pools}) return json.Marshal(struct {
Pools []Pool `json:"pools"`
}{Pools: pm.pools})
} }
func (p *Pool) Update() (err error) { func (p *Pool) Update() (err error) {
@ -151,7 +152,7 @@ func (p *Pool) Update() (err error) {
return nil return nil
} }
func (p *Pool) error(err error) (error) { func (p *Pool) error(err error) error {
p.CollectionError = err p.CollectionError = err
log.Error(err) log.Error(err)
return err return err
@ -174,6 +175,6 @@ func (t *Timestamp) UnmarshalJSON(b []byte) error {
return nil return nil
} }
func SetLogger(logger logger){ func SetLogger(logger logger) {
log = logger log = logger
} }