JOBS-826 - Fix Xray Dashboard graphs for Log Volume and Metrics

Author: shraddhan

CHANGELOG-splunkbase.md

@@ -1,3 +1,6 @@
+## [1.2.9] - April 22nd, 2025
+* Update search queries to fix Xray Log Volume, CPU Usage, System Memory, Disk Usage, Heap Memory graphs
+
 ## [1.2.8] - December 10th, 2024
 * Update docker panels to mach new log lines structure
 * Add `check_meta_default_write_access` to the app configuration

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All changes to the log analytics integration will be documented in this file.
 
+## [1.0.13] - April 22, 2025
+* 
+* Upgrade Splunk App to version 1.2.9. Changes are available [here](./CHANGELOG-splunkbase.md)
+
 ## [1.0.12] - March 18, 2025
 
 * Update artifactory-ha helm values file

app/jfrog-logs.tar.gz

@@ -5,7 +5,7 @@
     "id": {
       "group": null,
       "name": "jfrog-logs",
-      "version": "1.2.8"
+      "version": "1.2.9"
     },
     "author": [
       {

app/jfrog-logs/app.manifest

@@ -6,7 +6,7 @@ state_change_requires_restart = true
 
 [launcher]
 author = JFrog
-version = 1.2.8
+version = 1.2.9
 description = This app helps process extracted logs and metrics for the JFrog Platform, the universal, hybrid end-to-end DevOps platform.  The app includes a diagnostic dashboard view for JFrog Artifactory. For more information see our blog:  https://jfrog.com/blog/unified-jfrog-log-analytics-with-splunk/
 
 [ui]

app/jfrog-logs/default/app.conf

@@ -49,11 +49,11 @@
       <chart>
         <title>Log Volume</title>
         <search>
-          <query>`default_index` $logs_control$ log_source!="NULL" log_source="jfrog.xray.*" | timechart count by log_source</query>
+          <query>`default_index` $logs_control$ (sourcetype!="NULL" OR log_source!="NULL") (sourcetype="jfrog.xray.*" OR log_source="jfrog.xray.*") | timechart count by sourcetype</query>
           <earliest>$field1.earliest$</earliest>
           <latest>$field1.latest$</latest>
         </search>
-        <option name="charting.chart">area</option>
+        <option name="charting.chart">column</option>
         <option name="charting.chart.stackMode">default</option>
         <option name="charting.drilldown">all</option>
         <option name="charting.layout.splitSeries">0</option>
@@ -408,7 +408,7 @@
       <chart>
         <title>CPU Usage</title>
         <search>
-            <query>| mstats avg("jfrog.xray.sys_cpu_ratio") AS cpu_ratio prestats=false WHERE `default_metrics_index` $mstats_span$
+            <query>| mstats avg("jfrog.xray.jfob_sys_cpu_ratio") AS cpu_ratio prestats=false WHERE `default_metrics_index` $mstats_span$
                    | eval cpu_pct = (cpu_ratio * 100)
                    | timechart avg(cpu_pct) AS "CPU %" $timechart_span$
                    | fields - _span*
@@ -435,7 +435,7 @@
       <chart>
         <title>System Memory</title>
         <search>
-            <query>| mstats avg("jfrog.xray.sys_memory_used_bytes") AS avg_used, avg("jfrog.xray.sys_memory_free_bytes") AS avg_free prestats=false WHERE `default_metrics_index` $mstats_span$
+            <query>| mstats avg("jfrog.xray.jfob_sys_memory_used_bytes") AS avg_used, avg("jfrog.xray.sys_memory_free_bytes") AS avg_free prestats=false WHERE `default_metrics_index` $mstats_span$
                    | eval mem_used_gb = (avg_used / 1024 / 1024 / 1024), mem_free_gb = (avg_free / 1024 / 1024 / 1024)
                    | timechart avg(mem_used_gb) AS "Sys Used(GB)", avg(mem_free_gb) AS "Sys Free(GB)" $timechart_span$
                    | fields - _span*
@@ -462,7 +462,7 @@
       <chart>
         <title>Disk Usage</title>
         <search>
-            <query>| mstats avg("jfrog.xray.app_disk_free_bytes") AS avg_disk_free, avg("jfrog.xray.app_disk_used_bytes") AS avg_disk_used prestats=false WHERE `default_metrics_index` $mstats_span$
+            <query>| mstats avg("jfrog.xray.jfob_app_disk_free_bytes") AS avg_disk_free, avg("jfrog.xray.app_disk_used_bytes") AS avg_disk_used prestats=false WHERE `default_metrics_index` $mstats_span$
                    | eval disk_free_gb = (avg_disk_free / 1024 / 1024 / 1024), disk_used_gb = (avg_disk_used / 1024 / 1024 / 1024)
                    | timechart avg(disk_free_gb) AS "Disk Free(GB)", avg(disk_used_gb) AS "Disk Used(GB)" $timechart_span$
                    | fields - _span*
@@ -489,7 +489,7 @@
       <chart>
         <title>Heap Memory</title>
         <search>
-            <query>| mstats avg("jfrog.xray.go_memstats_heap_objects_total") AS heap_objects , avg("jfrog.xray.go_memstats_heap_allocated_bytes") AS avg_heap_max_bytes, avg("jfrog.xray.go_memstats_heap_in_use_bytes") AS avg_heap_used_bytes prestats=false WHERE `default_metrics_index` $mstats_span$
+            <query>| mstats avg("jfrog.xray.jfob_go_memstats_heap_objects_total") AS heap_objects , avg("jfrog.xray.go_memstats_heap_allocated_bytes") AS avg_heap_max_bytes, avg("jfrog.xray.go_memstats_heap_in_use_bytes") AS avg_heap_used_bytes prestats=false WHERE `default_metrics_index` $mstats_span$
                    | eval heap_objs = (heap_objects), avg_heap_max_gb = (avg_heap_max_bytes / 1024 / 1024 / 1024), avg_heap_used_gb =  (avg_heap_used_bytes / 1024 / 1024 / 1024)
                    | timechart avg(heap_objs) AS "No. of Objects", avg(avg_heap_max_gb) AS "Heap Max(GB)", avg(avg_heap_used_gb) AS "Heap Used(GB)" $timechart_span$
                    | fields - _span*