Fix counts of accessed docker images and repos in dashboards

jfrog · Apr 25, 2024 · 1aad7b6 · 1aad7b6
1 parent 3ecac06
commit 1aad7b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All changes to the log analytics integration will be documented in this file.
 
+## [1.0.6] - April 25, 2024
+
+* Fix Artifactory Grafana dashbaord to count correctly number of accessed docker images and repos
+
 ## [1.0.5] - April 18, 2024
 
 * Fix fluentd regex to fetch correctly docker image and repo names

diff --git a/grafana/ArtifactoryLogAnalyticsAndSystemMetrics.json b/grafana/ArtifactoryLogAnalyticsAndSystemMetrics.json
@@ -1134,7 +1134,7 @@
             "uid": "${DS_LOKI}"
           },
           "editorMode": "code",
-          "expr": "topk(10,sum by (artifact) (count_over_time({agent=\"fluentd\",service=\"artifactory\"} | json | (log_source=\"jfrog.rt.artifactory.request\", request_url=~\"/api/docker/.*\", repo!=\"\", repo!=\"NULL\", repo!=\"latest\", artifact!=\"\", artifact!=\"NULL\", artifact!=\"latest\") [$__range])))",
+          "expr": "topk(10,sum by (artifact) (count_over_time({agent=\"fluentd\",service=\"artifactory\"} | json | (log_source=\"jfrog.rt.artifactory.request\", request_url=~\"/api/docker/.*/manifests/.*\", request_method=~\"PUT|HEAD\", repo!=\"\", repo!=\"NULL\", repo!=\"latest\", artifact!=\"\", artifact!=\"NULL\", artifact!=\"latest\") [$__range])))",
           "legendFormat": "{{artifact}}",
           "queryType": "range",
           "refId": "A"
@@ -1201,7 +1201,7 @@
             "uid": "${DS_LOKI}"
           },
           "editorMode": "code",
-          "expr": "topk(10,sum by (repo) (count_over_time({agent=\"fluentd\",service=\"artifactory\"} | json | (log_source=\"jfrog.rt.artifactory.request\", request_url=~\"/api/docker/.*\", repo!=\"\", repo!=\"NULL\", repo!=\"latest\", artifact!=\"\", artifact!=\"NULL\", artifact!=\"latest\") [$__range])))",
+          "expr": "topk(10,sum by (repo) (count_over_time({agent=\"fluentd\",service=\"artifactory\"} | json | (log_source=\"jfrog.rt.artifactory.request\",  request_url=~\"/api/docker/.*/manifests/.*\", request_method=~\"PUT|HEAD\", repo!=\"\", repo!=\"NULL\", repo!=\"latest\", artifact!=\"\", artifact!=\"NULL\", artifact!=\"latest\") [$__range])))",
           "legendFormat": "{{repo}}",
           "queryType": "range",
           "refId": "A"