File proper-data-directories.patch of Package loki

Overview Repositories Revisions Requests Users Attributes Meta

File proper-data-directories.patch of Package loki (Revision 0cfe5741f92021893600e1a11a90accd)

Currently displaying revision 0cfe5741f92021893600e1a11a90accd , Show latest

Index: loki-3.1.1+git.1723126694.89fe788d/cmd/loki/loki-local-config.yaml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/cmd/loki/loki-local-config.yaml
+++ loki-3.1.1+git.1723126694.89fe788d/cmd/loki/loki-local-config.yaml
@@ -6,11 +6,11 @@ server:
 
 common:
   instance_addr: 127.0.0.1
-  path_prefix: /tmp/loki
+  path_prefix: /var/lib/loki
   storage:
     filesystem:
-      chunks_directory: /tmp/loki/chunks
-      rules_directory: /tmp/loki/rules
+      chunks_directory: /var/lib/loki/chunks
+      rules_directory: /var/lib/loki/rules
   replication_factor: 1
   ring:
     kvstore:
Index: loki-3.1.1+git.1723126694.89fe788d/docs/sources/operations/storage/filesystem.md
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/docs/sources/operations/storage/filesystem.md
+++ loki-3.1.1+git.1723126694.89fe788d/docs/sources/operations/storage/filesystem.md
@@ -13,7 +13,7 @@ Very simply it stores all the objects (c
 ```yaml
 storage_config:
   filesystem:
-    directory: /tmp/loki/
+    directory: /var/lib/loki/
 ```
 
 A folder is created for every tenant all the chunks for one tenant are stored in that directory.
Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-cloudflare.yaml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/clients/cmd/promtail/promtail-cloudflare.yaml
+++ loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-cloudflare.yaml
@@ -3,7 +3,7 @@ server:
   grpc_listen_port: 0
 
 positions:
-  filename: /tmp/positions.yaml
+  filename: /var/lib/promtail/positions.yaml
 
 clients:
   - url: http://localhost:3100/loki/api/v1/push
Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-docker-config.yaml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/clients/cmd/promtail/promtail-docker-config.yaml
+++ loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-docker-config.yaml
@@ -3,7 +3,7 @@ server:
   grpc_listen_port: 0
 
 positions:
-  filename: /tmp/positions.yaml
+  filename: /var/lib/promtail/positions.yaml
 
 clients:
   - url: http://loki:3100/loki/api/v1/push
Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-config.yaml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/clients/cmd/promtail/promtail-local-config.yaml
+++ loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-config.yaml
@@ -3,7 +3,7 @@ server:
   grpc_listen_port: 0
 
 positions:
-  filename: /tmp/positions.yaml
+  filename: /var/lib/promtail/positions.yaml
 
 clients:
   - url: http://localhost:3100/loki/api/v1/push
Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-limit-config.yaml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/clients/cmd/promtail/promtail-local-limit-config.yaml
+++ loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-limit-config.yaml
@@ -3,7 +3,7 @@ server:
   grpc_listen_port: 0
 
 positions:
-  filename: /tmp/positions.yaml
+  filename: /var/lib/promtail/positions.yaml
 
 clients:
   - url: http://localhost:3100/loki/api/v1/push
Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-pubsub-config.yaml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/clients/cmd/promtail/promtail-local-pubsub-config.yaml
+++ loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-pubsub-config.yaml
@@ -3,7 +3,7 @@ server:
   grpc_listen_port: 0
 
 positions:
-  filename: /tmp/positions.yaml
+  filename: /var/lib/promtail/positions.yaml
 
 clients:
   - url: http://localhost:3100/loki/api/v1/push
Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/config/build_test.go
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/operator/internal/manifests/internal/config/build_test.go
+++ loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/config/build_test.go
@@ -40,7 +40,7 @@ common:
     instance_port: 9095
 compactor:
   compaction_interval: 2h
-  working_directory: /tmp/loki/compactor
+  working_directory: /var/lib/loki/compactor
 frontend:
   tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100
   compress_responses: true
@@ -165,8 +165,8 @@ server:
   log_level: info
 storage_config:
   boltdb_shipper:
-    active_index_directory: /tmp/loki/index
-    cache_location: /tmp/loki/index_cache
+    active_index_directory: /var/lib/loki/index
+    cache_location: /var/lib/loki/index_cache
     cache_ttl: 24h
     resync_interval: 5m
     shared_store: s3
@@ -298,7 +298,7 @@ common:
     instance_port: 9095
 compactor:
   compaction_interval: 2h
-  working_directory: /tmp/loki/compactor
+  working_directory: /var/lib/loki/compactor
 frontend:
   tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100
   compress_responses: true
@@ -423,8 +423,8 @@ server:
   log_level: info
 storage_config:
   boltdb_shipper:
-    active_index_directory: /tmp/loki/index
-    cache_location: /tmp/loki/index_cache
+    active_index_directory: /var/lib/loki/index
+    cache_location: /var/lib/loki/index_cache
     cache_ttl: 24h
     resync_interval: 5m
     shared_store: s3
@@ -725,7 +725,7 @@ common:
     instance_port: 9095
 compactor:
   compaction_interval: 2h
-  working_directory: /tmp/loki/compactor
+  working_directory: /var/lib/loki/compactor
 frontend:
   tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100
   compress_responses: true
@@ -878,15 +878,15 @@ ruler:
         min_backoff: 30ms
         max_backoff: 100ms
   wal:
-    dir: /tmp/wal
+    dir: /var/lib/loki/wal
     truncate_frequency: 60m
     min_age: 5m
     max_age: 4h
-  rule_path: /tmp/loki
+  rule_path: /var/lib/loki
   storage:
     type: local
     local:
-      directory: /tmp/rules
+      directory: /var/lib/loki/rules
   ring:
     kvstore:
       store: memberlist
@@ -904,8 +904,8 @@ server:
   log_level: info
 storage_config:
   boltdb_shipper:
-    active_index_directory: /tmp/loki/index
-    cache_location: /tmp/loki/index_cache
+    active_index_directory: /var/lib/loki/index
+    cache_location: /var/lib/loki/index_cache
     cache_ttl: 24h
     resync_interval: 5m
     shared_store: s3
@@ -975,7 +975,7 @@ overrides:
 		},
 		Ruler: Ruler{
 			Enabled:               true,
-			RulesStorageDirectory: "/tmp/rules",
+			RulesStorageDirectory: "/var/lib/loki/rules",
 			EvaluationInterval:    "1m",
 			PollInterval:          "1m",
 			AlertManager: &AlertManagerConfig{
@@ -1084,7 +1084,7 @@ common:
     instance_port: 9095
 compactor:
   compaction_interval: 2h
-  working_directory: /tmp/loki/compactor
+  working_directory: /var/lib/loki/compactor
 frontend:
   tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100
   compress_responses: true
@@ -1237,15 +1237,15 @@ ruler:
         min_backoff: 30ms
         max_backoff: 100ms
   wal:
-    dir: /tmp/wal
+    dir: /var/lib/loki/wal
     truncate_frequency: 60m
     min_age: 5m
     max_age: 4h
-  rule_path: /tmp/loki
+  rule_path: /var/lib/loki
   storage:
     type: local
     local:
-      directory: /tmp/rules
+      directory: /var/lib/loki/rules
   ring:
     kvstore:
       store: memberlist
@@ -1263,8 +1263,8 @@ server:
   log_level: info
 storage_config:
   boltdb_shipper:
-    active_index_directory: /tmp/loki/index
-    cache_location: /tmp/loki/index_cache
+    active_index_directory: /var/lib/loki/index
+    cache_location: /var/lib/loki/index_cache
     cache_ttl: 24h
     resync_interval: 5m
     shared_store: s3
@@ -1334,7 +1334,7 @@ overrides:
 		},
 		Ruler: Ruler{
 			Enabled:               true,
-			RulesStorageDirectory: "/tmp/rules",
+			RulesStorageDirectory: "/var/lib/loki/rules",
 			EvaluationInterval:    "1m",
 			PollInterval:          "1m",
 			AlertManager: &AlertManagerConfig{
@@ -1444,7 +1444,7 @@ common:
     instance_port: 9095
 compactor:
   compaction_interval: 2h
-  working_directory: /tmp/loki/compactor
+  working_directory: /var/lib/loki/compactor
 frontend:
   tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100
   compress_responses: true
@@ -1610,15 +1610,15 @@ ruler:
         min_backoff: 30ms
         max_backoff: 100ms
   wal:
-    dir: /tmp/wal
+    dir: /var/lib/loki/wal
     truncate_frequency: 60m
     min_age: 5m
     max_age: 4h
-  rule_path: /tmp/loki
+  rule_path: /var/lib/loki
   storage:
     type: local
     local:
-      directory: /tmp/rules
+      directory: /var/lib/loki/rules
   ring:
     kvstore:
       store: memberlist
@@ -1636,8 +1636,8 @@ server:
   log_level: info
 storage_config:
   boltdb_shipper:
-    active_index_directory: /tmp/loki/index
-    cache_location: /tmp/loki/index_cache
+    active_index_directory: /var/lib/loki/index
+    cache_location: /var/lib/loki/index_cache
     cache_ttl: 24h
     resync_interval: 5m
     shared_store: s3
@@ -1707,7 +1707,7 @@ overrides:
 		},
 		Ruler: Ruler{
 			Enabled:               true,
-			RulesStorageDirectory: "/tmp/rules",
+			RulesStorageDirectory: "/var/lib/loki/rules",
 			EvaluationInterval:    "1m",
 			PollInterval:          "1m",
 			AlertManager: &AlertManagerConfig{
@@ -1834,7 +1834,7 @@ common:
     instance_port: 9095
 compactor:
   compaction_interval: 2h
-  working_directory: /tmp/loki/compactor
+  working_directory: /var/lib/loki/compactor
   retention_enabled: true
   retention_delete_delay: 4h
   retention_delete_worker_count: 50
@@ -1967,8 +1967,8 @@ server:
   log_level: info
 storage_config:
   boltdb_shipper:
-    active_index_directory: /tmp/loki/index
-    cache_location: /tmp/loki/index_cache
+    active_index_directory: /var/lib/loki/index
+    cache_location: /var/lib/loki/index_cache
     cache_ttl: 24h
     resync_interval: 5m
     shared_store: s3
@@ -2173,7 +2173,7 @@ common:
     instance_port: 9095
 compactor:
   compaction_interval: 2h
-  working_directory: /tmp/loki/compactor
+  working_directory: /var/lib/loki/compactor
 frontend:
   tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100
   compress_responses: true
@@ -2352,15 +2352,15 @@ ruler:
         min_backoff: 30ms
         max_backoff: 100ms
   wal:
-    dir: /tmp/wal
+    dir: /var/lib/loki/wal
     truncate_frequency: 60m
     min_age: 5m
     max_age: 4h
-  rule_path: /tmp/loki
+  rule_path: /var/lib/loki
   storage:
     type: local
     local:
-      directory: /tmp/rules
+      directory: /var/lib/loki/rules
   ring:
     kvstore:
       store: memberlist
@@ -2378,8 +2378,8 @@ server:
   log_level: info
 storage_config:
   boltdb_shipper:
-    active_index_directory: /tmp/loki/index
-    cache_location: /tmp/loki/index_cache
+    active_index_directory: /var/lib/loki/index
+    cache_location: /var/lib/loki/index_cache
     cache_ttl: 24h
     resync_interval: 5m
     shared_store: s3
@@ -2449,7 +2449,7 @@ overrides:
 		},
 		Ruler: Ruler{
 			Enabled:               true,
-			RulesStorageDirectory: "/tmp/rules",
+			RulesStorageDirectory: "/var/lib/loki/rules",
 			EvaluationInterval:    "1m",
 			PollInterval:          "1m",
 			AlertManager: &AlertManagerConfig{
@@ -2592,7 +2592,7 @@ common:
     instance_port: 9095
 compactor:
   compaction_interval: 2h
-  working_directory: /tmp/loki/compactor
+  working_directory: /var/lib/loki/compactor
 frontend:
   tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100
   tail_tls_config:
@@ -2767,8 +2767,8 @@ server:
   log_level: info
 storage_config:
   boltdb_shipper:
-    active_index_directory: /tmp/loki/index
-    cache_location: /tmp/loki/index_cache
+    active_index_directory: /var/lib/loki/index
+    cache_location: /var/lib/loki/index_cache
     cache_ttl: 24h
     resync_interval: 5m
     shared_store: s3
@@ -2938,7 +2938,7 @@ common:
     instance_port: 9095
 compactor:
   compaction_interval: 2h
-  working_directory: /tmp/loki/compactor
+  working_directory: /var/lib/loki/compactor
 frontend:
   tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100
   compress_responses: true
@@ -3117,15 +3117,15 @@ ruler:
         min_backoff: 30ms
         max_backoff: 100ms
   wal:
-    dir: /tmp/wal
+    dir: /var/lib/loki/wal
     truncate_frequency: 60m
     min_age: 5m
     max_age: 4h
-  rule_path: /tmp/loki
+  rule_path: /var/lib/loki
   storage:
     type: local
     local:
-      directory: /tmp/rules
+      directory: /var/lib/loki/rules
   ring:
     kvstore:
       store: memberlist
@@ -3143,8 +3143,8 @@ server:
   log_level: info
 storage_config:
   boltdb_shipper:
-    active_index_directory: /tmp/loki/index
-    cache_location: /tmp/loki/index_cache
+    active_index_directory: /var/lib/loki/index
+    cache_location: /var/lib/loki/index_cache
     cache_ttl: 24h
     resync_interval: 5m
     shared_store: s3
@@ -3290,7 +3290,7 @@ overrides:
 		},
 		Ruler: Ruler{
 			Enabled:               true,
-			RulesStorageDirectory: "/tmp/rules",
+			RulesStorageDirectory: "/var/lib/loki/rules",
 			EvaluationInterval:    "1m",
 			PollInterval:          "1m",
 
Index: loki-3.1.1+git.1723126694.89fe788d/clients/pkg/promtail/promtail_test.go
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/clients/pkg/promtail/promtail_test.go
+++ loki-3.1.1+git.1723126694.89fe788d/clients/pkg/promtail/promtail_test.go
@@ -55,7 +55,7 @@ func TestPromtail(t *testing.T) {
 	util_log.Logger = logger
 
 	testutils.InitRandom()
-	dirName := filepath.Join(os.TempDir(), "/promtail_test_"+testutils.RandName())
+	dirName := "/var/lib/promtail_test_" + randName()
 	positionsFileName := dirName + "/positions.yml"
 
 	err := os.MkdirAll(dirName, 0o750)
Index: loki-3.1.1+git.1723126694.89fe788d/operator/docs/enhancements/ruler_support.md
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/operator/docs/enhancements/ruler_support.md
+++ loki-3.1.1+git.1723126694.89fe788d/operator/docs/enhancements/ruler_support.md
@@ -769,7 +769,7 @@ spec:
         volumeMounts:
         - name: "rules"
           volume: "rules"
-          path: "/tmp/rules"
+          path: "/var/lib/loki/rules"
       volumes:
       - name: "rules"
         items:
@@ -786,7 +786,7 @@ spec:
 In turn the rules directory is outlined as such:
 
 ```
-/tmp/rules/application/ns-a-alerting-rule-a-kube-uid-a.yaml
+/var/lib/loki/rules/application/ns-a-alerting-rule-a-kube-uid-a.yaml
           /application/ns-a-recording-rule-a-kube-uid-b.yaml
           /infrastructure/ns-b-alerting-rule-b-kube-uid-c.yaml
           /infrastructure/ns-b-recording-rule-b-kube-uid-d.yaml
Index: loki-3.1.1+git.1723126694.89fe788d/pkg/logcli/client/file_test.go
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/pkg/logcli/client/file_test.go
+++ loki-3.1.1+git.1723126694.89fe788d/pkg/logcli/client/file_test.go
@@ -20,8 +20,8 @@ func TestFileClient_QueryRangeLogQueries
 	input := []string{
 		`level=info event="loki started" caller=main.go ts=1625995076`,
 		`level=info event="runtime loader started" caller=main.go ts=1625995077`,
-		`level=error event="unable to read rules directory" file="/tmp/rules" caller=rules.go ts=1625995090`,
-		`level=error event="failed to apply wal" error="/tmp/wal/ corrupted" caller=wal.go ts=1625996090`,
+		`level=error event="unable to read rules directory" file="/var/lib/loki/rules" caller=rules.go ts=1625995090`,
+		`level=error event="failed to apply wal" error="/var/lib/loki/wal/ corrupted" caller=wal.go ts=1625996090`,
 		`level=info event="loki ready" caller=main.go ts=1625996095`,
 	}
 
@@ -92,8 +92,8 @@ func TestFileClient_Query(t *testing.T)
 	input := []string{
 		`level=info event="loki started" caller=main.go ts=1625995076`,
 		`level=info event="runtime loader started" caller=main.go ts=1625995077`,
-		`level=error event="unable to read rules directory" file="/tmp/rules" caller=rules.go ts=1625995090`,
-		`level=error event="failed to apply wal" error="/tmp/wal/ corrupted" caller=wal.go ts=1625996090`,
+		`level=error event="unable to read rules directory" file="/var/lib/loki/rules" caller=rules.go ts=1625995090`,
+		`level=error event="failed to apply wal" error="/var/lib/loki/wal/ corrupted" caller=wal.go ts=1625996090`,
 		`level=info event="loki ready" caller=main.go ts=1625996095`,
 	}
 
Index: loki-3.1.1+git.1723126694.89fe788d/pkg/loki/config_wrapper_test.go
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/pkg/loki/config_wrapper_test.go
+++ loki-3.1.1+git.1723126694.89fe788d/pkg/loki/config_wrapper_test.go
@@ -561,15 +561,15 @@ memberlist:
 			fsConfig := `common:
   storage:
     filesystem:
-      chunks_directory: /tmp/chunks
-      rules_directory: /tmp/rules`
+      chunks_directory: /var/lib/loki/chunks
+      rules_directory: /var/lib/loki/rules`
 
 			config, defaults := testContext(fsConfig, nil)
 
 			assert.Equal(t, "local", config.Ruler.StoreConfig.Type)
 
-			assert.Equal(t, "/tmp/rules", config.Ruler.StoreConfig.Local.Directory)
-			assert.Equal(t, "/tmp/chunks", config.StorageConfig.FSConfig.Directory)
+			assert.Equal(t, "/var/lib/loki/rules", config.Ruler.StoreConfig.Local.Directory)
+			assert.Equal(t, "/var/lib/loki/chunks", config.StorageConfig.FSConfig.Directory)
 
 			// should remain empty
 			assert.EqualValues(t, defaults.Ruler.StoreConfig.GCS, config.Ruler.StoreConfig.GCS)
Index: loki-3.1.1+git.1723126694.89fe788d/pkg/loki/loki_test.go
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/pkg/loki/loki_test.go
+++ loki-3.1.1+git.1723126694.89fe788d/pkg/loki/loki_test.go
@@ -187,7 +187,7 @@ server:
   grpc_listen_port: %d
 common:
   compactor_address: http://localhost:%d
-  path_prefix: /tmp/loki
+  path_prefix: /var/lib/loki
   ring:
     kvstore:
       store: inmemory
Index: loki-3.1.1+git.1723126694.89fe788d/production/ksonnet/loki/config.libsonnet
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/production/ksonnet/loki/config.libsonnet
+++ loki-3.1.1+git.1723126694.89fe788d/production/ksonnet/loki/config.libsonnet
@@ -374,7 +374,7 @@
       },
 
       ruler: if $._config.ruler_enabled then {
-        rule_path: '/tmp/rules',
+        rule_path: '/var/lib/loki/rules',
         enable_api: true,
         alertmanager_url: 'http://alertmanager.%s.svc.cluster.local/alertmanager' % $._config.namespace,
         enable_sharding: true,
Index: loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki-distributed/config.yml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/production/nomad/loki-distributed/config.yml
+++ loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki-distributed/config.yml
@@ -113,7 +113,7 @@ ruler:
   enable_alertmanager_v2: true
   enable_api: true
   external_url: https://loki-ruler.service.consul
-  rule_path: {{ env "NOMAD_ALLOC_DIR" }}/tmp/rules
+  rule_path: {{ env "NOMAD_ALLOC_DIR" }}/var/lib/loki/rules
   storage:
     type: local
     local:
Index: loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki-simple/config.yml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/production/nomad/loki-simple/config.yml
+++ loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki-simple/config.yml
@@ -64,7 +64,7 @@ ruler:
   enable_alertmanager_v2: true
   enable_api: true
   external_url: https://loki.service.consul
-  rule_path: {{ env "NOMAD_ALLOC_DIR" }}/tmp/rules
+  rule_path: {{ env "NOMAD_ALLOC_DIR" }}/var/lib/loki/rules
   storage:
     type: local
     local:
Index: loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki/config.yml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/production/nomad/loki/config.yml
+++ loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki/config.yml
@@ -64,7 +64,7 @@ ruler:
   enable_alertmanager_v2: true
   enable_api: true
   external_url: https://loki.service.consul
-  rule_path: {{ env "NOMAD_ALLOC_DIR" }}/tmp/rules
+  rule_path: {{ env "NOMAD_ALLOC_DIR" }}/var/lib/loki/rules
   storage:
     type: local
     local:
Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-journal.yaml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/clients/cmd/promtail/promtail-journal.yaml
+++ loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-journal.yaml
@@ -3,7 +3,7 @@ server:
   grpc_listen_port: 0
 
 positions:
-  filename: /tmp/positions.yaml
+  filename: /var/lib/promtail/positions.yaml
 
 clients:
   - url: http://localhost:3100/loki/api/v1/push
Index: loki-3.1.1+git.1723126694.89fe788d/docs/sources/operations/troubleshooting.md
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/docs/sources/operations/troubleshooting.md
+++ loki-3.1.1+git.1723126694.89fe788d/docs/sources/operations/troubleshooting.md
@@ -35,7 +35,7 @@ Promtail yet. There may be one of many r
   them off. Here is what you can do:
     - Start Promtail after Loki, e.g., 60 seconds later.
     - To force Promtail to re-send log messages, delete the positions file
-      (default location `/tmp/positions.yaml`).
+      (default location `/var/lib/promtail/positions.yaml`).
 - Promtail is ignoring targets and isn't reading any logs because of a
   configuration issue.
     - This can be detected by turning on debug logging in Promtail and looking
Index: loki-3.1.1+git.1723126694.89fe788d/examples/promtail-heroku/config.yml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/examples/promtail-heroku/config.yml
+++ loki-3.1.1+git.1723126694.89fe788d/examples/promtail-heroku/config.yml
@@ -4,7 +4,7 @@ server:
   log_level: "info"
 
 positions:
-  filename: /tmp/positions.yaml
+  filename: /var/lib/promtail/positions.yaml
 
 # This bit indicates what Loki instance to write the logs to. We’ll inject the
 # details and credentials through environment variables
Index: loki-3.1.1+git.1723126694.89fe788d/operator/hack/addons_dev.yaml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/operator/hack/addons_dev.yaml
+++ loki-3.1.1+git.1723126694.89fe788d/operator/hack/addons_dev.yaml
@@ -87,7 +87,7 @@ spec:
           volumeMounts:
             - mountPath: /etc/promtail
               name: config
-            - mountPath: /tmp/promtail
+            - mountPath: /var/lib/promtail
               name: run
             - mountPath: /var/lib/docker/containers
               name: docker
@@ -151,7 +151,7 @@ data:
         batchwait: 10s
         timeout: 10s
     positions:
-      filename: /tmp/promtail/positions.yaml
+      filename: /var/lib/promtail/positions.yaml
     server:
       http_listen_port: 3100
       grpc_listen_port: 9095
Index: loki-3.1.1+git.1723126694.89fe788d/operator/hack/addons_ocp.yaml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/operator/hack/addons_ocp.yaml
+++ loki-3.1.1+git.1723126694.89fe788d/operator/hack/addons_ocp.yaml
@@ -84,7 +84,7 @@ spec:
           volumeMounts:
             - mountPath: /etc/promtail
               name: config
-            - mountPath: /tmp/promtail
+            - mountPath: /var/lib/promtail
               name: run
             - mountPath: /var/lib/docker/containers
               name: docker
@@ -147,7 +147,7 @@ data:
         batchwait: 10s
         timeout: 10s
     positions:
-      filename: /tmp/promtail/positions.yaml
+      filename: /var/lib/promtail/positions.yaml
     server:
       http_listen_port: 3100
       grpc_listen_port: 9095
Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/var.go
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/operator/internal/manifests/var.go
+++ loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/var.go
@@ -47,9 +47,9 @@ const (
 	storageVolumeName      = "storage"
 	rulePartsSeparator     = "___"
 
-	walDirectory          = "/tmp/wal"
-	dataDirectory         = "/tmp/loki"
-	rulesStorageDirectory = "/tmp/rules"
+	walDirectory          = "/var/lib/loki/wal"
+	dataDirectory         = "/var/lib/loki"
+	rulesStorageDirectory = "/var/lib/loki/rules"
 
 	rulerContainerName = "loki-ruler"
 
Index: loki-3.1.1+git.1723126694.89fe788d/pkg/storage/hack/main.go
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/pkg/storage/hack/main.go
+++ loki-3.1.1+git.1723126694.89fe788d/pkg/storage/hack/main.go
@@ -36,7 +36,7 @@ var (
 func main() {
 	cm := storage.NewClientMetrics()
 	defer cm.Unregister()
-	if _, err := os.Stat("/tmp/benchmark/chunks"); os.IsNotExist(err) {
+	if _, err := os.Stat("/var/lib/loki/benchmark/chunks"); os.IsNotExist(err) {
 		if err := fillStore(cm); err != nil {
 			log.Fatal("error filling up storage:", err)
 		}
@@ -45,8 +45,8 @@ func main() {
 
 func getStore(cm storage.ClientMetrics) (storage.Store, *config.SchemaConfig, error) {
 	storeConfig := storage.Config{
-		BoltDBConfig: local.BoltDBConfig{Directory: "/tmp/benchmark/index"},
-		FSConfig:     local.FSConfig{Directory: "/tmp/benchmark/chunks"},
+		BoltDBConfig: local.BoltDBConfig{Directory: "/var/lib/loki/benchmark/index"},
+		FSConfig:     local.FSConfig{Directory: "/var/lib/loki/benchmark/chunks"},
 	}
 
 	schemaCfg := config.SchemaConfig{
Index: loki-3.1.1+git.1723126694.89fe788d/pkg/storage/store_test.go
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/pkg/storage/store_test.go
+++ loki-3.1.1+git.1723126694.89fe788d/pkg/storage/store_test.go
@@ -51,7 +51,7 @@ var (
 	m          runtime.MemStats
 	ctx        = user.InjectOrgID(context.Background(), "fake")
 	cm         = NewClientMetrics()
-	chunkStore = getLocalStore("/tmp/benchmark/", cm)
+	chunkStore = getLocalStore("/var/lib/loki/benchmark/", cm)
 )
 
 // go test -bench=. -benchmem -memprofile memprofile.out -cpuprofile profile.out
@@ -105,7 +105,7 @@ func Benchmark_store_SelectLogsBackward(
 	})
 }
 
-// rm -Rf /tmp/benchmark/chunks/ /tmp/benchmark/index
+// rm -Rf /var/lib/loki/benchmark/chunks/ /var/lib/loki/benchmark/index
 // go run  -mod=vendor ./pkg/storage/hack/main.go
 // go test -benchmem -run=^$ -mod=vendor  ./pkg/storage -bench=Benchmark_store_SelectSample   -memprofile memprofile.out -cpuprofile cpuprofile.out
 func Benchmark_store_SelectSample(b *testing.B) {
Index: loki-3.1.1+git.1723126694.89fe788d/vendor/github.com/baidubce/bce-sdk-go/util/log/logger.go
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/vendor/github.com/baidubce/bce-sdk-go/util/log/logger.go
+++ loki-3.1.1+git.1723126694.89fe788d/vendor/github.com/baidubce/bce-sdk-go/util/log/logger.go
@@ -18,7 +18,7 @@
 // log to file with rotating. It is safe to be called by multiple goroutines.
 // By using the package level function to use the default logger:
 //     log.SetLogHandler(log.STDOUT | log.FILE) // default is log to stdout
-//     log.SetLogDir("/tmp")                    // default is /tmp
+//     log.SetLogDir("/var/lib/loki")                    // default is /var/lib/loki
 //     log.SetRotateType(log.ROTATE_DAY)        // default is log.HOUR
 //     log.SetRotateSize(1 << 30)               // default is 1GB
 //     log.SetLogLevel(log.INFO)                // default is log.DEBUG
@@ -67,7 +67,7 @@ const (
 
 	DEFAULT_ROTATE_TYPE           = ROTATE_HOUR
 	DEFAULT_ROTATE_SIZE     int64 = 1 << 30
-	DEFAULT_LOG_DIR               = "/tmp"
+	DEFAULT_LOG_DIR               = "/var/lib/loki"
 	ROTATE_SIZE_FILE_PREFIX       = "rotating"
 )
 
Index: loki-3.1.1+git.1723126694.89fe788d/examples/getting-started/loki-config.yaml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/examples/getting-started/loki-config.yaml
+++ loki-3.1.1+git.1723126694.89fe788d/examples/getting-started/loki-config.yaml
@@ -22,7 +22,7 @@ schema_config:
         prefix: index_
         period: 24h
 common:
-  path_prefix: /loki
+  path_prefix: /var/lib/loki
   replication_factor: 1
   compactor_address: http://backend:3100
   storage:
@@ -42,4 +42,4 @@ ruler:
       bucketnames: loki-ruler
 
 compactor:
-  working_directory: /tmp/compactor
\ No newline at end of file
+  working_directory: /var/lib/loki/compactor
Index: loki-3.1.1+git.1723126694.89fe788d/production/docker/config/loki.yaml
===================================================================
--- loki-3.1.1+git.1723126694.89fe788d.orig/production/docker/config/loki.yaml
+++ loki-3.1.1+git.1723126694.89fe788d/production/docker/config/loki.yaml
@@ -8,7 +8,7 @@ server:
   log_level: info
 
 common:
-  path_prefix: /loki
+  path_prefix: /var/lib/loki
   compactor_address: http://loki-backend:3100
   replication_factor: 3
 
@@ -42,7 +42,7 @@ ingester:
   chunk_idle_period: 1m
   wal:
     enabled: true
-    dir: /loki/wal
+    dir: /var/lib/loki/wal
   max_chunk_age: 1m
   chunk_retain_period: 30s
   chunk_encoding: snappy
@@ -54,7 +54,7 @@ ruler:
   enable_api: true
   enable_sharding: true  
   wal:
-    dir: /loki/ruler-wal
+    dir: /var/lib/loki/ruler-wal
   evaluation:
     mode: remote
     query_frontend:
@@ -62,8 +62,8 @@ ruler:
   storage:
     type: local
     local:
-      directory: /loki/rules
-  rule_path: /loki/prom-rules
+      directory: /var/lib/loki/rules
+  rule_path: /var/lkib/loki/prom-rules
   remote_write:
     enabled: true
     clients:
@@ -139,4 +139,4 @@ querier:
   query_ingesters_within: 2h
 
 compactor:
-  working_directory: /tmp/compactor
+  working_directory: /var/lib/loki/compactor

Places

File proper-data-directories.patch of Package loki (Revision 0cfe5741f92021893600e1a11a90accd)

Places