Update cortex and add support for multiple modules (#8)

* Update cortex and add support for multiple modules

Add support for by explictely specifying a target in the servcies
config. cortexproject/cortex#3275

Signed-off-by: Julien Pivotto <[email protected]>

Author: roidelapluie

.travis.yml

@@ -8,9 +8,9 @@ cache: pip
 services:
   - docker
 env:
-  - ANSIBLE=2.7
   - ANSIBLE=2.8
   - ANSIBLE=2.9
+  - ANSIBLE=2.10
 install:
   - pip3 install tox-travis git-semver
 script:

.yamllint

@@ -1,8 +1,10 @@
+---
 extends: default
 ignore: |
   .travis/
   .travis.yml
   .github/
+  .tox/
   meta/
 
 rules:

defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-cortex_version: 1.4.0
+cortex_version: 1.5.0
 cortex_all_in_one: true
 
 cortex_web_listen_address: "0.0.0.0:9009"

molecule/alternative/molecule.yml

@@ -3,8 +3,11 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+  flake8
 platforms:
   - name: bionic
     image: quay.io/paulfantom/molecule-systemd:ubuntu-18.04
@@ -69,6 +72,3 @@ scenario:
   name: alternative
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: true

molecule/default/destroy.yml

@@ -23,10 +23,3 @@
       until: docker_jobs.finished
       retries: 300
       with_items: "{{ server.results }}"
-
-    - name: Delete docker network(s)
-      docker_network:
-        name: "{{ item }}"
-        docker_host: "{{ item.docker_host | default('unix://var/run/docker.sock') }}"
-        state: absent
-      with_items: "{{ molecule_yml.platforms | molecule_get_docker_networks }}"

molecule/default/molecule.yml

@@ -3,8 +3,11 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+  flake8
 platforms:
   - name: bionic
     image: quay.io/paulfantom/molecule-systemd:ubuntu-18.04
@@ -69,6 +72,3 @@ scenario:
   name: default
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: true

molecule/latest/molecule.yml

@@ -3,8 +3,11 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+  flake8
 platforms:
   - name: buster
     image: quay.io/paulfantom/molecule-systemd:debian-10
@@ -37,6 +40,3 @@ scenario:
   name: latest
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: true

molecule/services/molecule.yml

@@ -3,8 +3,11 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+  flake8
 platforms:
   - name: bionic
     image: quay.io/paulfantom/molecule-systemd:ubuntu-18.04
@@ -69,6 +72,3 @@ scenario:
   name: services
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    enabled: true

molecule/services/playbook.yml

@@ -20,8 +20,25 @@
             min_ready_duration: 0s
             final_sleep: 0s
             num_tokens: 512
-
             ring:
               kvstore:
                 store: inmemory
-                replication_factor: 1
+        storage:
+          engine: blocks
+        blocks_storage:
+          backend: filesystem
+          filesystem:
+            dir: /tmp/blocks
+      readpath:
+        target: querier,store-gateway
+        server:
+          http_listen_port: 9010
+          grpc_listen_port: 9096
+        storage:
+          engine: blocks
+        querier:
+          store_gateway_addresses: 127.0.0.1:9096
+        blocks_storage:
+          backend: filesystem
+          filesystem:
+            dir: /tmp/blocks

molecule/services/tests/test_services.py

@@ -47,6 +47,19 @@ def test_service(host):
     assert s.is_running
 
 
-def test_socket(host):
-    s = host.socket("tcp://0.0.0.0:9009")
+@pytest.mark.parametrize("port", [9009, 9010, 9095, 9096])
+def test_socket(host, port):
+    s = host.socket("tcp://0.0.0.0:%d" % port)
     assert s.is_listening
+
+
+def test_config_file_no_target(host):
+    f = host.file("/cortex/cortex-ingester.yml")
+    config = yaml.load(f.content_string, Loader=yaml.SafeLoader)
+    assert config["target"] == "ingester"
+
+
+def test_config_file_explicit_target(host):
+    f = host.file("/cortex/cortex-readpath.yml")
+    config = yaml.load(f.content_string, Loader=yaml.SafeLoader)
+    assert config["target"] == "querier,store-gateway"