simono41/pihole-exporter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #179 from zhengyi13/add-bind-addr-support

Browse source 
Teach pihole-exporter how to bind to a specific interface.
This commit is contained in:
Vincent Composieux 2023-05-02 22:11:33 +02:00 committed by GitHub
commit 5759f3ff42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -195,6 +195,9 @@ scrape_configs:
# WEBPASSWORD / api token defined on the PI-Hole interface at `/etc/pihole/setupVars.conf`
-pihole_api_token string (optional)
# Address to be used for the exporter
-bind_addr string (optional) (default "0.0.0.0")
# Port to be used for the exporter
-port string (optional) (default "9617")
```

4
config/configuration.go
View file

@ -24,6 +24,8 @@ type Config struct {
PIHolePort uint16 `config:"pihole_port"`
PIHolePassword string `config:"pihole_password"`
PIHoleApiToken string `config:"pihole_api_token"`
BindAddr string `config:"bind_addr"`
Port uint16 `config:"port"`
}
type EnvConfig struct {
@ -32,6 +34,7 @@ type EnvConfig struct {
PIHolePort []uint16 `config:"pihole_port"`
PIHolePassword []string `config:"pihole_password"`
PIHoleApiToken []string `config:"pihole_api_token"`
BindAddr string `config:"bind_addr"`
Port uint16 `config:"port"`
Timeout time.Duration `config:"timeout"`
}
@ -43,6 +46,7 @@ func getDefaultEnvConfig() *EnvConfig {
PIHolePort: []uint16{80},
PIHolePassword: []string{},
PIHoleApiToken: []string{},
BindAddr: "0.0.0.0",
Port: 9617,
Timeout: 5 * time.Second,
}

4
internal/server/server.go
View file

@ -20,10 +20,10 @@ type Server struct {
// NewServer method initializes a new HTTP server instance and associates
// the different routes that will be used by Prometheus (metrics) or for monitoring (readiness, liveness).
func NewServer(port uint16, clients []*pihole.Client) *Server {
func NewServer(addr string, port uint16, clients []*pihole.Client) *Server {
mux := http.NewServeMux()
httpServer := &http.Server{
Addr: ":" + strconv.Itoa(int(port)),
Addr: addr + ":" + strconv.Itoa(int(port)),
Handler: mux,
}

2
main.go
View file

@ -22,7 +22,7 @@ func main() {
clients := buildClients(clientConfigs, envConf)
s := server.NewServer(envConf.Port, clients)
s := server.NewServer(envConf.BindAddr, envConf.Port, clients)
go func() {
s.ListenAndServe()
close(serverDead)