Merge pull request #15 from sysdiglabs/master

Master Fetch

Author: Dlorite

.drone.yml

@@ -16,13 +16,21 @@ services:
       - 6383
 
   - name: redis6
-    image: redis:6
+    image: redis:6.2
     pull: if-not-exists
     commands:
       - "redis-server --protected-mode no --dbfilename dump6.rdb"
     ports:
       - 6379
 
+  - name: redis7
+    image: redis:7.0
+    pull: if-not-exists
+    commands:
+      - "redis-server --port 6384 --protected-mode no --dbfilename dump7.rdb"
+    ports:
+      - 6384
+
   - name: pwd-redis5
     image: redis:5
     pull: if-not-exists
@@ -48,15 +56,15 @@ services:
       - 6381
 
   - name: keydb-01
-    image: "eqalpha/keydb:x86_64_v5.3.0"
+    image: "eqalpha/keydb:x86_64_v6.3.1"
     pull: if-not-exists
     commands:
       - "keydb-server --protected-mode no --port 6401 --dbfilename dump-keydb-01.rdb"
     ports:
       - 6401
 
   - name: keydb-02
-    image: "eqalpha/keydb:x86_64_v5.3.0"
+    image: "eqalpha/keydb:x86_64_v6.3.1"
     pull: if-not-exists
     commands:
       - "keydb-server --protected-mode no --port 6402 --active-replica yes --replicaof keydb-01 6401  --dbfilename dump-keydb-02.rdb"
@@ -77,10 +85,10 @@ services:
 
 steps:
   - name: start
-    image: "golang:1.17"
+    image: "golang:1.18"
     pull: if-not-exists
     commands:
-      - sleep 10
+      - sleep 20
       - 'echo "start"'
     when:
       event:
@@ -150,7 +158,7 @@ steps:
       - start
 
   - name: tests
-    image: "golang:1.17"
+    image: "golang:1.18"
     pull: if-not-exists
     environment:
       GO111MODULE: on
@@ -169,7 +177,7 @@ steps:
 
 
   - name: mixins
-    image: golang:1.17
+    image: golang:1.18
     pull: if-not-exists
     commands:
       - cd ./contrib/redis-mixin
@@ -186,7 +194,7 @@ steps:
 
 
   - name: coverage-codecov
-    image: golang:1.17
+    image: golang:1.18
     pull: if-not-exists
     environment:
       CODECOV_TOKEN:
@@ -204,7 +212,7 @@ steps:
 
 
   - name: coverage-coveralls
-    image: "golang:1.17"
+    image: "golang:1.18"
     pull: if-not-exists
     environment:
       GO111MODULE: on
@@ -223,7 +231,7 @@ steps:
 
 
   - name: build-binaries
-    image: "golang:1.17"
+    image: "golang:1.18"
     pull: if-not-exists
     environment:
       GO111MODULE: on
@@ -578,7 +586,7 @@ steps:
 
 
   - name: release-github-binaries
-    image: "golang:1.17"
+    image: "golang:1.18"
     pull: if-not-exists
     environment:
       GITHUB_TOKEN:

.github/dependabot.yml

@@ -21,4 +21,4 @@ updates:
   schedule:
     interval: "daily"
   registries:
-  - docker-registry-quay-io
+  - docker-registry-quay-io

.github/renovate.json

@@ -0,0 +1,11 @@
+{
+  "ignorePaths": [
+    ".drone.yml"
+  ],
+  "packageRules": [
+  {
+    "matchPackageNames": ["redis"],
+    "enabled": false
+  }
+]  
+}

.github/workflows/depsreview.yaml

@@ -0,0 +1,14 @@
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@1c59cdf2a9c7f29c90e8da32237eb04b81bad9f0 # tag=v2

Makefile

@@ -26,6 +26,7 @@ test:
 	TEST_REDIS_URI="redis://redis6:6379" \
 	TEST_REDIS5_URI="redis://redis5:6383" \
 	TEST_REDIS6_URI="redis://redis6:6379" \
+	TEST_REDIS7_URI="redis://redis7:6384" \
 	TEST_REDIS_2_8_URI="redis://redis-2-8:6381" \
 	TEST_KEYDB01_URI="redis://keydb-01:6401" \
 	TEST_KEYDB02_URI="redis://keydb-02:6402" \
@@ -70,13 +71,14 @@ GO_LDFLAGS:="-s -w -extldflags \"-static\" -X main.BuildVersion=${DRONE_TAG} -X
 
 .PHONE: build-binaries
 build-binaries:
-	go get github.com/oliver006/gox@master
+	go install github.com/oliver006/gox@master
 
 	rm -rf .build | true
 
 	export CGO_ENABLED=0 ; \
 	gox -os="linux windows freebsd netbsd openbsd"        -arch="amd64 386" -verbose -rebuild -ldflags $(GO_LDFLAGS) -output ".build/redis_exporter-${DRONE_TAG}.{{.OS}}-{{.Arch}}/{{.Dir}}" && \
 	gox -os="darwin solaris illumos"                      -arch="amd64"     -verbose -rebuild -ldflags $(GO_LDFLAGS) -output ".build/redis_exporter-${DRONE_TAG}.{{.OS}}-{{.Arch}}/{{.Dir}}" && \
+	gox -os="darwin"                                      -arch="arm64"     -verbose -rebuild -ldflags $(GO_LDFLAGS) -output ".build/redis_exporter-${DRONE_TAG}.{{.OS}}-{{.Arch}}/{{.Dir}}" && \
 	gox -os="linux freebsd netbsd"                        -arch="arm"       -verbose -rebuild -ldflags $(GO_LDFLAGS) -output ".build/redis_exporter-${DRONE_TAG}.{{.OS}}-{{.Arch}}/{{.Dir}}" && \
 	gox -os="linux" -arch="arm64 mips64 mips64le ppc64 ppc64le s390x"       -verbose -rebuild -ldflags $(GO_LDFLAGS) -output ".build/redis_exporter-${DRONE_TAG}.{{.OS}}-{{.Arch}}/{{.Dir}}" && \
 	echo "done"