update(cmake): bump libs to ace53901af1aae25365b1302c0fa7c7ed69821ea

.github/workflows/ci.yaml

@@ -247,7 +247,7 @@ jobs:
       - name: Build
         run: |
           mkdir -p build
-          cd build && cmake -Wno-dev -DBUILD_DRIVER=OFF ..
+          cd build && cmake -Wno-dev ..
           cmake --build . --target package --config Release
       - name: Upload artifacts
         uses: actions/upload-artifact@v3

cmake/modules/driver.cmake

@@ -31,8 +31,8 @@ else()
   # In case you want to test against another driver version (or branch, or commit) just pass the variable -
   # ie., `cmake -DDRIVER_VERSION=dev ..`
   if(NOT DRIVER_VERSION)
-    set(DRIVER_VERSION "6.0.1+driver")
-    set(DRIVER_CHECKSUM "SHA256=2b4412b5053c8ed5bd1a9de745faa16ec0210dc65dc858af65951d4c8d22207c")
+    set(DRIVER_VERSION "ace53901af1aae25365b1302c0fa7c7ed69821ea")
+    set(DRIVER_CHECKSUM "SHA256=80e04cc3400b3b8e22bddad6b663adff311ab51a19b04baee1e49b06d3860c00")
   endif()
 
   # cd /path/to/build && cmake /path/to/source

cmake/modules/falcosecurity-libs.cmake

@@ -32,8 +32,8 @@ else()
   # In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable -
   # ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..`
   if(NOT FALCOSECURITY_LIBS_VERSION)
-    set(FALCOSECURITY_LIBS_VERSION "0.13.1")
-    set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=2be42a27be3ffe6bd7e53eaa5d8358cab05a0dca821819c6e9059e51b9786219")
+    set(FALCOSECURITY_LIBS_VERSION "ace53901af1aae25365b1302c0fa7c7ed69821ea")
+    set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=80e04cc3400b3b8e22bddad6b663adff311ab51a19b04baee1e49b06d3860c00")
   endif()
 
   # cd /path/to/build && cmake /path/to/source

userspace/sinspui/cursescomponents.cpp

@@ -67,7 +67,6 @@ spy_text_renderer::spy_text_renderer(sinsp* inspector,
 	m_inspector = inspector;
 	m_viz_type = viz_type;
 	m_linecnt = 0;
-	g_filterchecks_force_raw_times = false;
 
 	//
 	// visualization-type inits
@@ -89,21 +88,6 @@ spy_text_renderer::spy_text_renderer(sinsp* inspector,
 					s_filterlist);
 			}
 		}
-		else if(sotype == spy_text_renderer::OT_LATENCY_APP)
-		{
-			if(print_containers)
-			{
-				m_formatter = new sinsp_evt_formatter(m_inspector,
-					"*(latency=%tracer.latency.human) %evt.num %evt.time %evt.cpu %container.name (%container.id) %proc.name (%thread.tid:%thread.vtid) %evt.dir %evt.type %evt.info",
-					s_filterlist);
-			}
-			else
-			{
-				m_formatter = new sinsp_evt_formatter(m_inspector,
-					"*(latency=%tracer.latency.human) %evt.num %evt.time %evt.cpu %proc.name %thread.tid %evt.dir %evt.type %evt.info",
-					s_filterlist);
-			}
-		}
 		else
 		{
 			if(print_containers)

userspace/sinspui/cursesspectro.cpp

@@ -123,7 +123,7 @@ inline void ansi_clearscreen()
 ///////////////////////////////////////////////////////////////////////////////
 // curses_spectro implementation
 ///////////////////////////////////////////////////////////////////////////////
-curses_spectro::curses_spectro(sinsp_cursesui* parent, sinsp* inspector, bool is_tracer)
+curses_spectro::curses_spectro(sinsp_cursesui* parent, sinsp* inspector)
 {
 	m_tblwin = NULL;
 	m_data = NULL;
@@ -147,7 +147,6 @@ curses_spectro::curses_spectro(sinsp_cursesui* parent, sinsp* inspector, bool is
 	m_prev_sel_y1 = -1;
 	m_prev_sel_y2 = -1;
 	m_scroll_paused = false;
-	m_is_tracer = is_tracer;
 	m_selecting = false;
 
 	//
@@ -512,22 +511,11 @@ chisel_table_action curses_spectro::handle_input(int ch)
 									break;
 								}
 
-								string lat_fld_name;
-
-								if(m_is_tracer)
-								{
-									lat_fld_name = "span.duration";
-								}
-								else
-								{
-									lat_fld_name = "evt.latency";
-								}
-
-								m_selection_filter = 
+								m_selection_filter =
 									"(evt.rawtime>="  + to_string(start_row->m_ts - m_table->m_refresh_interval_ns) + 
 									" and evt.rawtime<=" + to_string(end_row->m_ts) + 
-									") and (" + lat_fld_name + ">=" + to_string(start_latency) + 
-									" and " + lat_fld_name + "<" + to_string(end_latency) + ")";
+									") and (evt.latency>=" + to_string(start_latency) +
+									" and evt.latency<" + to_string(end_latency) + ")";
 
 								g_logger.format("spectrogram drill down");
 								g_logger.format("filter: %s", m_selection_filter.c_str());
@@ -537,14 +525,7 @@ chisel_table_action curses_spectro::handle_input(int ch)
 
 								ansi_reset_color();
 
-								if(m_is_tracer)
-								{
-									return STA_DRILLDOWN;
-								}
-								else
-								{
-									return STA_DIG;
-								}
+								return STA_DIG;
 							}
 						}
 					}

