Fix workflow

.gitea/workflows/build.yml

@@ -2,18 +2,17 @@
 name: Build and release
 
 on:
-  release:
-    types: [published]
-  # workflow_dispatch:
-  #   inputs:
-  #     version:
-  #       description: 'Version'
-  #       required: true
-  #       default: 'v0'
+  workflow_dispatch:
+    inputs:
+      version:
+        type: string
+        description: 'Version'
+        required: true
+        default: 'v0'
 
 jobs:
   test:
-    runs-on: [moon, amd64]
+    runs-on: [dev, amd64]
 
     steps:
     - name: Checkout repository
@@ -24,24 +23,19 @@ jobs:
       with:
         go-version: '1.23'
 
-    # - name: Install dependencies
-    #   run: |
-    #     sudo apt-get update
-    #     sudo apt-get install -y task
-
     - name: Run tests
       run: task test
 
     - name: Build
       run: |
-        task build VERSION=${{ github.ref_name }}
+        task build VERSION=${{ github.event.inputs.version }}
 
-    - name: Upload Release Asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - uses: actions/forgejo-release@v2
       with:
-        upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./lobby2-${{ github.ref_name }}-amd64
-        asset_name: lobby2-${{ github.ref_name }}-amd64
-        asset_content_type: application/octet-stream
+        token: ${{ secrets.GITHUB_TOKEN }}
+        direction: upload
+        tag: ${{ github.event.inputs.version }}
+        title: ${{ github.event.inputs.version }}
+        url: https://gitea.ceperka.net
+        release-dir: bin/
+        release-notes-assistant: true

.gitea/workflows/test.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    runs-on: [moon, amd64]
+    runs-on: [dev, amd64]
 
     steps:
     - name: Checkout repository

.gitignore

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

.vscode/launch.json

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

Taskfile.yml

@@ -18,4 +18,10 @@ tasks:
   build:
     cmds:
     - go mod tidy
