Skip to content

fix: group dashboard snapshot tables by backup_type and bump lint hooks for Go 1.27 #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janfuhrer merged 2 commits into from
Nov 5, 2026
Merged

fix: group dashboard snapshot tables by backup_type and bump lint hooks for Go 1.27 #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce531bf
chore: bump gosec and golangci-lint hooks for Go 1.27
janfuhrer Nov 4, 2026
48593f7
fix: group dashboard snapshot tables by backup_type
janfuhrer Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0
with:
version: v2.13.2
version: v2.15.0
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ repos:
- id: go-imports
- id: go-unit-tests
- repo: https://github.com/golangci/golangci-lint
rev: v2.13.2
rev: v2.15.0
hooks:
- id: golangci-lint
- repo: local
Expand All @@ -32,6 +32,6 @@ repos:
name: gosec
entry: gosec
language: golang
additional_dependencies: ['github.com/securego/gosec/v2/cmd/gosec@v2.29.0']
additional_dependencies: ['github.com/securego/gosec/v2/cmd/gosec@v2.30.0']
args: ["./..."]
pass_filenames: false
63 changes: 47 additions & 16 deletions grafana-dashboard/pbs-exporter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,25 @@
}
]
},
{
"matcher": {
"id": "byName",
"options": "Type"
},
"properties": [
{
"id": "color",
"value": {
"fixedColor": "transparent",
"mode": "fixed"
}
},
{
"id": "custom.width",
"value": 60
}
]
},
{
"matcher": {
"id": "byName",
Expand Down Expand Up @@ -269,8 +288,8 @@
"editorMode": "builder",
"expr": "pbs_snapshot_vm_last_timestamp{job=\"pbs-exporter\", instance=\"$instance\", namespace=~\"$namespace\", datastore=~\"$datastore\", vm_name=~\"$vmname\"} * 1000",
"format": "table",
"instant": false,
"range": true,
"instant": true,
"range": false,
"refId": "A"
},
{
Expand All @@ -282,8 +301,8 @@
"expr": "pbs_snapshot_vm_last_verify{job=\"pbs-exporter\", instance=\"$instance\", namespace=~\"$namespace\", datastore=~\"$datastore\", vm_name=~\"$vmname\"}",
"format": "table",
"hide": false,
"instant": false,
"range": true,
"instant": true,
"range": false,
"refId": "B"
}
],
Expand All @@ -305,6 +324,10 @@
],
"operation": "aggregate"
},
"backup_type": {
"aggregations": [],
"operation": "groupby"
},
"datastore": {
"aggregations": [],
"operation": "groupby"
Expand Down Expand Up @@ -333,16 +356,18 @@
"options": {
"excludeByName": {},
"indexByName": {
"Value #A (lastNotNull)": 4,
"Value #B (lastNotNull)": 5,
"datastore": 2,
"namespace": 3,
"vm_id": 0,
"vm_name": 1
"Value #A (lastNotNull)": 5,
"Value #B (lastNotNull)": 6,
"backup_type": 0,
"datastore": 3,
"namespace": 4,
"vm_id": 1,
"vm_name": 2
},
"renameByName": {
"Value #A (lastNotNull)": "Last snapshot",
"Value #B (lastNotNull)": "Verify state",
"backup_type": "Type",
"datastore": "Datastore",
"namespace": "Namespace",
"vm_id": "VM ID",
Expand Down Expand Up @@ -624,8 +649,8 @@
"editorMode": "builder",
"expr": "pbs_snapshot_vm_count{job=\"pbs-exporter\", instance=\"$instance\", datastore=~\"$datastore\", namespace=~\"$namespace\", vm_name=~\"$vmname\"}",
"format": "table",
"instant": false,
"range": true,
"instant": true,
"range": false,
"refId": "A"
}
],
Expand All @@ -641,6 +666,10 @@
],
"operation": "aggregate"
},
"backup_type": {
"aggregations": [],
"operation": "groupby"
},
"datastore": {
"aggregations": [],
"operation": "groupby"
Expand All @@ -661,13 +690,15 @@
"options": {
"excludeByName": {},
"indexByName": {
"Value (lastNotNull)": 3,
"datastore": 2,
"vm_id": 0,
"vm_name": 1
"Value (lastNotNull)": 4,
"backup_type": 0,
"datastore": 3,
"vm_id": 1,
"vm_name": 2
},
"renameByName": {
"Value (lastNotNull)": "Snapshot count",
"backup_type": "Type",
"datastore": "Datastore",
"vm_id": "VM ID",
"vm_name": "VM name"
Expand Down
1 change: 1 addition & 0 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,7 @@ func main() {

// set insecure
if insecureBool {
// #nosec G402 -- operator opt-in via --pbs.insecure / PBS_INSECURE for self-signed PBS certificates, off by default
tr.TLSClientConfig.InsecureSkipVerify = true
}

Expand Down
Loading