in_node_exporter_metrics: Support diskstats metrics on macOS

Signed-off-by: Hiroshi Hatake <[email protected]>
fluent · Oct 16, 2023 · 9a20f0b · 9a20f0b
1 parent 168c516
commit 9a20f0b
Show file tree

Hide file tree

Showing 5 changed files with 493 additions and 3 deletions.
diff --git a/plugins/in_node_exporter_metrics/CMakeLists.txt b/plugins/in_node_exporter_metrics/CMakeLists.txt
@@ -23,4 +23,8 @@ set(src
    )
 endif()
 
-FLB_PLUGIN(in_node_exporter_metrics "${src}" "")
+if (APPLE)
+  FLB_PLUGIN(in_node_exporter_metrics "${src}" "-framework Foundation -framework IOKit")
+else()
+  FLB_PLUGIN(in_node_exporter_metrics "${src}" "")
+endif()
diff --git a/plugins/in_node_exporter_metrics/ne.h b/plugins/in_node_exporter_metrics/ne.h
@@ -35,7 +35,7 @@
 #ifdef __linux__
 #define NE_DEFAULT_ENABLED_METRICS "cpu,cpufreq,meminfo,diskstats,filesystem,uname,stat,time,loadavg,vmstat,netdev,filefd,systemd"
 #elif __APPLE__
-#define NE_DEFAULT_ENABLED_METRICS "cpu,loadavg,meminfo,uname,netdev"
+#define NE_DEFAULT_ENABLED_METRICS "cpu,loadavg,meminfo,diskstats,uname,netdev"
 #endif
 
 /* filesystem: regex for ignoring mount points and filesystem types */

diff --git a/plugins/in_node_exporter_metrics/ne_diskstats.c b/plugins/in_node_exporter_metrics/ne_diskstats.c
@@ -19,4 +19,6 @@
 
 #ifdef __linux__
 #include "ne_diskstats_linux.c"
+#elif __APPLE__
+#include "ne_diskstats_darwin.c"
 #endif
diff --git a/plugins/in_node_exporter_metrics/ne_diskstats.h b/plugins/in_node_exporter_metrics/ne_diskstats.h
@@ -22,7 +22,7 @@
 
 #include "ne.h"
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__APPLE__)
 int ne_diskstats_init(struct flb_ne *ctx);
 int ne_diskstats_update(struct flb_ne *ctx);
 int ne_diskstats_exit(struct flb_ne *ctx);