-    - go build -o lobby2-{{ .VERSION }}-amd64 cli/*.go
+    - 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

api/main.go

@@ -53,6 +53,7 @@ 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)
@@ -111,3 +112,19 @@ 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
+// @Param service path string true "Name of the service like: systemd, pgsql, .."
+// @Success 200 {array} []nodes.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, "  ")
+}

cli/actions.go

@@ -28,7 +28,7 @@ func masterAction(c *cli.Context) error {
 func nodeAction(c *cli.Context) error {
 	cfg := GetConfig()
 
-	r := refresher.NewRefresher(cfg.NodeDirPath, cfg.ConfigPath)
+	r := refresher.NewRefresher(cfg.NodePath, cfg.ConfigPath)
 	r.Loop()
 
 	return nil
@@ -52,3 +52,23 @@ 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
+}

cli/config.go

@@ -11,8 +11,8 @@ type Config struct {
 	APIToken  string `envconfig:"TOKEN" default:""`
 
 	DumpPath   string `envconfig:"DUMP_PATH" default:"/var/lib/lobby2/nodes.json"`
-	ConfigPath  string `envconfig:"CONFIG_PATH" default:"/var/lib/lobby2/config.json"`
-	NodeDirPath string `envconfig:"NODE_DIR_PATH" default:"/var/lib/lobby2/node"`
+	ConfigPath string `envconfig:"CONFIG_PATH" default:"/etc/lobby2/config.json"`
+	NodePath   string `envconfig:"NODE_PATH" default:"/etc/lobby2/node.json"`
 
 	DropAfterSeconds int64 `envconfig:"DROP_AFTER_SECONDS" default:"60"`
 }

cli/main.go

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

docs/docs.go

@@ -145,6 +145,49 @@ const docTemplate = `{
                     }
                 }
             }
+        },
+        "/prometheus/{service}": {
+            "get": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
+                "description": "Return one nodes based on given hostname",
+                "produces": [
+                    "application/json"
+                ],
+                "summary": "Prometheus service discovery",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Name of the service like: systemd, pgsql, ..",
+                        "name": "service",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Node details",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "type": "array",
+                                "items": {
+                                    "$ref": "#/definitions/nodes.prometheusDiscovery"
+                                }
+                            }
+                        }
+                    },
+                    "401": {
+                        "description": "Forbidden access",
+                        "schema": {
+                            "$ref": "#/definitions/api.Message"
+                        }
+                    }
+                }
+            }
         }
     },
     "definitions": {
@@ -181,6 +224,23 @@ const docTemplate = `{
                     "type": "integer"
                 }
             }
+        },
+        "nodes.prometheusDiscovery": {
+            "type": "object",
+            "properties": {
+                "Labels": {
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "string"
+                    }
+                },
+                "Targets": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            }
         }
     },
     "securityDefinitions": {

docs/swagger.json

@@ -137,6 +137,49 @@
                     }
                 }
             }
+        },
+        "/prometheus/{service}": {
+            "get": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
+                "description": "Return one nodes based on given hostname",
+                "produces": [
+                    "application/json"
+                ],
+                "summary": "Prometheus service discovery",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Name of the service like: systemd, pgsql, ..",
+                        "name": "service",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Node details",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "type": "array",
+                                "items": {
+                                    "$ref": "#/definitions/nodes.prometheusDiscovery"
+                                }
+                            }
+                        }
+                    },
+                    "401": {
+                        "description": "Forbidden access",
+                        "schema": {
+                            "$ref": "#/definitions/api.Message"
+                        }
+                    }
+                }
+            }
         }
     },
     "definitions": {
@@ -173,6 +216,23 @@
                     "type": "integer"
                 }
             }
+        },
+        "nodes.prometheusDiscovery": {
+            "type": "object",
+            "properties": {
+                "Labels": {
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "string"
+                    }
+                },
+                "Targets": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            }
         }
     },
     "securityDefinitions": {

docs/swagger.yaml

@@ -22,6 +22,17 @@ definitions:
       last_update:
         type: integer
     type: object
+  nodes.prometheusDiscovery:
+    properties:
+      Labels:
+        additionalProperties:
+          type: string
+        type: object
+      Targets:
+        items:
+          type: string
+        type: array
+    type: object
 info:
   contact: {}
   description: API of Lobby 2 project that helps to discover and connect to other
@@ -111,6 +122,33 @@ paths:
       security:
       - Bearer: []
       summary: Refresh node
+  /prometheus/{service}:
+    get:
+      description: Return one nodes based on given hostname
+      parameters:
+      - description: 'Name of the service like: systemd, pgsql, ..'
+        in: path
+        name: service
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: Node details
+          schema:
+            items:
+              items:
+                $ref: '#/definitions/nodes.prometheusDiscovery'
+              type: array
+            type: array
+        "401":
+          description: Forbidden access
+          schema:
+            $ref: '#/definitions/api.Message'
+      security:
+      - Bearer: []
+      summary: Prometheus service discovery
 securityDefinitions:
   Bearer:
     in: header

nodes/main_test.go

@@ -32,11 +32,12 @@ func TestNodesProcessor_Refresh(t *testing.T) {
 	np.Refresh("test", Labels{"mylabel"}, KV{"mykey": "my value"})
 	np.Refresh("test2", Labels{"mylabel3"}, KV{"mykey3": "my value3"})
 
-	nodes := np.List()
-	assert.Equal(t, "test", nodes[0].HostName)
-	assert.Contains(t, nodes[0].Labels, "mylabel")
-	assert.Equal(t, "test2", nodes[1].HostName)
-	assert.Contains(t, nodes[1].Labels, "mylabel3")
+	nodeTest, _ := np.Get("test")
+	nodeTest2, _ := np.Get("test2")
+	assert.Equal(t, "test", nodeTest.HostName)
+	assert.Contains(t, nodeTest.Labels, "mylabel")
+	assert.Equal(t, "test2", nodeTest2.HostName)
+	assert.Contains(t, nodeTest2.Labels, "mylabel3")
 }
 
 func TestNodesProcessor_DumpLoad(t *testing.T) {

nodes/prometheus.go

@@ -0,0 +1,45 @@
+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
+}

refresher/main.go

@@ -7,24 +7,23 @@ import (
 	"log"
 	"net/http"
 	"os"
-	"path"
+	"path/filepath"
 	"time"
 
 	"gitea.ceperka.net/rosti/lobby2/nodes"
 )
 
 const refreshIntervalSeconds = 15
-const nodeFileName = "node.json"
 
 // Refresher loads local node info and sends them to the master node.
 type Refresher struct {
 	configPath string
-	nodeDirPath string
+	nodePath   string
 }
 
-func NewRefresher(nodeDirPath string, configPath string) *Refresher {
+func NewRefresher(nodePath string, configPath string) *Refresher {
 	return &Refresher{
-		nodeDirPath: nodeDirPath,
+		nodePath:   nodePath,
 		configPath: configPath,
 	}
 }
@@ -113,7 +112,7 @@ func (r *Refresher) getConfig() (NodeConfig, error) {
 
 // TODO: rewrite this to load Node structure
 func (r *Refresher) loadNode() (*nodes.Node, error) {
-	filePath := path.Join(r.nodeDirPath, nodeFileName)
+	filePath := r.nodePath
 	_, err := os.Stat(filePath)
 	if os.IsNotExist(err) {
 		err = r.initNodeFile()
@@ -122,7 +121,7 @@ func (r *Refresher) loadNode() (*nodes.Node, error) {
 		}
 	}
 
-	content, err := os.ReadFile(path.Join(r.nodeDirPath, nodeFileName))
+	content, err := os.ReadFile(r.nodePath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read file: %w", err)
 	}
@@ -156,7 +155,7 @@ func (r *Refresher) initNodeFile() error {
 		return fmt.Errorf("failed to marshal node: %w", err)
 	}
 
-	err = os.WriteFile(path.Join(r.nodeDirPath, nodeFileName), nodeBytes, 0640)
+	err = os.WriteFile(r.nodePath, nodeBytes, 0640)
 	if err != nil {
 		return fmt.Errorf("failed to write node file: %w", err)
 	}
@@ -165,9 +164,11 @@ func (r *Refresher) initNodeFile() error {
 }
 
 func (r *Refresher) createNodePath() error {
-	_, err := os.Stat(r.nodeDirPath)
+	d := filepath.Dir(r.nodePath)
+
+	_, err := os.Stat(d)
 	if os.IsNotExist(err) {
-		err = os.MkdirAll(r.nodeDirPath, 0755)
+		err = os.MkdirAll(d, 0755)
 		if err != nil {
 			return fmt.Errorf("failed to create node dir: %w", err)
 		}