Skip to content

Commit e501ead

Browse files
karthicgitkarthicgit
authored
label_prefix added (#3)
1 parent d97f1c5 commit e501ead

25 files changed

+99
-32
lines changed

‎docs/quickstart.adoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ provider "oci" {
8080
. Optional parameters to override:
8181

8282
* `vcn_id`
83+
* `label_prefix`
8384
* `log_retention_duration`
8485
* `loggroup_tags`
8586

‎docs/terraformoptions.adoc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@
4444
|Values
4545
|Default
4646

47+
|`label_prefix`
48+
|A string that will be prepended to log resources
49+
|none
50+
|none
51+
4752
|`linux_logdef`
4853
|Log Definition for the custom Linux logs
4954
| e.g.

‎main.tf‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ resource "oci_logging_log_group" "apigwloggroup" {
55

66
compartment_id = var.compartment_id
77
description = "API Gateway Loggroup"
8-
display_name = each.value
8+
display_name = var.label_prefix == "none" ? each.value : format("%s-%s", var.label_prefix, each.value)
99
freeform_tags = var.loggroup_tags
1010

1111
}
@@ -17,7 +17,7 @@ resource "oci_logging_log_group" "devopsloggroup" {
1717

1818
compartment_id = var.compartment_id
1919
description = "Devops Loggroup"
20-
display_name = each.value
20+
display_name = var.label_prefix == "none" ? each.value : format("%s-%s", var.label_prefix, each.value)
2121
freeform_tags = var.loggroup_tags
2222

2323
}
@@ -29,7 +29,7 @@ resource "oci_logging_log_group" "emailloggroup" {
2929

3030
compartment_id = var.compartment_id
3131
description = "Email Delivery Loggroup"
32-
display_name = each.value
32+
display_name = var.label_prefix == "none" ? each.value : format("%s-%s", var.label_prefix, each.value)
3333
freeform_tags = var.loggroup_tags
3434

3535
}
@@ -41,7 +41,7 @@ resource "oci_logging_log_group" "eventloggroup" {
4141

4242
compartment_id = var.compartment_id
4343
description = "Events Loggroup"
44-
display_name = each.value
44+
display_name = var.label_prefix == "none" ? each.value : format("%s-%s", var.label_prefix, each.value)
4545
freeform_tags = var.loggroup_tags
4646

4747
}
@@ -53,7 +53,7 @@ resource "oci_logging_log_group" "funcloggroup" {
5353

5454
compartment_id = var.compartment_id
5555
description = "Functions Loggroup"
56-
display_name = each.value
56+
display_name = var.label_prefix == "none" ? each.value : format("%s-%s", var.label_prefix, each.value)
5757
freeform_tags = var.loggroup_tags
5858

5959
}
@@ -65,7 +65,7 @@ resource "oci_logging_log_group" "lbloggroup" {
6565

6666
compartment_id = var.compartment_id
6767
description = "Loadbalancer Loggroup"
68-
display_name = each.value
68+
display_name = var.label_prefix == "none" ? each.value : format("%s-%s", var.label_prefix, each.value)
6969
freeform_tags = var.loggroup_tags
7070

7171
}
@@ -77,7 +77,7 @@ resource "oci_logging_log_group" "osloggroup" {
7777

7878
compartment_id = var.compartment_id
7979
description = "ObjectStorage Loggroup"
80-
display_name = each.value
80+
display_name = var.label_prefix == "none" ? each.value : format("%s-%s", var.label_prefix, each.value)
8181
freeform_tags = var.loggroup_tags
8282

8383
}
@@ -89,7 +89,7 @@ resource "oci_logging_log_group" "vcnloggroup" {
8989

9090
compartment_id = var.compartment_id
9191
description = "VCN flowlogs Loggroup"
92-
display_name = each.value
92+
display_name = var.label_prefix == "none" ? each.value : format("%s-%s", var.label_prefix, each.value)
9393
freeform_tags = var.loggroup_tags
9494

9595
}
@@ -101,7 +101,7 @@ resource "oci_logging_log_group" "vpnloggroup" {
101101

102102
compartment_id = var.compartment_id
103103
description = "VPN IPSEC Loggroup"
104-
display_name = each.value
104+
display_name = var.label_prefix == "none" ? each.value : format("%s-%s", var.label_prefix, each.value)
105105
freeform_tags = var.loggroup_tags
106106

107107
}
@@ -113,7 +113,7 @@ resource "oci_logging_log_group" "linuxloggroup" {
113113

114114

115115
compartment_id = var.compartment_id
116-
display_name = each.value
116+
display_name = var.label_prefix == "none" ? each.value : format("%s-%s", var.label_prefix, each.value)
117117
description = "Custom Linux logs loggroup"
118118

119119
freeform_tags = var.loggroup_tags
@@ -127,14 +127,15 @@ resource "oci_logging_log_group" "winloggroup" {
127127

128128

129129
compartment_id = var.compartment_id
130-
display_name = each.value
130+
display_name = var.label_prefix == "none" ? each.value : format("%s-%s", var.label_prefix, each.value)
131131
description = "Custom Windows logs loggroup"
132132
freeform_tags = var.loggroup_tags
133133

134134
}
135135
module "apigwlog" {
136136
source = "./modules/apigateway"
137137
compartment_id = var.compartment_id
138+
label_prefix = var.label_prefix
138139
logdefinition = local.apigwlogdef
139140
log_retention_duration = var.log_retention_duration
140141
loggroup = oci_logging_log_group.apigwloggroup
@@ -146,6 +147,7 @@ module "apigwlog" {
146147
module "customlog" {
147148
source = "./modules/custom"
148149
compartment_id = var.compartment_id
150+
label_prefix = var.label_prefix
149151
linux_logdef = var.linux_logdef
150152
windows_logdef = var.windows_logdef
151153
log_retention_duration = var.log_retention_duration
@@ -160,6 +162,7 @@ module "customlog" {
160162
module "devopslog" {
161163
source = "./modules/devops"
162164
compartment_id = var.compartment_id
165+
label_prefix = var.label_prefix
163166
logdefinition = local.devopslogdef
164167
log_retention_duration = var.log_retention_duration
165168
loggroup = oci_logging_log_group.devopsloggroup
@@ -171,6 +174,7 @@ module "devopslog" {
171174
module "emaillog" {
172175
source = "./modules/emaildelivery"
173176
compartment_id = var.compartment_id
177+
label_prefix = var.label_prefix
174178
logdefinition = local.emaillogdef
175179
log_retention_duration = var.log_retention_duration
176180
loggroup = oci_logging_log_group.emailloggroup
@@ -181,6 +185,7 @@ module "emaillog" {
181185
module "eventlog" {
182186
source = "./modules/event"
183187
compartment_id = var.compartment_id
188+
label_prefix = var.label_prefix
184189
logdefinition = local.eventlogdef
185190
log_retention_duration = var.log_retention_duration
186191
loggroup = oci_logging_log_group.eventloggroup
@@ -192,6 +197,7 @@ module "eventlog" {
192197
module "funclog" {
193198
source = "./modules/function"
194199
compartment_id = var.compartment_id
200+
label_prefix = var.label_prefix
195201
logdefinition = local.funclogdef
196202
log_retention_duration = var.log_retention_duration
197203
loggroup = oci_logging_log_group.funcloggroup
@@ -203,6 +209,7 @@ module "funclog" {
203209
module "lblog" {
204210
source = "./modules/lb"
205211
compartment_id = var.compartment_id
212+
label_prefix = var.label_prefix
206213
logdefinition = local.lblogdef
207214
log_retention_duration = var.log_retention_duration
208215
loggroup = oci_logging_log_group.lbloggroup
@@ -214,6 +221,7 @@ module "lblog" {
214221
module "objectstorelog" {
215222
source = "./modules/objectstorage"
216223
compartment_id = var.compartment_id
224+
label_prefix = var.label_prefix
217225
logdefinition = local.oslogdef
218226
log_retention_duration = var.log_retention_duration
219227
loggroup = oci_logging_log_group.osloggroup
@@ -225,6 +233,7 @@ module "objectstorelog" {
225233
module "vcnlog" {
226234
source = "./modules/vcn"
227235
compartment_id = var.compartment_id
236+
label_prefix = var.label_prefix
228237
logdefinition = local.vcnlogdef
229238
log_retention_duration = var.log_retention_duration
230239
loggroup = oci_logging_log_group.vcnloggroup
@@ -237,6 +246,7 @@ module "vcnlog" {
237246
module "vpnlog" {
238247
source = "./modules/vpn"
239248
compartment_id = var.compartment_id
249+
label_prefix = var.label_prefix
240250
logdefinition = local.vpnlogdef
241251
log_retention_duration = var.log_retention_duration
242252
loggroup = oci_logging_log_group.vpnloggroup

‎modules/apigateway/apigwlog.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ resource "oci_logging_log" "apigw_access_log" {
1414

1515
for_each = var.logdefinition
1616

17-
display_name = format("%s-%s", each.key, "access")
17+
display_name = var.label_prefix == "none" ? format("%s%s", "access", each.key) : format("%s-%s%s", var.label_prefix, "access", each.key)
1818
log_group_id = var.loggroup[each.value.loggroup].id
1919
log_type = "SERVICE"
2020
configuration {
@@ -34,7 +34,7 @@ resource "oci_logging_log" "apigw_access_log" {
3434
resource "oci_logging_log" "apigw_exec_log" {
3535
for_each = var.logdefinition
3636

37-
display_name = format("%s-%s", each.key, "exec")
37+
display_name = var.label_prefix == "none" ? format("%s%s", "exec", each.key) : format("%s-%s%s", var.label_prefix, "exec", each.key)
3838
log_group_id = var.loggroup[each.value.loggroup].id
3939
log_type = "SERVICE"
4040
configuration {

‎modules/apigateway/variables.tf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
variable "label_prefix" {
2+
default = "none"
3+
description = "A string that will be prepended to log resources."
4+
type = string
5+
}
16
variable "logdefinition" {
27
type = map(any)
38
description = "Log definition"

‎modules/custom/customlog.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ resource "oci_logging_log" "linux_log" {
172172

173173
for_each = local.logdef
174174

175-
display_name = each.key
175+
display_name = var.label_prefix == "none" ? each.key : format("%s-%s", var.label_prefix, each.key)
176176
log_group_id = var.linuxloggroup[each.value.loggroup].id
177177
log_type = "CUSTOM"
178178
is_enabled = lookup(each.value, "enable", true)
@@ -185,7 +185,7 @@ resource "oci_logging_log" "win_log" {
185185

186186
for_each = local.winlogdef
187187

188-
display_name = each.key
188+
display_name = var.label_prefix == "none" ? each.key : format("%s-%s", var.label_prefix, each.key)
189189
log_group_id = var.winloggroup[each.value.loggroup].id
190190
log_type = "CUSTOM"
191191
is_enabled = lookup(each.value, "enable", true)

‎modules/custom/variables.tf‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
variable "label_prefix" {
2+
default = "none"
3+
description = "A string that will be prepended to log resources."
4+
type = string
5+
}
16
variable "linux_logdef" {
27
type = map(any)
38
description = "Custom Linux log definition"
49
}
5-
610
variable "windows_logdef" {
711
type = map(any)
812
description = "Custom Windows Log Definition"

‎modules/devops/devopslog.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ resource "oci_logging_log" "devops_log" {
1111

1212
for_each = var.logdefinition
1313

14-
display_name = each.key
14+
display_name = var.label_prefix == "none" ? each.key : format("%s-%s", var.label_prefix, each.key)
1515
log_group_id = var.loggroup[each.value.loggroup].id
1616
log_type = "SERVICE"
1717
configuration {

‎modules/devops/variables.tf‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
variable "label_prefix" {
2+
default = "none"
3+
description = "A string that will be prepended to log resources."
4+
type = string
5+
}
16
variable "logdefinition" {
27
type = map(any)
38
description = "Log definition"
49
}
5-
610
variable "log_retention_duration" {
711
type = string
812
description = "Duration to retain logs"

‎modules/emaildelivery/emaillog.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ resource "oci_logging_log" "email_outboundaccepted_log" {
1313

1414
for_each = var.logdefinition
1515

16-
display_name = format("%s-%s", each.key, "accept")
16+
display_name = var.label_prefix == "none" ? format("%s%s", "accept", each.key) : format("%s-%s%s", var.label_prefix, "accept", each.key)
1717
log_group_id = var.loggroup[each.value.loggroup].id
1818
log_type = "SERVICE"
1919
configuration {
@@ -33,7 +33,7 @@ resource "oci_logging_log" "email_outboundaccepted_log" {
3333
resource "oci_logging_log" "email_outboundrelayed_log" {
3434
for_each = var.logdefinition
3535

36-
display_name = format("%s-%s", each.key, "relay")
36+
display_name = var.label_prefix == "none" ? format("%s%s", "relay", each.key) : format("%s-%s%s", var.label_prefix, "relay", each.key)
3737
log_group_id = var.loggroup[each.value.loggroup].id
3838
log_type = "SERVICE"
3939
configuration {

0 commit comments

Comments
 (0)