Merge pull request #107 from essentialkaos/develop

Version 1.3.3
essentialkaos · Apr 1, 2024 · 399d165 · 399d165
2 parents 6b93d1d + 41bd517
commit 399d165
Show file tree

Hide file tree

Showing 10 changed files with 668 additions and 508 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,44 +7,45 @@ on:
     branches: [master]
   schedule:
     - cron: '0 14 */15 * *'
+  workflow_dispatch:
+    inputs:
+      force_run:
+        description: 'Force workflow run'
+        required: true
+        type: choice
+        options: [yes, no]
+
+permissions:
+  actions: read
+  contents: read
+  statuses: write
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   Go:
     name: Go
     runs-on: ubuntu-latest
 
-    env:
-      SRC_DIR: src/github.com/${{ github.repository }}
-      GO111MODULE: auto
-
     strategy:
       matrix:
-        go: [ '1.17.x', '1.18.x' ]
+        go: [ '1.21.x', '1.22.x' ]
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
-        id: go
-
-      - name: Setup PATH
-        run: |
-          echo "GOPATH=${{ github.workspace }}" >> "$GITHUB_ENV"
-          echo "GOBIN=${{ github.workspace }}/bin" >> "$GITHUB_ENV"
-          echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          path: ${{env.SRC_DIR}}
 
       - name: Download dependencies
-        working-directory: ${{env.SRC_DIR}}
         run: make deps
 
       - name: Build binary
-        working-directory: ${{env.SRC_DIR}}
         run: make all
 
   Perfecto:
@@ -55,18 +56,30 @@ jobs:
 
     steps:
       - name: Code checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        env:
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-        if: ${{ env.DOCKERHUB_USERNAME != '' }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check specs with Perfecto
-        uses: essentialkaos/perfecto-action@v1
+        uses: essentialkaos/perfecto-action@v2
         with:
           files: common/redis-monitor-top.spec
+
+  Typos:
+    name: Typos
+    runs-on: ubuntu-latest
+
+    needs: Go
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check spelling
+        continue-on-error: true
+        uses: crate-ci/typos@master
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -20,14 +20,14 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 2
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: go
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3
diff --git a/.typos.toml b/.typos.toml
@@ -0,0 +1,2 @@
+[files]
+extend-exclude = ["go.sum"]
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 1.5.1 using next command:
+# This Makefile generated by GoMakeGen 2.2.0 using next command:
 # gomakegen --mod .
 #
 # More info: https://kaos.sh/gomakegen
@@ -9,48 +9,91 @@
 
 export GO111MODULE=on
 
+ifdef VERBOSE ## Print verbose information (Flag)
+VERBOSE_FLAG = -v
+endif
+
+MAKEDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD)
+
+################################################################################
+
 .DEFAULT_GOAL := help
-.PHONY = fmt vet all clean deps mod-init mod-update mod-vendor help
+.PHONY = fmt vet all clean deps update init vendor mod-init mod-update mod-download mod-vendor help
 
 ################################################################################
 
 all: redis-monitor-top ## Build all binaries
 
-redis-monitor-top: ## Build redis-monitor-top binary
-	go build redis-monitor-top.go
+redis-monitor-top:
+	go build $(VERBOSE_FLAG) -ldflags="-X main.gitrev=$(GITREV)" redis-monitor-top.go
 
 install: ## Install all binaries
 	cp redis-monitor-top /usr/bin/redis-monitor-top
 
 uninstall: ## Uninstall all binaries
 	rm -f /usr/bin/redis-monitor-top
 
-deps: mod-update ## Download dependencies
+init: mod-init ## Initialize new module
 
-mod-init: ## Initialize new module
-	go mod init
-	go mod tidy
+deps: mod-download ## Download dependencies
+
+update: mod-update ## Update dependencies to the latest versions
 
-mod-update: ## Download modules to local cache
+vendor: mod-vendor ## Make vendored copy of dependencies
+
+mod-init:
+ifdef MODULE_PATH ## Module path for initialization (String)
+	go mod init $(MODULE_PATH)
+else
+	go mod init
+endif
+
+ifdef COMPAT ## Compatible Go version (String)
+	go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT)
+else
+	go mod tidy $(VERBOSE_FLAG)
+endif
+
+mod-update:
+ifdef UPDATE_ALL ## Update all dependencies (Flag)
+	go get -u $(VERBOSE_FLAG) all
+else
+	go get -u $(VERBOSE_FLAG) ./...
+endif
+
+ifdef COMPAT
+	go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT)
+else
+	go mod tidy $(VERBOSE_FLAG)
+endif
+
+	test -d vendor && rm -rf vendor && go mod vendor $(VERBOSE_FLAG) || :
+
+mod-download:
 	go mod download
 
-mod-vendor: ## Make vendored copy of dependencies
-	go mod vendor
+mod-vendor:
+	rm -rf vendor && go mod vendor $(VERBOSE_FLAG)
 
 fmt: ## Format source code with gofmt
 	find . -name "*.go" -exec gofmt -s -w {} \;
 
-vet: ## Runs go vet over sources
+vet: ## Runs 'go vet' over sources
 	go vet -composites=false -printfuncs=LPrintf,TLPrintf,TPrintf,log.Debug,log.Info,log.Warn,log.Error,log.Critical,log.Print ./...
 
 clean: ## Remove generated files
 	rm -f redis-monitor-top
 
 help: ## Show this info
-	@echo -e '\n\033[1mSupported targets:\033[0m\n'
+	@echo -e '\n\033[1mTargets:\033[0m\n'
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
 		| awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[33m%-19s\033[0m %s\n", $$1, $$2}'
+	@echo -e '\n\033[1mVariables:\033[0m\n'
+	@grep -E '^ifdef [A-Z_]+ .*?## .*$$' $(abspath $(lastword $(MAKEFILE_LIST))) \
+		| sed 's/ifdef //' \
+		| awk 'BEGIN {FS = " .*?## "}; {printf "  \033[32m%-14s\033[0m %s\n", $$1, $$2}'
 	@echo -e ''
-	@echo -e '\033[90mGenerated by GoMakeGen 1.5.1\033[0m\n'
+	@echo -e '\033[90mGenerated by GoMakeGen 2.2.0\033[0m\n'
 
 ################################################################################
diff --git a/README.md b/README.md
@@ -22,22 +22,16 @@ Tiny Redis client for aggregating stats from MONITOR flow.
 
 #### From source
 
-To build the `redis-monitor-top` from scratch, make sure you have a working Go 1.17+ workspace (_[instructions](https://golang.org/doc/install)_), then:
+To build the `redis-monitor-top` from scratch, make sure you have a working Go 1.19+ workspace (_[instructions](https://go.dev/doc/install)_), then:
 
 ```
-go get github.com/essentialkaos/redis-monitor-top
-```
-
-If you want to update `redis-monitor-top` to latest stable release, do:
-
-```
-go get -u github.com/essentialkaos/redis-monitor-top
+go install github.com/essentialkaos/redis-monitor-top@latest
 ```
 
 #### From [ESSENTIAL KAOS Public Repository](https://yum.kaos.st)
 
 ```bash
-sudo yum install -y https://yum.kaos.st/get/$(uname -r).rpm
+sudo yum install -y https://yum.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
 sudo yum install redis-monitor-top
 ```