Skip to content

Commit 315e9c5

Browse files
edersonbrilhanteedersonbrilhante
authored
feat: add new transform and field extraction for runner logs (#186)
* feat: add depends_on in props * feat: add new transform and field extraction for runner logs
1 parent 05a4667 commit 315e9c5

File tree

6 files changed

+315
-0
lines changed

6 files changed

+315
-0
lines changed

‎modules/integrations/splunk_cloud_conf_shared/props_billing_cur.tf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,8 @@ resource "splunk_configs_conf" "forgecicd_aws_billing_cur" {
5151
variables["unarchive_cmd_start_mode"],
5252
]
5353
}
54+
depends_on = [
55+
splunk_configs_conf.forgecicd_billing_cur_instance_id,
56+
splunk_configs_conf.forgecicd_billing_cur_volume_id
57+
]
5458
}

‎modules/integrations/splunk_cloud_conf_shared/props_cloudwatchlogs.tf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,9 @@ resource "splunk_configs_conf" "forgecicd_cloudwatchlogs" {
5353
variables["unarchive_cmd_start_mode"],
5454
]
5555
}
56+
depends_on = [
57+
splunk_configs_conf.forgecicd_cloudwatchlogs_lambda_tenant_fields,
58+
splunk_configs_conf.forgecicd_cloudwatchlogs_global_lambda_tenant_fields,
59+
splunk_configs_conf.forgecicd_extra_lambda_tenant_fields
60+
]
5661
}

‎modules/integrations/splunk_cloud_conf_shared/props_ec2.tf‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,13 @@ resource "splunk_configs_conf" "forgecicd_cloudwatchlogs_forgecicd" {
6060
variables["unarchive_cmd_start_mode"],
6161
]
6262
}
63+
depends_on = [
64+
splunk_configs_conf.forgecicd_cloudwatchlogs_runner_tenant_fields,
65+
splunk_configs_conf.forgecicd_cloudwatchlogs_extract_log_time_message,
66+
splunk_configs_conf.forgecicd_cloudwatchlogs_runner_pages_github_repo_name,
67+
splunk_configs_conf.forgecicd_cloudwatchlogs_runner_ci_result,
68+
splunk_configs_conf.forgecicd_cloudwatchlogs_runner_gh_runner_version
69+
]
6370
}
6471

6572
resource "splunk_configs_conf" "forgecicd_metadata" {
@@ -118,4 +125,10 @@ resource "splunk_configs_conf" "forgecicd_metadata" {
118125
variables["unarchive_cmd_start_mode"],
119126
]
120127
}
128+
depends_on = [
129+
splunk_configs_conf.forgecicd_metadata_tenant_fields,
130+
splunk_configs_conf.forgecicd_metadata_instance_id,
131+
splunk_configs_conf.forgecicd_metadata_image_id,
132+
splunk_configs_conf.forgecicd_metadata_instance_type
133+
]
121134
}

‎modules/integrations/splunk_cloud_conf_shared/props_k8s.tf‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ resource "splunk_configs_conf" "forgecicd_kube_container_runner" {
5858
variables["unarchive_cmd_start_mode"],
5959
]
6060
}
61+
depends_on = [
62+
splunk_configs_conf.forgecicd_kube_container_runner_tenant_fields,
63+
splunk_configs_conf.forgecicd_kube_container_runner_ci_result,
64+
splunk_configs_conf.forgecicd_kube_container_runner_gh_runner_version
65+
]
6166
}
6267

6368
resource "splunk_configs_conf" "forgecicd_kube_container_init_docker_creds" {
@@ -118,6 +123,9 @@ resource "splunk_configs_conf" "forgecicd_kube_container_init_docker_creds" {
118123
variables["unarchive_cmd_start_mode"],
119124
]
120125
}
126+
depends_on = [
127+
splunk_configs_conf.forgecicd_kube_container_runner_tenant_fields
128+
]
121129
}
122130

123131
resource "splunk_configs_conf" "forgecicd_kube_container_init_dind_rootless" {
@@ -178,6 +186,9 @@ resource "splunk_configs_conf" "forgecicd_kube_container_init_dind_rootless" {
178186
variables["unarchive_cmd_start_mode"],
179187
]
180188
}
189+
depends_on = [
190+
splunk_configs_conf.forgecicd_kube_container_runner_tenant_fields
191+
]
181192
}
182193

183194
resource "splunk_configs_conf" "forgecicd_kube_container_init_work" {
@@ -238,6 +249,9 @@ resource "splunk_configs_conf" "forgecicd_kube_container_init_work" {
238249
variables["unarchive_cmd_start_mode"],
239250
]
240251
}
252+
depends_on = [
253+
splunk_configs_conf.forgecicd_kube_container_runner_tenant_fields
254+
]
241255
}
242256

