Merge pull request #68 from opensciencegrid/copilot/add-xrootd-parsing-feature

Add collector binary with XRootD packet parsing and stateful correlation

Author: djw8605

.gitignore

@@ -21,3 +21,6 @@
 go.work
 
 dist/
+shoveler
+bin/
+references/

.goreleaser.yml

@@ -19,6 +19,18 @@ builds:
     ignore:
       - goos: windows
         goarch: arm64
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+    id: "xrootd-monitoring-collector"
+    binary: xrootd-monitoring-collector
+    main: ./cmd/collector
+    ignore:
+      - goos: windows
+        goarch: arm64
   - env:
       - CGO_ENABLED=0
     goos:
@@ -56,6 +68,7 @@ archives:
         format: zip
     builds:
       - xrootd-monitoring-shoveler
+      - xrootd-monitoring-collector
       - createtoken
       - shoveler-status
     wrap_in_directory: true
@@ -80,6 +93,7 @@ nfpms:
   - package_name: xrootd-monitoring-shoveler
     builds:
       - xrootd-monitoring-shoveler
+      - xrootd-monitoring-collector
       - createtoken
       - shoveler-status
     file_name_template: '{{ .ProjectName }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
@@ -94,7 +108,7 @@ nfpms:
       - deb
       - rpm
     bindir: /usr/bin
-    release: 1
+    release: "1"
     section: default
     priority: extra
     contents:
@@ -140,17 +154,14 @@ dockers:
       - "ghcr.io/opensciencegrid/xrootd-monitoring-shoveler:{{ .Tag }}"
       - "opensciencegrid/xrootd-monitoring-shoveler:{{ .Tag }}"
       - "opensciencegrid/xrootd-monitoring-shoveler:latest"
-    # GOOS of the built binaries/packages that should be used.
     goos: linux
-
-    # GOARCH of the built binaries/packages that should be used.
     goarch: amd64
-
-    # IDs to filter the binaries/packages.
+    use: buildx
     ids:
       - xrootd-monitoring-shoveler-nfpms
     build_flag_templates:
       - "--pull"
+      - "--platform=linux/amd64"
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"

Makefile

@@ -1,11 +1,15 @@
 VERSION=1.0.0
 GO_FLAGS=CGO_ENABLED=0
 
-all: bin/shoveler bin/createtoken
+all: bin/shoveler bin/xrootd-monitoring-collector bin/createtoken
 
 bin/shoveler: *.go
-	$(GO_FLAGS) go build -ldflags "-X main.VERSION=$(VERSION)" -o bin/shoveler .
-	$(GO_FLAGS) GOOS=linux GOARCH=amd64 go build -ldflags "-X main.VERSION=$(VERSION)" -o bin/linux-x64-shoveler .
+	$(GO_FLAGS) go build -ldflags "-X main.VERSION=$(VERSION)" -o bin/shoveler ./cmd/shoveler
+	$(GO_FLAGS) GOOS=linux GOARCH=amd64 go build -ldflags "-X main.VERSION=$(VERSION)" -o bin/linux-x64-shoveler ./cmd/shoveler
+
+bin/xrootd-monitoring-collector: cmd/collector/main.go
+	$(GO_FLAGS) go build -ldflags "-X main.VERSION=$(VERSION)" -o bin/xrootd-monitoring-collector ./cmd/collector
+	$(GO_FLAGS) GOOS=linux GOARCH=amd64 go build -ldflags "-X main.VERSION=$(VERSION)" -o bin/linux-x64-xrootd-monitoring-collector ./cmd/collector
 
 bin/createtoken: cmd/createtoken/main.go
 	$(GO_FLAGS) GOOS=linux GOARCH=amd64 go build -o bin/linux-x64-createtoken ./cmd/createtoken