Lab10

Vagrantfile

@@ -1,6 +1,6 @@
 Vagrant.configure("2") do |config|
   config.vm.box = "ubuntu/jammy64"
-  config.vm.hostname = "lab05"
+  config.vm.hostname = "lab09"
 
   # Disable project folder sharing inside the VM.
   # This avoids common Windows path issues (spaces, Cyrillic characters)
@@ -14,11 +14,14 @@ Vagrant.configure("2") do |config|
   config.vm.network "forwarded_port", guest: 3000, host: 3000, host_ip: "0.0.0.0", id: "grafana", auto_correct: true
   config.vm.network "forwarded_port", guest: 3100, host: 3100, host_ip: "0.0.0.0", id: "loki", auto_correct: true
   config.vm.network "forwarded_port", guest: 9080, host: 9080, host_ip: "0.0.0.0", id: "promtail", auto_correct: true
+  config.vm.network "forwarded_port", guest: 9090, host: 9090, host_ip: "0.0.0.0", id: "prometheus", auto_correct: true
+  config.vm.network "forwarded_port", guest: 30080, host: 30080, host_ip: "0.0.0.0", id: "k8s-app1", auto_correct: true
+  config.vm.network "forwarded_port", guest: 30081, host: 30081, host_ip: "0.0.0.0", id: "k8s-app2", auto_correct: true
 
   config.ssh.insert_key = true
 
   config.vm.provider "virtualbox" do |vb|
-    vb.name = "lab07-monitoring"
+    vb.name = "lab09"
     vb.memory = 3072
     vb.cpus = 2
   end

ansible/roles/monitoring/defaults/main.yml

@@ -5,23 +5,31 @@ monitoring_compose_project_name: devops-monitoring
 monitoring_loki_version: "3.0.0"
 monitoring_promtail_version: "3.0.0"
 monitoring_grafana_version: "12.3.1"
+monitoring_prometheus_version: "v3.9.0"
 
 monitoring_loki_port: 3100
 monitoring_promtail_port: 9080
 monitoring_grafana_port: 3000
+monitoring_prometheus_port: 9090
 monitoring_app_port: 8000
 monitoring_app_internal_port: 8000
 
 monitoring_loki_retention_period: "168h"
+monitoring_prometheus_retention_days: 15
+monitoring_prometheus_retention_size: "10GB"
+monitoring_prometheus_scrape_interval: "15s"
+
 monitoring_grafana_admin_user: admin
-monitoring_grafana_admin_password: ChangeMe_Lab07!
-monitoring_grafana_datasource_uid: loki
-monitoring_grafana_datasource_name: Loki
+monitoring_grafana_admin_password: ChangeMe_Lab08!
+monitoring_loki_datasource_uid: loki
+monitoring_loki_datasource_name: Loki
+monitoring_prometheus_datasource_uid: prometheus
+monitoring_prometheus_datasource_name: Prometheus
 
 monitoring_app_service_name: app-python
 monitoring_app_container_name: devops-python
 monitoring_app_label: devops-python
-monitoring_app_image: devops-info-service:lab07
+monitoring_app_image: devops-info-service:lab08
 monitoring_app_source_dir: "{{ playbook_dir }}/../../app_python"
 monitoring_app_source_files:
   - .dockerignore
@@ -33,16 +41,36 @@ monitoring_app_env:
   PORT: "{{ monitoring_app_internal_port | string }}"
   DEBUG: "false"
 
+monitoring_prometheus_targets:
+  - job: prometheus
+    targets:
+      - localhost:9090
+  - job: app
+    targets:
+      - "{{ monitoring_app_service_name }}:{{ monitoring_app_internal_port }}"
+    path: /metrics
+  - job: loki
+    targets:
+      - loki:3100
+    path: /metrics
+  - job: grafana
+    targets:
+      - grafana:3000
+    path: /metrics
+
 monitoring_resource_limits:
   loki:
     limits: { cpus: '1.0', memory: 1G }
     reservations: { cpus: '0.25', memory: 256M }
   promtail:
-    limits: { cpus: '0.75', memory: 512M }
+    limits: { cpus: '0.5', memory: 512M }
     reservations: { cpus: '0.10', memory: 128M }
   grafana:
+    limits: { cpus: '0.5', memory: 512M }
+    reservations: { cpus: '0.10', memory: 128M }
+  prometheus:
     limits: { cpus: '1.0', memory: 1G }
     reservations: { cpus: '0.25', memory: 256M }
   app_python:
-    limits: { cpus: '0.75', memory: 512M }
+    limits: { cpus: '0.5', memory: 256M }
     reservations: { cpus: '0.10', memory: 128M }