Skip to content

Commit 909508e

Browse files
feat[backend](updated filters and rules): added a initial process to update logtash filters an rules
1 parent cca333e commit 909508e

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

backend/src/main/java/com/park/utmstack/ApplicationStartProcessor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.sql.SQLException;
1111
import java.util.Objects;
1212

13+
1314
public class ApplicationStartProcessor implements EnvironmentPostProcessor {
1415
private static final String CLASSNAME = "ApplicationStartProcessor";
1516
private Connection con;
@@ -36,8 +37,6 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
3637
// Checking elasticsearch connection
3738
elasticsearchConnectionCheck();
3839

39-
ConsoleColors.magentaBold();
40-
System.out.println("------------------------------------------------");
4140
ConsoleColors.reset();
4241
} catch (Exception e) {
4342
if (!Objects.isNull(con)) {

backend/src/main/java/com/park/utmstack/UtmstackApp.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ private static void logApplicationStartup(Environment env) {
8282
} catch (UnknownHostException e) {
8383
log.warn("The host name could not be determined, using `localhost` as fallback");
8484
}
85+
86+
8587
log.info(
8688
"\n----------------------------------------------------------\n\t" + "Application '{}' is running! Access URLs:\n\t" + "Local: \t\t{}://localhost:{}{}\n\t" + "External: \t{}://{}:{}{}\n\t" + "Profile(s): \t{}\n----------------------------------------------------------",
8789
env.getProperty("spring.application.name"), protocol, serverPort, contextPath, protocol, hostAddress, serverPort,

backend/src/main/java/com/park/utmstack/config/Constants.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,10 @@ public final class Constants {
164164
public static final List<String> API_ENDPOINT_IGNORE = Collections.emptyList();
165165

166166
// Application version file
167-
public static final String APP_VERSION_FILE = "/updates/version.json";
167+
public static final String APP_VERSION_FILE = "/updates/version.json";
168+
169+
public static final String APP_FILTER_DEFINITIONS = "/utmstack/filters";
170+
public static final String APP_RULE_DEFINITIONS = "/utmstack/rules";
168171

169172
public static final String ADMIN_EMAIL = "admin@localhost";
170173

backend/src/main/java/com/park/utmstack/repository/correlation/rules/UtmCorrelationRulesRepository.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,7 @@ Page<UtmCorrelationRules> searchByFilters(@Param("ruleName") String ruleName,
5454
@Param("ruleSearch") String ruleSearch,
5555
Pageable pageable);
5656

57+
Optional<UtmCorrelationRules> findOneByRuleName(String ruleName);
58+
5759
Optional<UtmCorrelationRules> findFirstBySystemOwnerIsTrueOrderByIdDesc();
5860
}

backend/src/main/java/com/park/utmstack/repository/logstash_filter/UtmLogstashFilterRepository.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.springframework.stereotype.Repository;
99

1010
import java.util.List;
11+
import java.util.Optional;
1112

1213

1314
/**
@@ -22,6 +23,8 @@ public interface UtmLogstashFilterRepository extends JpaRepository<UtmLogstashFi
2223
@Query(nativeQuery = true, value = "select utm_logstash_filter.* from utm_logstash_filter where :nameShort = any(string_to_array(utm_logstash_filter.module_name, ','))")
2324
List<UtmLogstashFilter> findAllByModuleName(@Param("nameShort") String nameShort);
2425

26+
Optional<UtmLogstashFilter> findOneByModuleName(String moduleName);
27+
2528
@Query("select ulf from UtmLogstashFilter ulf where ulf.id in (:filterList) and ulf.systemOwner=false")
2629
List<UtmLogstashFilter> findAllByListOfId(@Param("filterList") List<Long> filterList);
2730

0 commit comments

Comments
 (0)