Compare commits

..

No commits in common. "main" and "v2" have entirely different histories.
main ... v2

7 changed files with 2 additions and 95 deletions

2
.gitignore vendored
View file

@ -1,5 +1,3 @@
tmp/
__debug*
main
bin/
nodes.json

2
.vscode/launch.json vendored
View file

@ -29,7 +29,7 @@
"env": {
"DUMP_PATH": "../tmp/nodes.json",
"CONFIG_PATH": "../tmp/config.json",
"NODE_PATH": "../tmp/node.json"
"NODE_DIR_PATH": "../tmp/node"
},
"args": [
"node"

View file

@ -19,9 +19,4 @@ tasks:
cmds:
- go mod tidy
- mkdir -p bin
- env CGO_ENABLED=0 go build -o bin/lobby2-{{ .VERSION }}-linux-amd64 cli/*.go
deploy:
cmds:
- task: build
- scp bin/lobby2-{{ .VERSION }}-linux-amd64 rosti-db:/usr/local/bin/lobby2.tmp
- ssh rosti-db mv /usr/local/bin/lobby2.tmp /usr/local/bin/lobby2
- go build -o bin/lobby2-{{ .VERSION }}-linux-amd64 cli/*.go

View file

@ -53,7 +53,6 @@ func (a *API) Run() error {
a.e.GET("/nodes", a.listHandler)
a.e.GET("/nodes/:hostname", a.getHandler)
a.e.POST("/nodes/:hostname", a.refreshHandler)
a.e.GET("/prometheus/:service", a.prometheusHandler)
// Start the server in a goroutine so that it doesn't block the signal listening
return a.e.Start(a.listen)
@ -112,18 +111,3 @@ func (a *API) refreshHandler(c echo.Context) error {
return c.NoContent(http.StatusNoContent)
}
// @Summary Prometheus service discovery
// @Description Return one nodes based on given hostname
// @Produce application/json
// @Success 200 {array} []prometheusDiscovery "Node details"
// @Failure 401 {object} Message "Forbidden access"
// @Security Bearer
// @Router /prometheus/{service} [get]
func (a *API) prometheusHandler(c echo.Context) error {
ss := c.Param("service")
pds := nodes.GetPrometheusSD(a.np, ss)
return c.JSONPretty(http.StatusOK, pds, " ")
}

View file

@ -52,23 +52,3 @@ func printAction(c *cli.Context) error {
return nil
}
func prometheusAction(c *cli.Context) error {
cfg := GetConfig()
np := nodes.NewNodesProcessor(cfg.DumpPath, cfg.DropAfterSeconds)
pds := nodes.GetPrometheusSD(np, "node")
for _, pd := range pds {
body, err := json.MarshalIndent(pd, "", " ")
if err != nil {
fmt.Printf("failed to marshal prometheus discovery: %v\n", err)
os.Exit(1)
}
fmt.Println(string(body))
}
return nil
}

View file

@ -27,11 +27,6 @@ func main() {
Usage: "Prints all discovered nodes",
Action: printAction,
},
{
Name: "prometheus",
Usage: "Prints Prometheus Service Discovery",
Action: prometheusAction,
},
},
}

View file

@ -1,45 +0,0 @@
package nodes
import (
"fmt"
"strings"
)
type prometheusDiscovery struct {
Labels map[string]string `json:"Labels"`
Targets []string `json:"Targets"`
}
func GetPrometheusSD(p *NodesProcessor, ss string) []prometheusDiscovery {
ns := p.List()
pds := []prometheusDiscovery{
{
Labels: make(map[string]string),
Targets: []string{},
},
}
for _, node := range ns {
port, ok := node.KV["prometheus_port"]
if !ok {
port = "9999"
}
host, ok := node.KV["prometheus_host"]
if !ok {
host = node.HostName
}
v, ok := node.KV["prometheus_exporters"]
if ok {
services := strings.Split(v, ",")
for _, service := range services {
if ss == service {
pds[0].Targets = append(pds[0].Targets, fmt.Sprintf("%s:%s", host, port))
}
}
}
}
return pds
}