userspace/sinspui/cursesspectro.h

@@ -60,7 +60,7 @@ class curses_spectro :
 		ALIGN_RIGHT,
 	};
 
-	curses_spectro(sinsp_cursesui* parent, sinsp* inspector, bool is_tracer);
+	curses_spectro(sinsp_cursesui* parent, sinsp* inspector);
 	~curses_spectro();
 
 	void configure(chisel_table* table);
@@ -127,7 +127,6 @@ class curses_spectro :
 	int32_t m_selstart_x, m_selstart_y;
 	int32_t m_prev_sel_x1, m_prev_sel_x2;
 	int32_t m_prev_sel_y1, m_prev_sel_y2;
-	bool m_is_tracer;
 	bool m_selecting;
 
 	friend class curses_spectro_sidemenu;

userspace/sinspui/cursestable.cpp

@@ -280,43 +280,26 @@ glogf("2, %d %s\n", spos, ss.c_str());
 void curses_table::print_wait()
 {
 	string wstr;
-	bool is_tracer_view = false;
 
 	chisel_view_info* vinfo = m_parent->get_selected_view();
-	if(vinfo)
-	{
-		if(vinfo->m_id == "tracers" ||
-			vinfo->m_id == "tracer_ids")
-		{
-			is_tracer_view = true;
-		}
-	}
-	else
+	if(!vinfo)
 	{
 		ASSERT(false);
 	}
 
-	if(is_tracer_view)
+	if(m_inspector->is_live())
 	{
-		print_line_centered("No data for this view.");
-		print_line_centered("Note: in order to see any data here, you need to push tracers to sysdig from your app as described here: XXX.", 2);
+		wstr = "Collecting Data";
 	}
 	else
 	{
-		if(m_inspector->is_live())
-		{
-			wstr = "Collecting Data";
-		}
-		else
+		if(m_parent->is_eof())
 		{
-			if(m_parent->is_eof())
-			{
-				wstr = "No Data For This View";
-			}
+			wstr = "No Data For This View";
 		}
-
-		print_line_centered(wstr);
 	}
+
+	print_line_centered(wstr);
 }
 
 void curses_table::print_error(string wstr)

userspace/sinspui/cursesui.cpp

@@ -36,8 +36,8 @@ limitations under the License.
 #include "ctext.h"
 #include "cursesui.h"
 
-extern int32_t g_screen_w;
-extern bool g_filterchecks_force_raw_times;
+int32_t g_screen_w;
+bool g_filterchecks_force_raw_times;
 
 using namespace std;
 
