Merge pull request 'Reflecting on the Loki config file change' (#23) from loki-update into main

Reviewed-on: #23

cookbooks/loki/files/etc/loki/loki-config.yml

@@ -2,44 +2,50 @@ auth_enabled: false
 
 server:
   http_listen_port: 3100
+  grpc_listen_port: 9096
 
-ingester:
+common:
-  lifecycler:
+  instance_addr: 127.0.0.1
-    address: 127.0.0.1
+  path_prefix: /var/opt/loki
+  storage:
+    filesystem:
+      chunks_directory: /var/opt/loki/chunks
+      rules_directory: /var/opt/loki/rules
+  replication_factor: 1
   ring:
     kvstore:
       store: inmemory
-      replication_factor: 1
+
-    final_sleep: 0s
+query_range:
-  chunk_idle_period: 5m
+  results_cache:
-  chunk_retain_period: 30s
+    cache:
-  max_transfer_retries: 0
+      embedded_cache:
+        enabled: true
+        max_size_mb: 100
 
 schema_config:
   configs:
-    - from: 2018-04-15
+    - from: 2020-10-24
-      store: boltdb
+      store: tsdb
       object_store: filesystem
-      schema: v11
+      schema: v13
       index:
         prefix: index_
-        period: 168h
+        period: 240h
 
-storage_config:
+frontend:
-  boltdb:
+  encoding: protobuf
-    directory: /var/opt/loki/index
 
-  filesystem:
+# By default, Loki will send anonymous, but uniquely-identifiable usage and configuration
-    directory: /var/opt/loki/chunks
+# analytics to Grafana Labs. These statistics are sent to https://stats.grafana.org/
+#
+# Statistics help us better understand how Loki is used, and they show us performance
+# levels for most users. This helps us prioritize features and documentation.
+# For more information on what's sent, look at
+# https://github.com/grafana/loki/blob/main/pkg/analytics/stats.go
+# Refer to the buildReport method to see what goes into a report.
+#
+# If you would like to disable reporting, uncomment the following lines:
+#analytics:
+#  reporting_enabled: false
 
-limits_config:
-  enforce_metric_name: false
-  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

cookbooks/loki/setup.rb

@@ -8,13 +8,11 @@
 end
 
 # Deploy `prometheus` files:
-template '/etc/loki/loki-config.yml' do
+remote_file '/etc/loki/loki-config.yml' do
   owner  'root'
   group  'root'
   mode   '644'
 
-  variables(ipaddr: node['loki']['ipaddr'])
-
   notifies :restart, 'service[loki]'
 end
 

cookbooks/loki/templates/etc/loki/loki-config.yml

@@ -1,45 +0,0 @@
-auth_enabled: false
-
-server:
-  http_listen_port: 3100
-
-ingester:
-  lifecycler:
-    address: 127.0.0.1
-    ring:
-      kvstore:
-        store: inmemory
-      replication_factor: 1
-    final_sleep: 0s
-  chunk_idle_period: 5m
-  chunk_retain_period: 30s
-  max_transfer_retries: 0
-
-schema_config:
-  configs:
-    - from: 2018-04-15
-      store: boltdb
-      object_store: filesystem
-      schema: v11
-      index:
-        prefix: index_
-        period: 168h
-
-storage_config:
-  boltdb:
-    directory: /var/opt/loki/index
-
-  filesystem:
-    directory: /var/opt/loki/chunks
-
-limits_config:
-  enforce_metric_name: false
-  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