cleanup(userspace): update parse_prometheus_interval

Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>
falcosecurity · Aug 24, 2023 · a575464 · a575464
1 parent c46405f
commit a575464
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 57 deletions.
diff --git a/unit_tests/engine/test_falco_utils.cpp b/unit_tests/engine/test_falco_utils.cpp
@@ -61,10 +61,13 @@ TEST(FalcoUtils, parse_prometheus_interval)
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("2h5m"), 2 * 3600000UL + 5 * 60000UL);
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("2h 5m"), 2 * 3600000UL + 5 * 60000UL);
 
-	ASSERT_EQ(falco::utils::parse_prometheus_interval("200"), 200UL);
-
 	/* Invalid, non prometheus compliant time ordering will result in 0ms. */
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("1ms1y"), 0UL);
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("1t1y"), 0UL);
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("1t"), 0UL);
+
+	/* Deprecated option to pass a numeric value in ms without prometheus compliant time unit,
+	 * will result in 0ms and as a result the end user will receive an error warning.
+	 */
+	ASSERT_EQ(falco::utils::parse_prometheus_interval("200"), 0UL);
 }
diff --git a/userspace/engine/falco_utils.cpp b/userspace/engine/falco_utils.cpp
@@ -62,63 +62,51 @@ uint64_t parse_prometheus_interval(std::string interval_str)
 
 	if(!interval_str.empty())
 	{
-		/* Option 1: Passing interval directly in ms. Will be deprecated in the future. */
-		if(std::all_of(interval_str.begin(), interval_str.end(), ::isdigit))
+		re2::StringPiece input(interval_str);
+		std::string args[14];
+		re2::RE2::Arg arg0(&args[0]);
+		re2::RE2::Arg arg1(&args[1]);
+		re2::RE2::Arg arg2(&args[2]);
+		re2::RE2::Arg arg3(&args[3]);
+		re2::RE2::Arg arg4(&args[4]);
+		re2::RE2::Arg arg5(&args[5]);
+		re2::RE2::Arg arg6(&args[6]);
+		re2::RE2::Arg arg7(&args[7]);
+		re2::RE2::Arg arg8(&args[8]);
+		re2::RE2::Arg arg9(&args[9]);
+		re2::RE2::Arg arg10(&args[10]);
+		re2::RE2::Arg arg11(&args[11]);
+		re2::RE2::Arg arg12(&args[12]);
+		re2::RE2::Arg arg13(&args[13]);
+		const re2::RE2::Arg* const matches[14] = {&arg0, &arg1, &arg2, &arg3, &arg4, &arg5, &arg6, &arg7, &arg8, &arg9, &arg10, &arg11, &arg12, &arg13};
+
+		const std::map<std::string, int>& named_groups = s_rgx_prometheus_time_duration.NamedCapturingGroups();
+		int num_groups = s_rgx_prometheus_time_duration.NumberOfCapturingGroups();
+		re2::RE2::FullMatchN(input, s_rgx_prometheus_time_duration, matches, num_groups);
+
+		static const char* all_prometheus_units[7] = {
+			PROMETHEUS_UNIT_Y, PROMETHEUS_UNIT_W, PROMETHEUS_UNIT_D, PROMETHEUS_UNIT_H,
+			PROMETHEUS_UNIT_M, PROMETHEUS_UNIT_S, PROMETHEUS_UNIT_MS };
+
+		static const uint64_t all_prometheus_time_conversions[7] = {
+			ONE_YEAR_TO_MS, ONE_WEEK_TO_MS, ONE_DAY_TO_MS, ONE_HOUR_TO_MS,
+			ONE_MINUTE_TO_MS, ONE_SECOND_TO_MS, ONE_MS_TO_MS };
+
+		for(size_t i = 0; i < sizeof(all_prometheus_units) / sizeof(const char*); i++)
 		{
-			/* todo: deprecate for Falco 0.36. */
-			interval = std::stoull(interval_str, nullptr, 0);
-		}
-		/* Option 2: Passing a Prometheus compliant time duration.
-		 * https://prometheus.io/docs/prometheus/latest/querying/basics/#time-durations
-		 */
-		else
-		{
-			re2::StringPiece input(interval_str);
-			std::string args[14];
-			re2::RE2::Arg arg0(&args[0]);
-			re2::RE2::Arg arg1(&args[1]);
-			re2::RE2::Arg arg2(&args[2]);
-			re2::RE2::Arg arg3(&args[3]);
-			re2::RE2::Arg arg4(&args[4]);
-			re2::RE2::Arg arg5(&args[5]);
-			re2::RE2::Arg arg6(&args[6]);
-			re2::RE2::Arg arg7(&args[7]);
-			re2::RE2::Arg arg8(&args[8]);
-			re2::RE2::Arg arg9(&args[9]);
-			re2::RE2::Arg arg10(&args[10]);
-			re2::RE2::Arg arg11(&args[11]);
-			re2::RE2::Arg arg12(&args[12]);
-			re2::RE2::Arg arg13(&args[13]);
-			const re2::RE2::Arg* const matches[14] = {&arg0, &arg1, &arg2, &arg3, &arg4, &arg5, &arg6, &arg7, &arg8, &arg9, &arg10, &arg11, &arg12, &arg13};
-
-			const std::map<std::string, int>& named_groups = s_rgx_prometheus_time_duration.NamedCapturingGroups();
-			int num_groups = s_rgx_prometheus_time_duration.NumberOfCapturingGroups();
-			re2::RE2::FullMatchN(input, s_rgx_prometheus_time_duration, matches, num_groups);
-
-			static const char* all_prometheus_units[7] = {
-				PROMETHEUS_UNIT_Y, PROMETHEUS_UNIT_W, PROMETHEUS_UNIT_D, PROMETHEUS_UNIT_H,
-				PROMETHEUS_UNIT_M, PROMETHEUS_UNIT_S, PROMETHEUS_UNIT_MS };
-
-			static const uint64_t all_prometheus_time_conversions[7] = {
-				ONE_YEAR_TO_MS, ONE_WEEK_TO_MS, ONE_DAY_TO_MS, ONE_HOUR_TO_MS,
-				ONE_MINUTE_TO_MS, ONE_SECOND_TO_MS, ONE_MS_TO_MS };
-
-			for(size_t i = 0; i < sizeof(all_prometheus_units) / sizeof(const char*); i++)
+			std::string cur_interval_str;
+			uint64_t cur_interval = 0;
+			const auto &group_it = named_groups.find(all_prometheus_units[i]);
+			if(group_it != named_groups.end())
 			{
-				std::string cur_interval_str;
-				uint64_t cur_interval = 0;
-				const auto &group_it = named_groups.find(all_prometheus_units[i]);
-				if(group_it != named_groups.end())
+				cur_interval_str = args[group_it->second - 1];
+				if(!cur_interval_str.empty())
+				{
+					cur_interval = std::stoull(cur_interval_str, nullptr, 0);
+				}
+				if(cur_interval > 0)
 				{
-					cur_interval_str = args[group_it->second - 1];
-					if(!cur_interval_str.empty())
-					{
-						cur_interval = std::stoull(cur_interval_str, nullptr, 0);
-					}
-					if(cur_interval > 0)
-					{
-						interval += cur_interval * all_prometheus_time_conversions[i];
-					}
+					interval += cur_interval * all_prometheus_time_conversions[i];
 				}
 			}
 		}

diff --git a/userspace/falco/app/actions/process_events.cpp b/userspace/falco/app/actions/process_events.cpp
@@ -435,7 +435,6 @@ static falco::app::run_result init_stats_writer(
 		falco_logger::log(LOG_WARNING, "Metrics are enabled with no output configured, no snapshot will be collected");
 	}
 
-
 	falco_logger::log(LOG_INFO, "Setting metrics interval to " + config->m_metrics_interval_str + ", equivalent to " + std::to_string(config->m_metrics_interval) + " (ms)\n");
 
 	auto res = falco::app::run_result::ok();