lab done

Author: Gpshfrd

app_python/Dockerfile

@@ -1,21 +1,20 @@
-FROM python:3.13-slim
+FROM dockerhub.timeweb.cloud/library/python:3.13-slim
 
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 
-# Non-root user setup
-RUN useradd --create-home appuser
+RUN useradd --create-home appuser && \
+    mkdir -p /app/data /app/config && \
+    chown -R appuser:appuser /app
 
 WORKDIR /app
 
 COPY requirements.txt .
 
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy application code
 COPY app.py .
 
-#Swithh to non-root user
 USER appuser
 
 EXPOSE 8000

app_python/app.py

@@ -4,6 +4,8 @@
 import logging
 import sys
 import time
+import json
+from pathlib import Path
 from datetime import datetime, timezone
 from pythonjsonlogger import jsonlogger
 
@@ -21,6 +23,10 @@
 SERVICE_DESCRIPTION = "DevOps course info service"
 FRAMEWORK = "Flask"
 
+CONFIG_FILE_PATH = os.getenv("CONFIG_FILE_PATH", "/config/config.json")
+DATA_DIR = os.getenv("DATA_DIR", "/data")
+VISITS_FILE = Path(DATA_DIR) / "visits.txt"
+
 ### App and logging
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)
@@ -57,6 +63,87 @@
     "Number of HTTP requests in progress"
 )
 
+visits_total = Counter(
+    "visits_total",
+    "Total number of visits to the application"
+)
+
+def load_config_from_configmap():
+    """Load configuration from ConfigMap mounted file"""
+    default_config = {
+        "app_name": "DevOps Info Service",
+        "environment": "development",
+        "features": {
+            "visits_tracking": True,
+            "metrics_enabled": True
+        },
+        "log_level": "INFO",
+        "max_visits_display": 1000000,
+        "welcome_message": "Welcome to DevOps Info Service!"
+    }
+
+    try:
+        if os.path.exists(CONFIG_FILE_PATH):
+            with open(CONFIG_FILE_PATH, "r") as f:
+                config = json.load(f)
+                default_config.update(config)
+                logger.info("Configuration loaded from {CONFIG_FILE_PATH}")
+        else:
+            logger.warning(f"Config file {CONFIG_FILE_PATH} not found. Using default configuration.")
+    except Exception as e:
+        logger.error(f"Error loading config: {e}.")
+    return default_config
+
+APP_CONFIG = load_config_from_configmap()
+
+log_level = getattr(logging, APP_CONFIG.get("log_level", "INFO"))
+logger.setLevel(log_level)
+
+def read_visits():
+    """Read visit count from persistent file"""
+    try:
+        if VISITS_FILE.exists():
+            with open(VISITS_FILE, "r") as f:
+                content = f.read().strip()
+                if content:
+                    return int(content)
+    except (ValueError, IOError, OSError) as e:
+        logger.error(f"Error reading visits file: {e}")
+    return 0
+
+def write_visits(count):
+    """Write visit count to persistent file"""
+    try:
+        VISITS_FILE.parent.mkdir(parents=True, exist_ok=True)
+
+        temp_file = VISITS_FILE.with_suffix(".tmp")
+        with open(VISITS_FILE, "w") as f:
+            f.write(str(count))
+        temp_file.rename(VISITS_FILE)
+
+        logger.debug(f"Visits counter updated to {count}")
+
+    except Exception as e:
+        logger.error(f"Error writing visits file: {e}")
+
+def increment_visits():
+    """Increment visit counter and return new value"""
+    if not APP_CONFIG.get("features", {}).get("visits_tracking", True):
+        return 0
+    
+    current = read_visits()
+    new_count = current + 1
+    
+    max_visits = APP_CONFIG.get("max_visits_display", 1000000)
+    if new_count > max_visits:
+        new_count = max_visits
+    
+    write_visits(new_count)
+    
+    visits_total.inc()
+    
+    return new_count
+
 ### Helper functions
 
 def get_uptime():
@@ -82,7 +169,9 @@ def get_system_info():
 def index():
     uptime_seconds, uptime_human = get_uptime()
 
