changes

nixos-modules/services/monitoring.nix

@@ -25,68 +25,28 @@ in
           http_listen_port: 3100
           grpc_listen_port: 9096
         
-        ingester:
-          wal:
-            enabled: true
-            dir: /tmp/wal
-          lifecycler:
-            address: 127.0.0.1
-            ring:
-              kvstore:
-                store: inmemory
-              replication_factor: 1
-            final_sleep: 0s
-          chunk_idle_period: 1h       # Any chunk not receiving new logs in this time will be flushed
-          max_chunk_age: 1h           # All chunks will be flushed when they hit this age, default is 1h
-          chunk_target_size: 1048576  # Loki will attempt to build chunks up to 1.5MB, flushing first if chunk_idle_period or max_chunk_age is reached first
-          chunk_retain_period: 30s    # Must be greater than index read cache TTL if using an index cache (Default index read cache TTL is 5m)
-          max_transfer_retries: 0     # Chunk transfers disabled
+        common:
+          ring:
+            instance_addr: 127.0.0.1
+            kvstore:
+              store: inmemory
+          replication_factor: 1
+          path_prefix: /tmp/loki
         
         schema_config:
           configs:
-            - from: 2020-10-24
-              store: boltdb-shipper
-              object_store: filesystem
-              schema: v11
-              index:
-                prefix: index_
-                period: 24h
-        
-        storage_config:
-          boltdb_shipper:
-            active_index_directory: /tmp/loki/boltdb-shipper-active
-            cache_location: /tmp/loki/boltdb-shipper-cache
-            cache_ttl: 4h         # Can be increased for faster performance over longer query periods, uses more disk space
-            shared_store: filesystem
-          filesystem:
-            directory: /tmp/loki/chunks
-        
-        compactor:
-          working_directory: /tmp/loki/boltdb-shipper-compactor
-          shared_store: filesystem
-        
-        limits_config:
-          reject_old_samples: true
-          reject_old_samples_max_age: 168h
-        
-        chunk_store_config:
-          max_look_back_period: 0s
-        
-        table_manager:
-          retention_deletes_enabled: false
-          retention_period: 0s
-        
+          - from: 2020-05-15
+            store: boltdb-shipper
+            object_store: filesystem
+            schema: v11
+            index:
+              prefix: index_
+              period: 24h
+
         ruler:
-          storage:
-            type: local
-            local:
-              directory: /tmp/loki/rules
-          rule_path: /tmp/loki/rules-temp
           alertmanager_url: http://localhost:9093
-          ring:
-            kvstore:
-              store: inmemory
-          enable_api: true
+        analytics:
+          reporting_enabled: false
       '';
       services.prometheus = {
         enable = true;
@@ -116,6 +76,8 @@ in
       services.prometheus.exporters.smokeping.hosts = [ "1.1.1.1" ];
     }
     (mkIf (builtins.elem hostName cfg.promtail.hosts) {
+      systemd.services.promtail.serviceConfig.SupplementaryGroups = lib.optional config.services.nginx.enable [ "nginx" ];
+      systemd.services.promtail.serviceConfig.ReadWritePaths = [ "/var/log/nginx" ];
       services.promtail = {
         enable = true;
         configuration = {
@@ -137,6 +99,45 @@ in
                 target_label = "unit";
               }];
             }
+          ] ++ lib.optionals config.services.nginx.enable [
+            {
+              job_name = "nginx";
+              static_configs = [
+                {
+                  targets = [ "localhost" ];
+                  labels = {
+                    job = "nginx";
+                    __path__ = "/var/log/nginx/access.log";
+                    host = hostName;
+                  };
+                }
+              ];
+              pipeline_stages = [
+                {
+                  regex = {
+                    expression = ''(?P<remote_addr>.+) - - \[(?P<time_local>.+)\] "(?P<method>.+) (?P<url>.+) (HTTP\/(?P<version>\d.\d))" (?P<status>\d{3}) (?P<body_bytes_sent>\d+) (["](?P<http_referer>(\-)|(.+))["]) (["](?P<http_user_agent>.+)["])'';
+                  };
+                }
+                {
+                  labels = {
+                    remote_addr = null;
+                    time_local = null;
+                    method = null;
+                    url = null;
+                    status = null;
+                    body_bytes_sent = null;
+                    http_referer = null;
+                    http_user_agent = null;
+                  };
+                }
+                {
+                  timestamp = {
+                    source = "time_local";
+                    format = "02/Jan/2006:15:04:05 -0700";
+                  };
+                }
+              ];
+            }
           ];
         };
       };

nixos-modules/system/persist.nix

@@ -12,9 +12,13 @@ in
     type = lib.types.listOf lib.types.str;
     default = [ ];
   };
+  options.ragon.persist.baseDir = lib.mkOption {
+    type = lib.types.str;
+    default = "/persistent";
+  };
   config = lib.mkIf cfg.enable {
 
-    environment.persistence."/persistent" = {
+    environment.persistence.${cfg.baseDir} = {
       directories = [
         "/etc/nixos"
         "/etc/NetworkManager/system-connections"