243257
resource "splunk_configs_conf" "forgecicd_kube_container_init_dind_externals" {
@@ -298,6 +312,9 @@ resource "splunk_configs_conf" "forgecicd_kube_container_init_dind_externals" {
298312
variables["unarchive_cmd_start_mode"],
299313
]
300314
}
315+
depends_on = [
316+
splunk_configs_conf.forgecicd_kube_container_runner_tenant_fields
317+
]
301318
}
302319

303320
resource "splunk_configs_conf" "forgecicd_kube_container_dind" {
@@ -358,6 +375,9 @@ resource "splunk_configs_conf" "forgecicd_kube_container_dind" {
358375
variables["unarchive_cmd_start_mode"],
359376
]
360377
}
378+
depends_on = [
379+
splunk_configs_conf.forgecicd_kube_container_runner_tenant_fields
380+
]
361381
}
362382

363383
resource "splunk_configs_conf" "forgecicd_kube_container_listener" {
@@ -418,6 +438,9 @@ resource "splunk_configs_conf" "forgecicd_kube_container_listener" {
418438
variables["unarchive_cmd_start_mode"],
419439
]
420440
}
441+
depends_on = [
442+
splunk_configs_conf.forgecicd_kube_container_listener_tenant_fields
443+
]
421444
}
422445

423446
resource "splunk_configs_conf" "forgecicd_kube_container_manager" {
@@ -478,6 +501,9 @@ resource "splunk_configs_conf" "forgecicd_kube_container_manager" {
478501
variables["unarchive_cmd_start_mode"],
479502
]
480503
}
504+
depends_on = [
505+
splunk_configs_conf.forgecicd_kube_container_manager_tenant_fields
506+
]
481507
}
482508
resource "splunk_configs_conf" "forgecicd_kube_container_log_worker" {
483509
name = "props/kube:container:worker"
@@ -537,6 +563,9 @@ resource "splunk_configs_conf" "forgecicd_kube_container_log_worker" {
537563
variables["unarchive_cmd_start_mode"],
538564
]
539565
}
566+
depends_on = [
567+
splunk_configs_conf.forgecicd_kube_container_runner_tenant_fields
568+
]
540569
}
541570
resource "splunk_configs_conf" "forgecicd_kube_container_log_hook" {
542571
name = "props/kube:container:hook"
@@ -596,4 +625,7 @@ resource "splunk_configs_conf" "forgecicd_kube_container_log_hook" {
596625
variables["unarchive_cmd_start_mode"],
597626
]
598627
}
628+
depends_on = [
629+
splunk_configs_conf.forgecicd_kube_container_runner_tenant_fields
630+
]
599631
}