-    logger.info("Main endpoint accessed")
+    visit_count = increment_visits()
+
+    logger.info("Main endpoint accessed, visit #{visit_count}")
 
     response = {
         "service": {
@@ -98,28 +187,78 @@ def index():
             "current_time": datetime.now(timezone.utc).isoformat(),
             "timezone": "UTC"
         },
+        "visits": {
+            "total": visit_count,
+            "message": APP_CONFIG.get("welcome_message", "")
+        },
         "request": {
             "client_ip": request.remote_addr,
             "user_agent": request.headers.get("User-Agent"),
             "method": request.method,
             "path": request.path
         },
         "endpoints": [
-            {"path": "/", "method": "GET", "description": "Service information"},
-            {"path": "/health", "method": "GET", "description": "Health check"}
+            {"path": "/", "method": "GET", "description": "Service information with visit counter"},
+            {"path": "/health", "method": "GET", "description": "Health check"},
+            {"path": "/metrics", "method": "GET", "description": "Prometheus metrics"},
+            {"path": "/ready", "method": "GET", "description": "Readiness probe"},
+            {"path": "/visits", "method": "GET", "description": "Get current visit count"},
+            {"path": "/config", "method": "GET", "description": "Show current configuration"}
         ],
     }
 
     return jsonify(response)
 
+@app.route("/visits", methods=["GET"])
+def get_visits():
+    """Endpoint to get current visit count without incrementing"""
+    visit_count = read_visits()
+    
+    logger.info(f"Visits endpoint accessed, current count: {visit_count}")
+    
+    return jsonify({
+        "total_visits": visit_count,
+        "data_file": str(VISITS_FILE),
+        "tracking_enabled": APP_CONFIG.get("features", {}).get("visits_tracking", True)
+    })
+
+@app.route("/config", methods=["GET"])
+def show_config():
+    """Endpoint to show current configuration"""
+    safe_config = {
+        "app_name": APP_CONFIG.get("app_name"),
+        "environment": APP_CONFIG.get("environment"),
+        "features": APP_CONFIG.get("features"),
+        "log_level": APP_CONFIG.get("log_level"),
+        "data_dir": DATA_DIR,
+        "config_file": CONFIG_FILE_PATH
+    }
+
+    logger.info("Config endpoint accessed")
+    return jsonify(safe_config)
+
 @app.route("/health", methods=["GET"])
 def health():
     uptime_seconds, _ = get_uptime()
 
+    data_writable = False
+    try:
+        test_file = Path(DATA_DIR) / ".health_test"
+        test_file.write_text("test")
+        test_file.unlink()
+        data_writable = True
+    except Exception:
+        pass
+
     return jsonify({
         "status": "healthy",
         "timestamp": datetime.now(timezone.utc).isoformat(),
         "uptime_seconds": uptime_seconds,
+        "checks": {
+            "config_loaded": CONFIG_FILE_PATH if os.path.exists(CONFIG_FILE_PATH) else "default",
+            "data_writable": data_writable,
+            "visits_file_exists": VISITS_FILE.exists()
+        }
     })
 
 @app.route("/metrics", methods=["GET"])
@@ -134,6 +273,8 @@ def readiness():
         "timestamp": datetime.now(timezone.utc).isoformat(),
         "checks": {
             "app": "running",
+            "config": "loaded",
+            "data_directory": "available" if os.path.exists(DATA_DIR) else "creating",
             "dependencies": {
                 "database": "not_configured",
                 "cache": "not_configured"
@@ -217,14 +358,22 @@ def log_response(response):
 
 ### Entrypoint
 if __name__ == "__main__":
+    Path(DATA_DIR).mkdir(parents=True, exist_ok=True)
+    
     logger.info(
         "Application started",
         extra={
             "method": "-",
             "path": "-",
             "status": "-",
             "client_ip": "-",
-            "port": PORT
+            "port": PORT,
+            "config_file": CONFIG_FILE_PATH,
+            "data_dir": DATA_DIR
         }
     )
+    
+    initial_visits = read_visits()
+    logger.info(f"Initial visits count: {initial_visits}")
+    
     app.run(host=HOST, port=PORT, debug=DEBUG)