File tree 7 files changed +96
-0
lines changed
7 files changed +96
-0
lines changed Original file line number Diff line number Diff line change @@ -14,6 +14,9 @@ locals {
14
14
funclogdef = { for k , v in var . service_logdef : k => v if v . service == " functions" }
15
15
funcloggroup = [for k , v in var . service_logdef : v . loggroup if v . service == " functions" ]
16
16
17
+ intlogdef = { for k , v in var . service_logdef : k => v if v . service == " integration" }
18
+ intloggroup = [for k , v in var . service_logdef : v . loggroup if v . service == " integration" ]
19
+
17
20
lblogdef = { for k , v in var . service_logdef : k => v if v . service == " loadbalancer" }
18
21
lbloggroup = [for k , v in var . service_logdef : v . loggroup if v . service == " loadbalancer" ]
19
22
Original file line number Diff line number Diff line change @@ -58,6 +58,18 @@ resource "oci_logging_log_group" "funcloggroup" {
58
58
59
59
}
60
60
61
+ # Integration loggroup resource
62
+ resource "oci_logging_log_group" "intloggroup" {
63
+
64
+ for_each = toset (local. intloggroup )
65
+
66
+ compartment_id = var. compartment_id
67
+ description = " Integration Loggroup"
68
+ display_name = var. label_prefix == " none" ? each. value : format (" %s-%s" , var. label_prefix , each. value )
69
+ freeform_tags = var. loggroup_tags
70
+
71
+ }
72
+
61
73
# Loadbalancer loggroup resource
62
74
resource "oci_logging_log_group" "lbloggroup" {
63
75
@@ -206,6 +218,17 @@ module "funclog" {
206
218
207
219
}
208
220
221
+ module "intlog" {
222
+ source = " ./modules/integration"
223
+ compartment_id = var. compartment_id
224
+ label_prefix = var. label_prefix
225
+ logdefinition = local. intlogdef
226
+ log_retention_duration = var. log_retention_duration
227
+ loggroup = oci_logging_log_group. intloggroup
228
+
229
+ count = length (local. intlogdef ) >= 1 ? 1 : 0
230
+
231
+ }
209
232
module "lblog" {
210
233
source = " ./modules/lb"
211
234
compartment_id = var. compartment_id
Original file line number Diff line number Diff line change
1
+ data "oci_integration_integration_instances" "integration_instances" {
2
+ for_each = var. logdefinition
3
+ compartment_id = var. compartment_id
4
+
5
+ # Optional
6
+ display_name = each. value . resource
7
+ state = " ACTIVE"
8
+ }
9
+
10
+ resource "oci_logging_log" "integration_log" {
11
+ for_each = var. logdefinition
12
+
13
+ display_name = var. label_prefix == " none" ? each. key : format (" %s-%s" , var. label_prefix , each. key )
14
+ log_group_id = var. loggroup [each . value . loggroup ]. id
15
+ log_type = " SERVICE"
16
+ configuration {
17
+ source {
18
+ category = " activitystream"
19
+ resource = data. oci_integration_integration_instances . integration_instances [each . key ]. integration_instances . 0 . id
20
+ service = " integration"
21
+ source_type = " OCISERVICE"
22
+ }
23
+ }
24
+
25
+ is_enabled = lookup (each. value , " enable" , true )
26
+ retention_duration = var. log_retention_duration
27
+
28
+ }
Original file line number Diff line number Diff line change
1
+ output "int_logid" {
2
+ value = { for v in oci_logging_log . integration_log : v . display_name => v . id }
3
+ }
4
+
5
+ output "int_loggroupid" {
6
+ value = { for k , v in var . loggroup : v . display_name => v . id }
7
+ }
Original file line number Diff line number Diff line change
1
+ variable "label_prefix" {
2
+ default = " none"
3
+ description = " A string that will be prepended to log resources."
4
+ type = string
5
+ }
6
+ variable "logdefinition" {
7
+ type = map (any )
8
+ description = " Log definition"
9
+ }
10
+ variable "log_retention_duration" {
11
+ type = string
12
+ description = " Duration to retain logs"
13
+ }
14
+
15
+ variable "compartment_id" {
16
+ type = string
17
+ description = " Compartment ID where the resources will be created"
18
+ }
19
+
20
+ variable "loggroup" {
21
+ type = map (any )
22
+ description = " Log Group"
23
+ }
Original file line number Diff line number Diff line change @@ -65,6 +65,17 @@ output "func_loggroupid" {
65
65
description = " Function loggroup id"
66
66
}
67
67
68
+ # Integration log and loggroup id
69
+ output "int_logid" {
70
+ value = try (module. intlog [0 ]. int_logid , " " )
71
+ description = " Integration logs id"
72
+ }
73
+
74
+ output "int_loggroupid" {
75
+ value = try (module. intlog [0 ]. int_loggroupid , " " )
76
+ description = " Integration loggroup id"
77
+ }
78
+
68
79
# Loadbalancer log and loggroup id
69
80
output "lb_accesslogid" {
70
81
value = try (module. lblog [0 ]. lb_accesslogid , " " )
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ service_logdef = {
28
28
#vpnlog ={loggroup="vpnloggroup",service="vpn",resource="<ipsecname>"}
29
29
#devopslog = {loggroup="devopsloggroup",service="devops",resource="<projectname>"}
30
30
#emaillog = {loggroup="emailloggroup",service="email",resource="<emaildomain>"}
31
+ #intlog = {loggroup="intloggroup",service="integration",resource="<integrationinstance>"}
31
32
32
33
}
33
34
You can’t perform that action at this time.
0 commit comments