‎modules/integrations/splunk_cloud_conf_shared/props_runner_logs.tf‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
resource "splunk_configs_conf" "forgecicd_runner_logs_json" {
2+
name = "props/forgecicd:runner-logs:json"
3+
4+
variables = {
5+
"REPORT-forgecicd_runner_logs_tenant_fields_event" = "forgecicd_runner_logs_tenant_fields_event"
6+
"REPORT-forgecicd_runner_ec2" = "forgecicd_runner_ec2"
7+
"REPORT-forgecicd_runner_arc" = "forgecicd_runner_arc"
8+
}
9+
acl {
10+
app = var.splunk_conf.acl.app
11+
owner = var.splunk_conf.acl.owner
12+
sharing = var.splunk_conf.acl.sharing
13+
read = var.splunk_conf.acl.read
14+
write = var.splunk_conf.acl.write
15+
}
16+
lifecycle {
17+
ignore_changes = [
18+
variables["ADD_EXTRA_TIME_FIELDS"],
19+
variables["ANNOTATE_PUNCT"],
20+
variables["AUTO_KV_JSON"],
21+
variables["BREAK_ONLY_BEFORE"],
22+
variables["BREAK_ONLY_BEFORE_DATE"],
23+
variables["CHARSET"],
24+
variables["DATETIME_CONFIG"],
25+
variables["DEPTH_LIMIT"],
26+
variables["DETERMINE_TIMESTAMP_DATE_WITH_SYSTEM_TIME"],
27+
variables["HEADER_MODE"],
28+
variables["LB_CHUNK_BREAKER_TRUNCATE"],
29+
variables["LEARN_MODEL"],
30+
variables["LEARN_SOURCETYPE"],
31+
variables["LINE_BREAKER_LOOKBEHIND"],
32+
variables["MATCH_LIMIT"],
33+
variables["MAX_DAYS_AGO"],
34+
variables["MAX_DAYS_HENCE"],
35+
variables["MAX_DIFF_SECS_AGO"],
36+
variables["MAX_DIFF_SECS_HENCE"],
37+
variables["MAX_EVENTS"],
38+
variables["MAX_EXPECTED_EVENT_LINES"],
39+
variables["MAX_TIMESTAMP_LOOKAHEAD"],
40+
variables["MUST_BREAK_AFTER"],
41+
variables["MUST_NOT_BREAK_AFTER"],
42+
variables["MUST_NOT_BREAK_BEFORE"],
43+
variables["SEGMENTATION"],
44+
variables["SEGMENTATION-all"],
45+
variables["SEGMENTATION-inner"],
46+
variables["SEGMENTATION-outer"],
47+
variables["SEGMENTATION-raw"],
48+
variables["SEGMENTATION-standard"],
49+
variables["SHOULD_LINEMERGE"],
50+
variables["TRANSFORMS"],
51+
variables["TRUNCATE"],
52+
variables["detect_trailing_nulls"],
53+
variables["disabled"],
54+
variables["maxDist"],
55+
variables["priority"],
56+
variables["sourcetype"],
57+
variables["termFrequencyWeightedDist"],
58+
variables["unarchive_cmd_start_mode"],
59+
]
60+
}
61+
depends_on = [
62+
splunk_configs_conf.forgecicd_runner_logs_tenant_fields_event,
63+
splunk_configs_conf.forgecicd_runner_ec2,
64+
splunk_configs_conf.forgecicd_runner_arc
65+
]
66+
}
67+
resource "splunk_configs_conf" "forgecicd_runner_logs_logs" {
68+
name = "props/forgecicd:runner-logs:logs"
69+
70+
variables = {
71+
"REPORT-forgecicd_runner_logs_tenant_fields_logs" = "forgecicd_runner_logs_tenant_fields_logs"
72+
"REPORT-forgecicd_runner_ec2" = "forgecicd_runner_ec2"
73+
"REPORT-forgecicd_runner_arc" = "forgecicd_runner_arc"
74+
}
75+
acl {
76+
app = var.splunk_conf.acl.app
77+
owner = var.splunk_conf.acl.owner
78+
sharing = var.splunk_conf.acl.sharing
79+
read = var.splunk_conf.acl.read
80+
write = var.splunk_conf.acl.write
81+
}
82+
lifecycle {
83+
ignore_changes = [
84+
variables["ADD_EXTRA_TIME_FIELDS"],
85+
variables["ANNOTATE_PUNCT"],
86+
variables["AUTO_KV_JSON"],
87+
variables["BREAK_ONLY_BEFORE"],
88+
variables["BREAK_ONLY_BEFORE_DATE"],
89+
variables["CHARSET"],
90+
variables["DATETIME_CONFIG"],
91+
variables["DEPTH_LIMIT"],
92+
variables["DETERMINE_TIMESTAMP_DATE_WITH_SYSTEM_TIME"],
93+
variables["HEADER_MODE"],
94+
variables["LB_CHUNK_BREAKER_TRUNCATE"],
95+
variables["LEARN_MODEL"],
96+
variables["LEARN_SOURCETYPE"],
97+
variables["LINE_BREAKER_LOOKBEHIND"],
98+
variables["MATCH_LIMIT"],
99+
variables["MAX_DAYS_AGO"],
100+
variables["MAX_DAYS_HENCE"],
101+
variables["MAX_DIFF_SECS_AGO"],
102+
variables["MAX_DIFF_SECS_HENCE"],
103+
variables["MAX_EVENTS"],
104+
variables["MAX_EXPECTED_EVENT_LINES"],
105+
variables["MAX_TIMESTAMP_LOOKAHEAD"],
106+
variables["MUST_BREAK_AFTER"],
107+
variables["MUST_NOT_BREAK_AFTER"],
108+
variables["MUST_NOT_BREAK_BEFORE"],
109+
variables["SEGMENTATION"],
110+
variables["SEGMENTATION-all"],
111+
variables["SEGMENTATION-inner"],
112+
variables["SEGMENTATION-outer"],
113+
variables["SEGMENTATION-raw"],
114+
variables["SEGMENTATION-standard"],
115+
variables["SHOULD_LINEMERGE"],
116+
variables["TRANSFORMS"],
117+
variables["TRUNCATE"],
118+
variables["detect_trailing_nulls"],
119+
variables["disabled"],
120+
variables["maxDist"],
121+
variables["priority"],
122+
variables["sourcetype"],
123+
variables["termFrequencyWeightedDist"],
124+
variables["unarchive_cmd_start_mode"],
125+
]
126+
}
127+
depends_on = [
128+
splunk_configs_conf.forgecicd_runner_logs_tenant_fields_logs,
129+
splunk_configs_conf.forgecicd_runner_ec2,
130+
splunk_configs_conf.forgecicd_runner_arc
131+
]
132+
}

0 commit comments

Comments
 (0)