Skip to content

Commit

Permalink
update collection version for bodsch.core
Browse files Browse the repository at this point in the history
  • Loading branch information
bodsch committed Jul 11, 2024
1 parent 3ab1bce commit b32b447
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dashboards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
image:
- debian:12
ansible-version:
- '6.7'
- '8.5'
python_version:
- "3.11"
scenario:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/grafana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
image:
- debian:12
ansible-version:
- '6.7'
- '8.5'
python_version:
- "3.11"
scenario:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/grafana_with_configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
image:
- debian:12
ansible-version:
- '6.7'
- '8.5'
python_version:
- "3.11"
scenario:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/loki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
image:
- debian:12
ansible-version:
- '6.7'
- '8.5'
python_version:
- "3.11"
scenario:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/loki_with_configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
image:
- debian:12
ansible-version:
- '6.7'
- '8.5'
python_version:
- "3.11"
scenario:
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@ jobs:
image:
- debian:12
ansible-version:
- '6.7'
#- '7.5'
#- '8.5'
- '8.5'
python_version:
- "3.10"
- "3.11"
Expand Down Expand Up @@ -155,9 +153,7 @@ jobs:
- ubuntu:20.04
- ubuntu:22.04
ansible-version:
- '6.7'
#- '7.5'
#- '8.5'
- '8.5'
python_version:
- "3.10"
- "3.11"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promtail.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
image:
- debian:12
ansible-version:
- '6.7'
- '8.5'
python_version:
- "3.11"
scenario:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promtail_with_configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
image:
- debian:12
ansible-version:
- '6.7'
- '8.5'
python_version:
- "3.11"
scenario:
Expand Down
6 changes: 6 additions & 0 deletions collections.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---

collections:
- name: bodsch.core
version: "=>2.2.1"
- name: bodsch.scm
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ tags:
- observability

dependencies:
bodsch.core: ">=1.1.4"
bodsch.core: ">=2.2.1"
bodsch.scm: "*"

repository: https://github.com/bodsch/ansible-collection-grafana
Expand Down
39 changes: 33 additions & 6 deletions roles/loki/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,20 +170,47 @@ loki_defaults_config_index_gateway: {}
loki_defaults_config_frontend: {}

loki_defaults_config_storage:
index_cache_validity: 5m
disable_broad_index_queries: false
max_chunk_batch_size: 50
index_queries_cache_config: {}
alibabacloud: {}
azure: {}
bos: {}
# Deprecated
bigtable: {}
gcs: {}
cassandra: {}
# Deprecated
boltdb:
directory: "{{ loki_storage_dir }}/index"
boltdb_shipper:
active_index_directory: "{{ loki_storage_dir }}/boltdb-shipper-active"
cache_location: "{{ loki_storage_dir }}/boltdb-shipper-cache"
# Can be increased for faster performance over longer query periods, uses more disk space
cache_ttl: 24h
resync_interval: 5m
query_ready_num_days: 0
shared_store: filesystem
boltdb:
directory: "{{ loki_storage_dir }}/index"
index_gateway_client:
grpc_client_config: ""
server_address: ""
log_gateway_requests: ""
ingestername: ""
mode: ""
ingesterdbretainperiod: ""
build_per_tenant_index: ""
filesystem:
directory: "{{ loki_storage_dir }}/chunks"
swift: {}
# Deprecated
grpc_store: {}
hedging: {}
named_stores: {}
cos: {}
index_cache_validity: 5m
disable_broad_index_queries: false
max_chunk_batch_size: 50
index_queries_cache_config: {}
congestion_control: {}
tsdb_shipper: {}
bloom_shipper: {}

loki_defaults_config_chunk_store: {}
# max_look_back_period: 672h
Expand Down
1 change: 1 addition & 0 deletions roles/promtail/collections.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@

collections:
- name: bodsch.core
version: "=>2.2.1"
- name: bodsch.scm

0 comments on commit b32b447

Please sign in to comment.