fix: use json container config file

Signed-off-by: Roberto Scolaro <[email protected]>

Author: therealbobo

cmake/modules/container_plugin.cmake

@@ -44,7 +44,7 @@ if(UNIX AND NOT APPLE)
 
 		install(
 			FILES "${CONTAINER_LIBRARY}"
-			DESTINATION share/plugins
+			DESTINATION local/share/sysdig/plugins
 			COMPONENT "${SYSDIG_COMPONENT_NAME}"
 		)
 	endif()

userspace/sysdig/csysdig.cpp

@@ -21,6 +21,8 @@ limitations under the License.
 
 #include <stdio.h>
 #include <iostream>
+#include <fstream>
+#include <sstream>
 #include <filesystem>
 #include <time.h>
 #include <signal.h>
@@ -46,8 +48,6 @@ limitations under the License.
 #include "utils/sinsp_opener.h"
 #include "utils/supported_fields.h"
 
-#include <yaml-cpp/yaml.h>
-
 #ifdef _WIN32
 #include "win32/getopt.h"
 #include <io.h>
@@ -420,13 +420,13 @@ sysdig_init_res csysdig_init(int argc, char **argv)
 
 		// Load container plugin
 		std::string container_config = R"({"hooks":["create","start"],"engines":{"docker":{"enabled":true,"sockets":["/var/run/docker.sock"]},"podman":{"enabled":true,"sockets":["/run/podman/podman.sock","/run/user/1000/podman/podman.sock"]},"containerd":{"enabled":false,"sockets":["/run/containerd/containerd.sock"]},"cri":{"enabled":true,"sockets":["/run/crio/crio.sock"]},"lxc":{"enabled":false},"libvirt_lxc":{"enabled":false},"bpm":{"enabled":false}}})";
-		auto container_config_file = "/etc/sysdig/container.yaml";
+		auto container_config_file = "/etc/sysdig/container.json";
 		if (std::filesystem::exists(container_config_file))
 		{
-			YAML::Node node = YAML::LoadFile(container_config_file);
-			YAML::Emitter emitter;
-			emitter << YAML::DoubleQuoted << YAML::Flow << YAML::BeginSeq << node;
-			container_config = emitter.c_str() + 1;
+			std::ifstream file(container_config_file);
+			std::stringstream buffer;
+			buffer << file.rdbuf();
+			container_config = buffer.str();
 		}
 
 		plugins.load_plugin(inspector, "container");

userspace/sysdig/sysdig.cpp

@@ -21,6 +21,8 @@ limitations under the License.
 
 #include <stdio.h>
 #include <iostream>
+#include <fstream>
+#include <sstream>
 #include <time.h>
 #include <signal.h>
 #include <fcntl.h>
@@ -54,8 +56,6 @@ limitations under the License.
 #include "utils/supported_events.h"
 #include "utils/supported_fields.h"
 
-#include <yaml-cpp/yaml.h>
-
 #ifdef _WIN32
 #include "win32/getopt.h"
 #include <io.h>
@@ -1097,14 +1097,14 @@ sysdig_init_res sysdig_init(int argc, char **argv)
 		plugins.read_plugins_from_dirs(inspector.get());
 
 		// Load container plugin
-		std::string container_config = R"({"hooks":["create","start"],"engines":{"docker":{"enabled":true,"sockets":["/var/run/docker.sock"]},"podman":{"enabled":true,"sockets":["/run/podman/podman.sock","/run/user/1000/podman/podman.sock"]},"containerd":{"enabled":false,"sockets":["/run/containerd/containerd.sock"]},"cri":{"enabled":true,"sockets":["/run/crio/crio.sock"]},"lxc":{"enabled":false},"libvirt_lxc":{"enabled":false},"bpm":{"enabled":false}}})";
-		auto container_config_file = "/etc/sysdig/container.yaml";
+		std::string container_config = R"({"hooks":["create","start"],"engines":{"docker":{"enabled":true,"sockets":["/var/run/docker.sock"]},"podman":{"enabled":true,"sockets":["/run/podman/podman.sock","/run/user/1000/podman/podman.sock"]},"containerd":{"enabled":false,"sockets":["/run/containerd/containerd.sock"]},"cri":{"enabled":true,"sockets":["/run/crio/crio.sock", "/run/containerd/containerd.sock"]},"lxc":{"enabled":false},"libvirt_lxc":{"enabled":false},"bpm":{"enabled":false}}})";
+		auto container_config_file = "/etc/sysdig/container.json";
 		if (std::filesystem::exists(container_config_file))
 		{
-			YAML::Node node = YAML::LoadFile(container_config_file);
-			YAML::Emitter emitter;
-			emitter << YAML::DoubleQuoted << YAML::Flow << YAML::BeginSeq << node;
-			container_config = emitter.c_str() + 1;
+			std::ifstream file(container_config_file);
+			std::stringstream buffer;
+			buffer << file.rdbuf();
+			container_config = buffer.str();
 		}
 
 		plugins.load_plugin(inspector.get(), "container");