Skip to content

Commit 0e86bfd

Browse files
authored
Add support for memcaches (#564)
* vendor: update cortex Don't be blocked on cortexproject/cortex#1345 to be merged and still maintain the fork Signed-off-by: Goutham Veeramachaneni <[email protected]> * add memcached ksonnet Signed-off-by: Goutham Veeramachaneni <[email protected]> * commit generated proto Signed-off-by: Goutham Veeramachaneni <[email protected]>
1 parent 87d25fa commit 0e86bfd

29 files changed

+397
-263
lines changed

Gopkg.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

production/ksonnet/loki/config.libsonnet

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,44 @@
6767
gcs: {
6868
bucket_name: $._config.gcs_bucket_name,
6969
},
70+
71+
index_queries_cache_config: {
72+
memcached: {
73+
batch_size: 100,
74+
parallelism: 100,
75+
},
76+
77+
memcached_client: {
78+
host: 'memcached-index-queries.%s.svc.cluster.local' % $._config.namespace,
79+
service: 'memcached-client',
80+
},
81+
},
82+
},
83+
84+
chunk_store_config: {
85+
chunk_cache_config: {
86+
memcached: {
87+
batch_size: 100,
88+
parallelism: 100,
89+
},
90+
91+
memcached_client: {
92+
host: 'memcached.%s.svc.cluster.local' % $._config.namespace,
93+
service: 'memcached-client',
94+
},
95+
},
96+
97+
write_dedupe_cache_config: {
98+
memcached: {
99+
batch_size: 100,
100+
parallelism: 100,
101+
},
102+
103+
memcached_client: {
104+
host: 'memcached-index-writes.%s.svc.cluster.local' % $._config.namespace,
105+
service: 'memcached-client',
106+
},
107+
},
70108
},
71109

72110
schema_config: {

production/ksonnet/loki/jsonnetfile.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@
1919
}
2020
},
2121
"version": "master"
22+
},
23+
{
24+
"name": "memcached",
25+
"source": {
26+
"git": {
27+
"remote": "https://github.com/grafana/jsonnet-libs",
28+
"subdir": "memcached"
29+
}
30+
},
31+
"version": "master"
2232
}
2333
]
2434
}

production/ksonnet/loki/loki.libsonnet

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
(import 'config.libsonnet') +
55
(import 'consul/consul.libsonnet') +
66

7-
// Cortex services
7+
// Loki services
88
(import 'distributor.libsonnet') +
99
(import 'ingester.libsonnet') +
1010
(import 'querier.libsonnet') +
11-
(import 'table-manager.libsonnet')
11+
(import 'table-manager.libsonnet') +
12+
13+
// Supporting services
14+
(import 'memcached.libsonnet')
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
local memcached = 'memcached/memcached.libsonnet';
2+
3+
memcached {
4+
// Memcached instance used to cache chunks.
5+
memcached_chunks: $.memcached {
6+
name: 'memcached',
7+
max_item_size: '2m',
8+
memory_limit_mb: 4096,
9+
},
10+
11+
// Dedicated memcached instance used to temporarily cache index lookups.
12+
memcached_index_queries: $.memcached {
13+
name: 'memcached-index-queries',
14+
max_item_size: '5m',
15+
},
16+
17+
// Dedicated memcached instance used to dedupe writes to the index.
18+
memcached_index_writes: $.memcached {
19+
name: 'memcached-index-writes',
20+
},
21+
}

vendor/github.com/cortexproject/cortex/pkg/chunk/aws/dynamodb_storage_client.go

Lines changed: 13 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cortexproject/cortex/pkg/chunk/cache/background.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cortexproject/cortex/pkg/chunk/cache/cache.go

Lines changed: 30 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cortexproject/cortex/pkg/chunk/cache/diskcache.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)