From acd1daa6be0e4334d8ad06dae6a390a52de0eafb Mon Sep 17 00:00:00 2001
From: Houssem Dellai <houssem.dellai@live.com>
Date: Tue, 27 Feb 2024 17:12:47 +0100
Subject: [PATCH] 85 log analytics private ingestion works

---
 .infracost/pricing.gob                        | Bin 6962 -> 6446 bytes
 ...fest-17ddce81e82ae2cd524941c40532af9a.json |   1 +
 .../ampls.tf                                  |  16 +++++++++++++
 .../data_collection_endpoint.tf               |  15 ++++++------
 .../data_collection_rule.tf                   |  10 ++++----
 ...cs-dce-dcr.tf => dce-dcr-log_analytics.tf} |  22 +++++++++---------
 .../private_endpoint-ampls.tf                 |   6 ++---
 .../prometheus.tf                             |   2 +-
 .../variables.tf                              |   8 +++----
 9 files changed, 49 insertions(+), 31 deletions(-)
 create mode 100644 .infracost/terraform_modules/manifest-17ddce81e82ae2cd524941c40532af9a.json
 rename 85_prometheus_grafana_private_endpoint/{log_analytics-dce-dcr.tf => dce-dcr-log_analytics.tf} (83%)

diff --git a/.infracost/pricing.gob b/.infracost/pricing.gob
index 1838368f0b3672de3586a757b68d4bbc5f6dc1ee..697e09ec3e4a763a496972bc0666f5d54a2bf433 100644
GIT binary patch
delta 1103
zcmZWoTSyd97~Y$=b-nDYcW~WS1F5y<%$%7y6A}d$g|Jzs?Tf|CoSD~($R0upAuxk1
zPPP|{tQDn%u**YHJw}0#LJ<_b7}*UB%0xn&Gu~!4=H>9sf4=j5-~ay)#rxcqd-*l}
z%LA^>WWG2V_SCrCWp0<tRr=w?RC`1AX3W*<TIlg)_V0aeJR-YlA(>{ngC2WT?aZ0;
z1lC>;EqR##@OaVf0+T6B7MjU?QFi^DD!*f%<ADdKpAfk^#rR_OtDAbSeJ68e!_J2+
z^g>-K>@LhLrYeJ@i-VI*)e}@@MCK6CSu8<-FaWZMc#H(7BcSmzs~}7|%44J<RLnRX
zhfmEW$g($0G9JIB@71MNB3F*CYi$iB9imno>?=t!ZogfW70RtZlJSP^aAWVgIWkm{
zuHRxq;{o#(>fl91XZHBi+ozTTNfIFBIYm%Jj^%-b6+zH6EX$gJR0KJ4%-7NkqJ2H)
z*XLbwm)jWIsSnDy{o=Df-x77dEk+h&T{ob_sWJvgGbD_3hzwo<A~5sORx=3%Be_)M
zP#%q7rH#9TBkOT27Uaf30~^av=MIC_yUSJSu-8FOVXCt))Bibs?q!_(EfaK2lra`r
zYyer&B~9Z6%$ojHpdcuUutf(32MyWKBvBGoWEKEc0J6>-tjHPwM`O{h&bH`|D7#Hq
z%f~UXRu?)7QjDj<?$m;RmTWj3@n=J;uBpf`U&mgLJthZ<;)SHCD#5q|w(C|GNtZWO
z>9Dxg+^dtrIos8EGVY_a13wPDAAj>}k3~CEm>`3t#WZaCpWO9r?8y=Ls42&qIC`&b
z=cj2!`8Z^4Wn)cuy~AUq<i=rIwVW9r5vsSIB}emMMAbQ!S0tVlRE!M~DxAiOvaYL8
iVj+iEI#XdD$!n=CIXBG;Xu?CccxCQqgQNZpMgIU(>0q7!

delta 1235
zcmZXTUuYCp6vlUUHzrw4%+4mMN;GS*CYG$;x&P*lRg(uxp-5?b&;$&0?%bIdLBR)K
zREQ#J1RvC!Y&ICBF+oTk5)q*^fvQC*p{W!Fp%mjwO6fxi77@X+?Y)ytGErt8E@#g9
z?)N+A%p|-^uS~4l()(XutVO=e448?An6c4_#bVVjj$i3#zx+Hbf2$kIsPo=`?vKUx
z#oo^B-u~2oHh)ZhRf!vIi`$mv*%$%t0^(qwIRRz_0^|!}$wMh-#_OY!duvAS$>$%9
znp*Ni^MaPVck@V7*PHEfBt_(@OsARrBvLV8{Mxf1KQAAWTQ;Z4Rn@2M__73bw?b1T
zh4KDu^H0SGk7QdK%cmQJ{$}r-YtZW7{B1O!{4RAs8_qhw$AU0|2@)Jo+oi6cUf>Yd
za(o*)a<Z&-D<w_my47<oQB3ZPSm_VVU#=cX$5*3MhplTzJLRRCg8VD7zWn&qVba;g
z<U-Y8rf8&A^Ge2hYYXOD(Xh$m@e$3YJ<E>7=*oFMJsM@X{=?&5eEN^hkOf(`;2w0b
z?;>Hd0I9ZP<hl?t5K!SOmRuuRK}l?jn$ak#J6G=vnu!QwiDt2KaLwFGPzO~w*}6tX
z4M3uFxFO38kKg|B-52c>6M7g~;vnczOa%`D$Jcw|xBv@fn0jsim@KZ#B>*MzVWw7-
z=6?Tvho0Ke8?T;pbf4W5lKPB`fLhoJY>q9$n2neXkQ)fkA=qXzS(Y=9JYP|(8>c1Y
zmt_N)VidWA@Gfyn<t#1L{;F?R&OMvPR?b~UUe)gSfOEKFP|jvHD4Suuw%NLv{p{KN
z%bAc>2<DT(0+#P#mr`JHi$lds5kmrUU$ZtS*5#2zwn(|2>ng~6YAD?jy*FI;SLNDU
z_`AqHvtY)}XiB(0Y~zq=)U1X}a~w;m?8q-&3SX?xHx`rl{d5h~_i_HhpVQN4<eenW
zA_fQ|$WyP&A?CuP4suw)p@S*3sQfyfle;Qa*O$6`EuP=H21?u4s&nHVv$x6fe?wIl
z0?P?F_66gN1IRtZpl|^5JsWcF$l<EiZ2;2cHWiKPRi~x#zAh`&B_k7Bx?f%OKYRL!
AJpcdz

diff --git a/.infracost/terraform_modules/manifest-17ddce81e82ae2cd524941c40532af9a.json b/.infracost/terraform_modules/manifest-17ddce81e82ae2cd524941c40532af9a.json
new file mode 100644
index 0000000..4ad22ff
--- /dev/null
+++ b/.infracost/terraform_modules/manifest-17ddce81e82ae2cd524941c40532af9a.json
@@ -0,0 +1 @@
+{"Path":"d:\\Projects\\docker-kubernetes-course\\85_prometheus_grafana_private_endpoint","Version":"2.0","Modules":[]}
\ No newline at end of file
diff --git a/85_prometheus_grafana_private_endpoint/ampls.tf b/85_prometheus_grafana_private_endpoint/ampls.tf
index 9c494e9..d1fdc4e 100644
--- a/85_prometheus_grafana_private_endpoint/ampls.tf
+++ b/85_prometheus_grafana_private_endpoint/ampls.tf
@@ -16,3 +16,19 @@ resource "azurerm_monitor_private_link_scoped_service" "ampls-dce-log-analytics"
   scope_name          = azurerm_monitor_private_link_scope.ampls.name
   linked_resource_id  = azurerm_monitor_data_collection_endpoint.dce-log-analytics.id
 }
+
+
+
+# resource "azurerm_monitor_private_link_scoped_service" "prometheus" {
+#   name                = "ampls-prometheus"
+#   resource_group_name = azurerm_resource_group.rg_monitoring.name
+#   scope_name          = azurerm_monitor_private_link_scope.ampls.name
+#   linked_resource_id  = azurerm_monitor_workspace.prometheus.id
+# }
+
+resource "azurerm_monitor_private_link_scoped_service" "dce-prometheus" {
+  name                = "ampls-dce-prometheus"
+  resource_group_name = azurerm_resource_group.rg_monitoring.name
+  scope_name          = azurerm_monitor_private_link_scope.ampls.name
+  linked_resource_id  = azurerm_monitor_data_collection_endpoint.dce-prometheus.id
+}
\ No newline at end of file
diff --git a/85_prometheus_grafana_private_endpoint/data_collection_endpoint.tf b/85_prometheus_grafana_private_endpoint/data_collection_endpoint.tf
index 7c22061..e395248 100644
--- a/85_prometheus_grafana_private_endpoint/data_collection_endpoint.tf
+++ b/85_prometheus_grafana_private_endpoint/data_collection_endpoint.tf
@@ -1,13 +1,14 @@
-resource "azurerm_monitor_data_collection_endpoint" "dce" {
+resource "azurerm_monitor_data_collection_endpoint" "dce-prometheus" {
   name                          = "dce-prometheus"
   resource_group_name           = azurerm_resource_group.rg_monitoring.name
   location                      = azurerm_resource_group.rg_monitoring.location
   kind                          = "Linux"
-  public_network_access_enabled = true # false
+  public_network_access_enabled = false # true # false
 }
 
-# # # associate to a Data Collection Endpoint
-# # resource "azurerm_monitor_data_collection_rule_association" "dce-aks" {
-# #   target_resource_id          = azurerm_kubernetes_cluster.aks.id
-# #   data_collection_endpoint_id = azurerm_monitor_data_collection_endpoint.dce.id
-# # }
\ No newline at end of file
+# associate to a Data Collection Endpoint
+resource "azurerm_monitor_data_collection_rule_association" "dce-aks-prometheus" {
+  name                        = "configurationAccessEndpoint" # name is required when data_collection_rule_id is specified. And when data_collection_endpoint_id is specified, the name is populated with configurationAccessEndpoint
+  target_resource_id          = azurerm_kubernetes_cluster.aks.id
+  data_collection_endpoint_id = azurerm_monitor_data_collection_endpoint.dce-prometheus.id
+}
diff --git a/85_prometheus_grafana_private_endpoint/data_collection_rule.tf b/85_prometheus_grafana_private_endpoint/data_collection_rule.tf
index bc33548..b8ad98a 100644
--- a/85_prometheus_grafana_private_endpoint/data_collection_rule.tf
+++ b/85_prometheus_grafana_private_endpoint/data_collection_rule.tf
@@ -1,8 +1,8 @@
-resource "azurerm_monitor_data_collection_rule" "dcr" {
+resource "azurerm_monitor_data_collection_rule" "dcr-prometheus" {
   name                        = "dcr-prometheus"
   resource_group_name         = azurerm_resource_group.rg_monitoring.name
   location                    = azurerm_resource_group.rg_monitoring.location
-  data_collection_endpoint_id = azurerm_monitor_data_collection_endpoint.dce.id
+  data_collection_endpoint_id = azurerm_monitor_data_collection_endpoint.dce-prometheus.id
   kind                        = "Linux"
 
   data_sources {
@@ -26,8 +26,8 @@ resource "azurerm_monitor_data_collection_rule" "dcr" {
 }
 
 # associate to a Data Collection Rule
-resource "azurerm_monitor_data_collection_rule_association" "dcr-aks" {
-  name                    = "dcr-aks"
+resource "azurerm_monitor_data_collection_rule_association" "dcr-aks-prometheus" {
+  name                    = "dcr-aks-prometheus"
   target_resource_id      = azurerm_kubernetes_cluster.aks.id
-  data_collection_rule_id = azurerm_monitor_data_collection_rule.dcr.id
+  data_collection_rule_id = azurerm_monitor_data_collection_rule.dcr-prometheus.id
 }
\ No newline at end of file
diff --git a/85_prometheus_grafana_private_endpoint/log_analytics-dce-dcr.tf b/85_prometheus_grafana_private_endpoint/dce-dcr-log_analytics.tf
similarity index 83%
rename from 85_prometheus_grafana_private_endpoint/log_analytics-dce-dcr.tf
rename to 85_prometheus_grafana_private_endpoint/dce-dcr-log_analytics.tf
index ded2089..e483782 100644
--- a/85_prometheus_grafana_private_endpoint/log_analytics-dce-dcr.tf
+++ b/85_prometheus_grafana_private_endpoint/dce-dcr-log_analytics.tf
@@ -1,25 +1,19 @@
 resource "azurerm_monitor_data_collection_endpoint" "dce-log-analytics" {
-  name                          = "dce-log-analytics1"
+  name                          = "dce-log-analytics"
   resource_group_name           = azurerm_resource_group.rg_monitoring.name
   location                      = azurerm_resource_group.rg_monitoring.location
   public_network_access_enabled = false
 }
 
 # associate to a Data Collection Endpoint
-resource "azurerm_monitor_data_collection_rule_association" "dce-aks" {
+resource "azurerm_monitor_data_collection_rule_association" "dce-aks-log-analytics" {
+  name                        = "configurationAccessEndpoint" # name is required when data_collection_rule_id is specified. And when data_collection_endpoint_id is specified, the name is populated with configurationAccessEndpoint
   target_resource_id          = azurerm_kubernetes_cluster.aks.id
   data_collection_endpoint_id = azurerm_monitor_data_collection_endpoint.dce-log-analytics.id
 }
 
-# associate to a Data Collection Rule
-resource "azurerm_monitor_data_collection_rule_association" "dcr-aks1" {
-  name                    = "dcr-aks1"
-  target_resource_id      = azurerm_kubernetes_cluster.aks.id
-  data_collection_rule_id = azurerm_monitor_data_collection_rule.dcr-log-analytics.id
-}
-
 resource "azurerm_monitor_data_collection_rule" "dcr-log-analytics" {
-  name                        = "dcr-log-analytics1"
+  name                        = "dcr-log-analytics"
   resource_group_name         = azurerm_resource_group.rg_monitoring.name
   location                    = azurerm_resource_group.rg_monitoring.location
   data_collection_endpoint_id = azurerm_monitor_data_collection_endpoint.dce-log-analytics.id
@@ -67,7 +61,13 @@ resource "azurerm_monitor_data_collection_rule" "dcr-log-analytics" {
           }
         }
       )
-      #   extension_json = jsonencode("\"dataCollectionSettings\": { \"interval\": \"1m\", \"namespaceFilteringMode\": \"Off\", \"enableContainerLogV2\": true }\"")
     }
   }
 }
+
+# associate to a Data Collection Rule
+resource "azurerm_monitor_data_collection_rule_association" "dcr-aks-log-analytics" {
+  name                    = "dcr-aks-log-analytics"
+  target_resource_id      = azurerm_kubernetes_cluster.aks.id
+  data_collection_rule_id = azurerm_monitor_data_collection_rule.dcr-log-analytics.id
+}
diff --git a/85_prometheus_grafana_private_endpoint/private_endpoint-ampls.tf b/85_prometheus_grafana_private_endpoint/private_endpoint-ampls.tf
index 027badf..0e4e996 100644
--- a/85_prometheus_grafana_private_endpoint/private_endpoint-ampls.tf
+++ b/85_prometheus_grafana_private_endpoint/private_endpoint-ampls.tf
@@ -1,7 +1,7 @@
 resource "azurerm_private_endpoint" "pe-ampls" {
-  name                = "private-endpoint-ampls"
-  resource_group_name = azurerm_monitor_workspace.prometheus.resource_group_name
-  location            = azurerm_monitor_workspace.prometheus.location
+  name                = "pe-ampls"
+  resource_group_name = azurerm_virtual_network.vnet.resource_group_name
+  location            = azurerm_virtual_network.vnet.location
   subnet_id           = azurerm_subnet.snet-pe.id
 
   private_service_connection {
diff --git a/85_prometheus_grafana_private_endpoint/prometheus.tf b/85_prometheus_grafana_private_endpoint/prometheus.tf
index fb81b89..95edde9 100644
--- a/85_prometheus_grafana_private_endpoint/prometheus.tf
+++ b/85_prometheus_grafana_private_endpoint/prometheus.tf
@@ -2,7 +2,7 @@ resource "azurerm_monitor_workspace" "prometheus" {
   name                          = var.prometheus_name
   resource_group_name           = azurerm_resource_group.rg_monitoring.name
   location                      = azurerm_resource_group.rg_monitoring.location
-  public_network_access_enabled = true # false # true
+  public_network_access_enabled = false # false # true
 }
 
 resource "azurerm_role_assignment" "role_monitoring_data_reader_me" {
diff --git a/85_prometheus_grafana_private_endpoint/variables.tf b/85_prometheus_grafana_private_endpoint/variables.tf
index 9892f06..f4d0003 100644
--- a/85_prometheus_grafana_private_endpoint/variables.tf
+++ b/85_prometheus_grafana_private_endpoint/variables.tf
@@ -5,22 +5,22 @@ variable "resources_location" {
 
 variable "rg_aks_cluster" {
   type    = string
-  default = "rg-aks-cluster2"
+  default = "rg-aks-cluster"
 }
 
 variable "rg_monitoring" {
   type    = string
-  default = "rg-monitoring2"
+  default = "rg-monitoring"
 }
 
 variable "aks_name" {
   type    = string
-  default = "aks-cluster2"
+  default = "aks-cluster"
 }
 
 variable "grafana_name" {
   type    = string
-  default = "azure-grafana-15"
+  default = "azure-grafana-17"
 }
 
 variable "prometheus_name" {