@@ -275,11 +275,6 @@ sinsp_cursesui::sinsp_cursesui(sinsp* inspector,
 	m_json_spy_renderer = NULL;
 	m_json_spy_text_fmt = json_spy_text_fmt;
 
-	if(output_type == chisel_table::OT_JSON)
-	{
-		g_filterchecks_force_raw_times = true;
-	}
-
 #ifndef NOCURSESUI
 	m_viz = NULL;
 	m_spectro = NULL;
@@ -677,9 +672,7 @@ void sinsp_cursesui::start(bool is_drilldown, bool is_spy_switch)
 			if(wi != NULL && wi->m_type == chisel_view_info::T_SPECTRO)
 			{
 				ASSERT(ty == chisel_table::TT_TABLE);
-				m_spectro = new curses_spectro(this, 
-					m_inspector, 
-					m_views.at(m_selected_view)->m_id == "spectro_traces");
+				m_spectro = new curses_spectro(this, m_inspector);
 				m_viz = NULL;
 				m_chart = m_spectro;
 			}
@@ -1874,10 +1867,7 @@ bool sinsp_cursesui::do_drilldown(string field, string val,
 
 	if(m_views.at(m_selected_view)->m_drilldown_increase_depth)
 	{
-		if(m_views.at(new_view_num)->m_id != "spectro_tracers")
-		{
-			m_view_depth++;
-		}
+		m_view_depth++;
 	}
 
 	string vfilter;
@@ -1996,20 +1986,13 @@ bool sinsp_cursesui::spectro_selection(string field, string val,
 	uint32_t j = 0;
 	string spectro_name;
 
- 	if(m_views.at(m_selected_view)->m_spectro_type == "tracers")
- 	{
-		spectro_name = "spectro_traces";
- 	}
- 	else
- 	{
-		if(ta == STA_SPECTRO)
-		{
-			spectro_name = "spectro_all";
-		}
-		else
-		{
-			spectro_name = "spectro_file";
-		}
+	if(ta == STA_SPECTRO)
+	{
+		spectro_name = "spectro_all";
+	}
+	else
+	{
+		spectro_name = "spectro_file";
 	}
 
 	for(j = 0; j < m_views.size(); ++j)
@@ -2042,12 +2025,6 @@ bool sinsp_cursesui::drillup()
 		sinsp_ui_selection_info* psinfo = NULL;
 
 		sinsp_ui_selection_info* sinfo = m_sel_hierarchy.at(m_sel_hierarchy.size() - 1);
-		bool is_spctro_app = false;
-
-		if(m_selected_view > 0 && m_views.at(m_selected_view)->m_id == "spectro_tracers")
-		{
-			is_spctro_app = true;
-		}
 
 		m_manual_filter = "";
 
@@ -2062,8 +2039,7 @@ bool sinsp_cursesui::drillup()
 		m_selected_view = sinfo->m_prev_selected_view;
 		m_selected_view_sidemenu_entry = sinfo->m_prev_selected_sidemenu_entry;
 
-		if(m_views.at(m_selected_view)->m_drilldown_increase_depth &&
-			!is_spctro_app)
+		if(m_views.at(m_selected_view)->m_drilldown_increase_depth)
 		{
 			if(sinfo != NULL && sinfo->m_is_drilldown)
 			{

userspace/sysdig/CMakeLists.txt

@@ -22,7 +22,7 @@ endif() # NOT WIN32
 
 include(libscap)
 include(libsinsp)
-include(tinydir-internal)
+include(zlib)
 
 include_directories("${LIBSINSP_INCLUDE_DIRS}")
 include_directories("${PROJECT_BINARY_DIR}/userspace/sinspui")
@@ -122,6 +122,8 @@ if(NOT WIN32)
 else()
 	include(luajit)
 
+	add_definitions(-DNOCURSESUI)
+
 	target_link_libraries(sysdig
 		sinsp
 		"${YAMLCPP_LIB}")

userspace/sysdig/chisels/flame.lua

@@ -91,6 +91,10 @@ end
 
 -- Initialization callback
 function on_init()
+	print("This chisel uses tracers and is deprecated.")
+	require ("os")
+	os.exit()
+
 	-- Request the fields needed for this chisel
 	for j = 0, MAX_DEPTH do
 		local fname = "span.tag[" .. j .. "]"

userspace/sysdig/chisels/tracers_2_statsd.lua

@@ -57,6 +57,10 @@ end
 
 -- Initialization callback
 function on_init()
+	print("This chisel uses tracers and is deprecated")
+	require ("os")
+	os.exit()
+
 	-- Initialize statsd
 	statsd = lstatsd({host = "127.0.0.1"})
 

userspace/sysdig/chisels/v_spans_list.lua

@@ -77,3 +77,9 @@ view_info =
 		},
 	}
 }
+
+function on_init()
+	print("This chisel uses tracers and is deprecated.")
+	require ("os")
+	os.exit()
+end

userspace/sysdig/chisels/v_spans_summary.lua

@@ -86,3 +86,9 @@ view_info =
 		},
 	}
 }
+
+function on_init()
+	print("This chisel uses tracers and is deprecated.")
+	require ("os")
+	os.exit()
+end