From 8e5000fb3147903a5bbe76a9b15aaab411396159 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 17 Sep 2018 10:09:49 +0200 Subject: [PATCH 1/7] moves files from /tests to more appropriate folders ref #11433 --- {tests/api => devenv/e2e-api-tests}/clearState.test.ts | 0 {tests/api => devenv/e2e-api-tests}/client.ts | 0 {tests/api => devenv/e2e-api-tests}/dashboard.test.ts | 0 {tests/api => devenv/e2e-api-tests}/folder.test.ts | 0 {tests/api => devenv/e2e-api-tests}/jest.js | 0 {tests/api => devenv/e2e-api-tests}/search.test.ts | 0 {tests/api => devenv/e2e-api-tests}/setup.ts | 0 {tests/api => devenv/e2e-api-tests}/tsconfig.json | 0 {tests/api => devenv/e2e-api-tests}/user.test.ts | 0 pkg/setting/setting_test.go | 8 ++++---- {tests/config-files => pkg/setting/testdata}/override.ini | 0 .../setting/testdata}/override_windows.ini | 0 12 files changed, 4 insertions(+), 4 deletions(-) rename {tests/api => devenv/e2e-api-tests}/clearState.test.ts (100%) rename {tests/api => devenv/e2e-api-tests}/client.ts (100%) rename {tests/api => devenv/e2e-api-tests}/dashboard.test.ts (100%) rename {tests/api => devenv/e2e-api-tests}/folder.test.ts (100%) rename {tests/api => devenv/e2e-api-tests}/jest.js (100%) rename {tests/api => devenv/e2e-api-tests}/search.test.ts (100%) rename {tests/api => devenv/e2e-api-tests}/setup.ts (100%) rename {tests/api => devenv/e2e-api-tests}/tsconfig.json (100%) rename {tests/api => devenv/e2e-api-tests}/user.test.ts (100%) rename {tests/config-files => pkg/setting/testdata}/override.ini (100%) rename {tests/config-files => pkg/setting/testdata}/override_windows.ini (100%) diff --git a/tests/api/clearState.test.ts b/devenv/e2e-api-tests/clearState.test.ts similarity index 100% rename from tests/api/clearState.test.ts rename to devenv/e2e-api-tests/clearState.test.ts diff --git a/tests/api/client.ts b/devenv/e2e-api-tests/client.ts similarity index 100% rename from tests/api/client.ts rename to devenv/e2e-api-tests/client.ts diff --git a/tests/api/dashboard.test.ts b/devenv/e2e-api-tests/dashboard.test.ts similarity index 100% rename from tests/api/dashboard.test.ts rename to devenv/e2e-api-tests/dashboard.test.ts diff --git a/tests/api/folder.test.ts b/devenv/e2e-api-tests/folder.test.ts similarity index 100% rename from tests/api/folder.test.ts rename to devenv/e2e-api-tests/folder.test.ts diff --git a/tests/api/jest.js b/devenv/e2e-api-tests/jest.js similarity index 100% rename from tests/api/jest.js rename to devenv/e2e-api-tests/jest.js diff --git a/tests/api/search.test.ts b/devenv/e2e-api-tests/search.test.ts similarity index 100% rename from tests/api/search.test.ts rename to devenv/e2e-api-tests/search.test.ts diff --git a/tests/api/setup.ts b/devenv/e2e-api-tests/setup.ts similarity index 100% rename from tests/api/setup.ts rename to devenv/e2e-api-tests/setup.ts diff --git a/tests/api/tsconfig.json b/devenv/e2e-api-tests/tsconfig.json similarity index 100% rename from tests/api/tsconfig.json rename to devenv/e2e-api-tests/tsconfig.json diff --git a/tests/api/user.test.ts b/devenv/e2e-api-tests/user.test.ts similarity index 100% rename from tests/api/user.test.ts rename to devenv/e2e-api-tests/user.test.ts diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go index affb3c3e7ca..9b19b6c6bfa 100644 --- a/pkg/setting/setting_test.go +++ b/pkg/setting/setting_test.go @@ -97,7 +97,7 @@ func TestLoadingSettings(t *testing.T) { Args: []string{ "cfg:default.server.domain=test2", }, - Config: filepath.Join(HomePath, "tests/config-files/override.ini"), + Config: filepath.Join(HomePath, "pkg/setting/testdata/override.ini"), }) So(Domain, ShouldEqual, "test2") @@ -108,7 +108,7 @@ func TestLoadingSettings(t *testing.T) { cfg := NewCfg() cfg.Load(&CommandLineArgs{ HomePath: "../../", - Config: filepath.Join(HomePath, "tests/config-files/override_windows.ini"), + Config: filepath.Join(HomePath, "pkg/setting/testdata/override_windows.ini"), Args: []string{`cfg:default.paths.data=c:\tmp\data`}, }) @@ -117,7 +117,7 @@ func TestLoadingSettings(t *testing.T) { cfg := NewCfg() cfg.Load(&CommandLineArgs{ HomePath: "../../", - Config: filepath.Join(HomePath, "tests/config-files/override.ini"), + Config: filepath.Join(HomePath, "pkg/setting/testdata/override.ini"), Args: []string{"cfg:default.paths.data=/tmp/data"}, }) @@ -139,7 +139,7 @@ func TestLoadingSettings(t *testing.T) { cfg := NewCfg() cfg.Load(&CommandLineArgs{ HomePath: "../../", - Config: filepath.Join(HomePath, "tests/config-files/override.ini"), + Config: filepath.Join(HomePath, "pkg/setting/testdata/override.ini"), Args: []string{"cfg:paths.data=/tmp/data"}, }) diff --git a/tests/config-files/override.ini b/pkg/setting/testdata/override.ini similarity index 100% rename from tests/config-files/override.ini rename to pkg/setting/testdata/override.ini diff --git a/tests/config-files/override_windows.ini b/pkg/setting/testdata/override_windows.ini similarity index 100% rename from tests/config-files/override_windows.ini rename to pkg/setting/testdata/override_windows.ini From c1f797ed9089878f5eebc80937955a53446c01a2 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 17 Sep 2018 09:53:37 +0200 Subject: [PATCH 2/7] moves docker/ to devenv/docker --- .circleci/config.yml | 4 +-- {docker => devenv}/create_docker_compose.sh | 4 +-- .../docker}/blocks/apache_proxy/Dockerfile | 0 .../docker}/blocks/apache_proxy/ports.conf | 0 .../docker}/blocks/apache_proxy/proxy.conf | 0 .../docker}/blocks/collectd/Dockerfile | 0 .../docker}/blocks/collectd/README.md | 0 .../docker}/blocks/collectd/collectd.conf.tpl | 0 .../docker}/blocks/collectd/etc_mtab | 0 .../docker}/blocks/collectd/start_container | 0 .../docker}/blocks/elastic/elasticsearch.yml | 0 .../docker}/blocks/elastic1/elasticsearch.yml | 0 .../docker}/blocks/elastic5/elasticsearch.yml | 0 .../docker}/blocks/elastic6/elasticsearch.yml | 0 .../docker}/blocks/graphite/Dockerfile | 0 .../docker}/blocks/graphite/files/carbon.conf | 0 .../blocks/graphite/files/events_views.py | 0 .../blocks/graphite/files/initial_data.json | 0 .../blocks/graphite/files/local_settings.py | 0 .../docker}/blocks/graphite/files/my_htpasswd | 0 .../docker}/blocks/graphite/files/nginx.conf | 0 .../blocks/graphite/files/statsd_config.js | 0 .../graphite/files/storage-aggregation.conf | 0 .../graphite/files/storage-schemas.conf | 0 .../blocks/graphite/files/supervisord.conf | 0 .../docker}/blocks/graphite1/Dockerfile | 0 .../blocks/graphite1/big-dashboard.json | 0 .../conf/etc/logrotate.d/graphite-statsd | 0 .../conf/etc/my_init.d/01_conf_init.sh | 0 .../graphite1/conf/etc/nginx/nginx.conf | 0 .../nginx/sites-enabled/graphite-statsd.conf | 0 .../conf/etc/service/carbon-aggregator/run | 0 .../graphite1/conf/etc/service/carbon/run | 0 .../graphite1/conf/etc/service/graphite/run | 0 .../graphite1/conf/etc/service/nginx/run | 0 .../graphite1/conf/etc/service/statsd/run | 0 .../opt/graphite/conf/aggregation-rules.conf | 0 .../conf/opt/graphite/conf/blacklist.conf | 0 .../conf/opt/graphite/conf/carbon.amqp.conf | 0 .../conf/opt/graphite/conf/carbon.conf | 0 .../conf/opt/graphite/conf/dashboard.conf | 0 .../opt/graphite/conf/graphTemplates.conf | 0 .../conf/opt/graphite/conf/relay-rules.conf | 0 .../conf/opt/graphite/conf/rewrite-rules.conf | 0 .../graphite/conf/storage-aggregation.conf | 0 .../opt/graphite/conf/storage-schemas.conf | 0 .../conf/opt/graphite/conf/whitelist.conf | 0 .../graphite/webapp/graphite/app_settings.py | 0 .../webapp/graphite/local_settings.py | 0 .../graphite1/conf/opt/statsd/config.js | 0 .../conf/usr/local/bin/django_admin_init.exp | 0 .../graphite1/conf/usr/local/bin/manage.sh | 0 .../blocks/graphite11/big-dashboard.json | 0 .../docker}/blocks/influxdb/influxdb.conf | 0 .../docker}/blocks/mssql/build/Dockerfile | 0 .../docker}/blocks/mssql/build/entrypoint.sh | 0 .../docker}/blocks/mssql/build/setup.sh | 0 .../blocks/mssql/build/setup.sql.template | 0 {docker => devenv/docker}/blocks/mysql/config | 0 .../docker}/blocks/mysql_opendata/Dockerfile | 0 .../blocks/mysql_opendata/import_csv.sql | 0 .../docker}/blocks/mysql_tests/Dockerfile | 0 .../docker}/blocks/mysql_tests/setup.sql | 0 .../docker}/blocks/nginx_proxy/Dockerfile | 0 .../docker}/blocks/nginx_proxy/htpasswd | 0 .../docker}/blocks/nginx_proxy/nginx.conf | 0 .../docker}/blocks/openldap/Dockerfile | 0 .../docker}/blocks/openldap/entrypoint.sh | 0 .../docker}/blocks/openldap/ldap_dev.toml | 0 .../blocks/openldap/modules/memberof.ldif | 0 .../docker}/blocks/openldap/notes.md | 0 .../docker}/blocks/openldap/prepopulate.sh | 0 .../blocks/openldap/prepopulate/1_units.ldif | 0 .../blocks/openldap/prepopulate/2_users.ldif | 0 .../blocks/openldap/prepopulate/3_groups.ldif | 0 .../docker}/blocks/postgres_tests/Dockerfile | 0 .../docker}/blocks/postgres_tests/setup.sql | 0 .../docker}/blocks/prometheus/Dockerfile | 0 .../docker}/blocks/prometheus/alert.rules | 0 .../docker}/blocks/prometheus/prometheus.yml | 0 .../docker}/blocks/prometheus2/Dockerfile | 0 .../docker}/blocks/prometheus2/alert.rules | 0 .../docker}/blocks/prometheus2/prometheus.yml | 0 .../docker}/blocks/prometheus_mac/Dockerfile | 0 .../docker}/blocks/prometheus_mac/alert.rules | 0 .../blocks/prometheus_mac/prometheus.yml | 0 .../blocks/prometheus_random_data/Dockerfile | 0 .../docker}/blocks/smtp/Dockerfile | 0 .../docker}/blocks/smtp/bootstrap.sh | 0 .../docker}/buildcontainer/Dockerfile | 0 .../docker}/buildcontainer/build.sh | 0 .../docker}/buildcontainer/build_circle.sh | 0 .../docker}/buildcontainer/run_circle.sh | 0 {docker => devenv/docker}/compose_header.yml | 0 {docker => devenv/docker}/debtest/Dockerfile | 0 {docker => devenv/docker}/debtest/build.sh | 0 {docker => devenv/docker}/rpmtest/build.sh | 0 .../blocks/apache_proxy/docker-compose.yaml | 9 ------ docker/blocks/collectd/docker-compose.yaml | 11 ------- docker/blocks/elastic/docker-compose.yaml | 15 --------- docker/blocks/elastic1/docker-compose.yaml | 8 ----- docker/blocks/elastic5/docker-compose.yaml | 15 --------- docker/blocks/elastic6/docker-compose.yaml | 15 --------- docker/blocks/graphite/docker-compose.yaml | 16 ---------- docker/blocks/graphite1/docker-compose.yaml | 21 ------------- docker/blocks/graphite11/docker-compose.yaml | 18 ----------- docker/blocks/influxdb/docker-compose.yaml | 17 ---------- docker/blocks/jaeger/docker-compose.yaml | 6 ---- docker/blocks/memcached/docker-compose.yaml | 5 --- docker/blocks/mssql/docker-compose.yaml | 19 ------------ docker/blocks/mssql_tests/docker-compose.yaml | 12 ------- docker/blocks/mysql/docker-compose.yaml | 18 ----------- .../blocks/mysql_opendata/docker-compose.yaml | 9 ------ docker/blocks/mysql_tests/docker-compose.yaml | 11 ------- docker/blocks/nginx_proxy/docker-compose.yaml | 9 ------ docker/blocks/openldap/docker-compose.yaml | 10 ------ docker/blocks/opentsdb/docker-compose.yaml | 11 ------- docker/blocks/postgres/docker-compose.yaml | 16 ---------- .../blocks/postgres_tests/docker-compose.yaml | 9 ------ docker/blocks/prometheus/docker-compose.yaml | 31 ------------------- docker/blocks/prometheus2/docker-compose.yaml | 31 ------------------- .../blocks/prometheus_mac/docker-compose.yaml | 26 ---------------- docker/blocks/smtp/docker-compose.yaml | 4 --- 123 files changed, 4 insertions(+), 376 deletions(-) rename {docker => devenv}/create_docker_compose.sh (94%) rename {docker => devenv/docker}/blocks/apache_proxy/Dockerfile (100%) rename {docker => devenv/docker}/blocks/apache_proxy/ports.conf (100%) rename {docker => devenv/docker}/blocks/apache_proxy/proxy.conf (100%) rename {docker => devenv/docker}/blocks/collectd/Dockerfile (100%) rename {docker => devenv/docker}/blocks/collectd/README.md (100%) rename {docker => devenv/docker}/blocks/collectd/collectd.conf.tpl (100%) rename {docker => devenv/docker}/blocks/collectd/etc_mtab (100%) rename {docker => devenv/docker}/blocks/collectd/start_container (100%) rename {docker => devenv/docker}/blocks/elastic/elasticsearch.yml (100%) rename {docker => devenv/docker}/blocks/elastic1/elasticsearch.yml (100%) rename {docker => devenv/docker}/blocks/elastic5/elasticsearch.yml (100%) rename {docker => devenv/docker}/blocks/elastic6/elasticsearch.yml (100%) rename {docker => devenv/docker}/blocks/graphite/Dockerfile (100%) rename {docker => devenv/docker}/blocks/graphite/files/carbon.conf (100%) rename {docker => devenv/docker}/blocks/graphite/files/events_views.py (100%) rename {docker => devenv/docker}/blocks/graphite/files/initial_data.json (100%) rename {docker => devenv/docker}/blocks/graphite/files/local_settings.py (100%) rename {docker => devenv/docker}/blocks/graphite/files/my_htpasswd (100%) rename {docker => devenv/docker}/blocks/graphite/files/nginx.conf (100%) rename {docker => devenv/docker}/blocks/graphite/files/statsd_config.js (100%) rename {docker => devenv/docker}/blocks/graphite/files/storage-aggregation.conf (100%) rename {docker => devenv/docker}/blocks/graphite/files/storage-schemas.conf (100%) rename {docker => devenv/docker}/blocks/graphite/files/supervisord.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/Dockerfile (100%) rename {docker => devenv/docker}/blocks/graphite1/big-dashboard.json (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/etc/logrotate.d/graphite-statsd (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/etc/my_init.d/01_conf_init.sh (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/etc/nginx/nginx.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/etc/nginx/sites-enabled/graphite-statsd.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/etc/service/carbon-aggregator/run (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/etc/service/carbon/run (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/etc/service/graphite/run (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/etc/service/nginx/run (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/etc/service/statsd/run (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/conf/aggregation-rules.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/conf/blacklist.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/conf/carbon.amqp.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/conf/carbon.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/conf/dashboard.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/conf/graphTemplates.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/conf/relay-rules.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/conf/rewrite-rules.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/conf/storage-aggregation.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/conf/storage-schemas.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/conf/whitelist.conf (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/webapp/graphite/app_settings.py (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/graphite/webapp/graphite/local_settings.py (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/opt/statsd/config.js (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/usr/local/bin/django_admin_init.exp (100%) rename {docker => devenv/docker}/blocks/graphite1/conf/usr/local/bin/manage.sh (100%) rename {docker => devenv/docker}/blocks/graphite11/big-dashboard.json (100%) rename {docker => devenv/docker}/blocks/influxdb/influxdb.conf (100%) rename {docker => devenv/docker}/blocks/mssql/build/Dockerfile (100%) rename {docker => devenv/docker}/blocks/mssql/build/entrypoint.sh (100%) rename {docker => devenv/docker}/blocks/mssql/build/setup.sh (100%) rename {docker => devenv/docker}/blocks/mssql/build/setup.sql.template (100%) rename {docker => devenv/docker}/blocks/mysql/config (100%) rename {docker => devenv/docker}/blocks/mysql_opendata/Dockerfile (100%) rename {docker => devenv/docker}/blocks/mysql_opendata/import_csv.sql (100%) rename {docker => devenv/docker}/blocks/mysql_tests/Dockerfile (100%) rename {docker => devenv/docker}/blocks/mysql_tests/setup.sql (100%) rename {docker => devenv/docker}/blocks/nginx_proxy/Dockerfile (100%) rename {docker => devenv/docker}/blocks/nginx_proxy/htpasswd (100%) rename {docker => devenv/docker}/blocks/nginx_proxy/nginx.conf (100%) rename {docker => devenv/docker}/blocks/openldap/Dockerfile (100%) rename {docker => devenv/docker}/blocks/openldap/entrypoint.sh (100%) rename {docker => devenv/docker}/blocks/openldap/ldap_dev.toml (100%) rename {docker => devenv/docker}/blocks/openldap/modules/memberof.ldif (100%) rename {docker => devenv/docker}/blocks/openldap/notes.md (100%) rename {docker => devenv/docker}/blocks/openldap/prepopulate.sh (100%) rename {docker => devenv/docker}/blocks/openldap/prepopulate/1_units.ldif (100%) rename {docker => devenv/docker}/blocks/openldap/prepopulate/2_users.ldif (100%) rename {docker => devenv/docker}/blocks/openldap/prepopulate/3_groups.ldif (100%) rename {docker => devenv/docker}/blocks/postgres_tests/Dockerfile (100%) rename {docker => devenv/docker}/blocks/postgres_tests/setup.sql (100%) rename {docker => devenv/docker}/blocks/prometheus/Dockerfile (100%) rename {docker => devenv/docker}/blocks/prometheus/alert.rules (100%) rename {docker => devenv/docker}/blocks/prometheus/prometheus.yml (100%) rename {docker => devenv/docker}/blocks/prometheus2/Dockerfile (100%) rename {docker => devenv/docker}/blocks/prometheus2/alert.rules (100%) rename {docker => devenv/docker}/blocks/prometheus2/prometheus.yml (100%) rename {docker => devenv/docker}/blocks/prometheus_mac/Dockerfile (100%) rename {docker => devenv/docker}/blocks/prometheus_mac/alert.rules (100%) rename {docker => devenv/docker}/blocks/prometheus_mac/prometheus.yml (100%) rename {docker => devenv/docker}/blocks/prometheus_random_data/Dockerfile (100%) rename {docker => devenv/docker}/blocks/smtp/Dockerfile (100%) rename {docker => devenv/docker}/blocks/smtp/bootstrap.sh (100%) rename {docker => devenv/docker}/buildcontainer/Dockerfile (100%) rename {docker => devenv/docker}/buildcontainer/build.sh (100%) rename {docker => devenv/docker}/buildcontainer/build_circle.sh (100%) rename {docker => devenv/docker}/buildcontainer/run_circle.sh (100%) rename {docker => devenv/docker}/compose_header.yml (100%) rename {docker => devenv/docker}/debtest/Dockerfile (100%) rename {docker => devenv/docker}/debtest/build.sh (100%) rename {docker => devenv/docker}/rpmtest/build.sh (100%) delete mode 100644 docker/blocks/apache_proxy/docker-compose.yaml delete mode 100644 docker/blocks/collectd/docker-compose.yaml delete mode 100644 docker/blocks/elastic/docker-compose.yaml delete mode 100644 docker/blocks/elastic1/docker-compose.yaml delete mode 100644 docker/blocks/elastic5/docker-compose.yaml delete mode 100644 docker/blocks/elastic6/docker-compose.yaml delete mode 100644 docker/blocks/graphite/docker-compose.yaml delete mode 100644 docker/blocks/graphite1/docker-compose.yaml delete mode 100644 docker/blocks/graphite11/docker-compose.yaml delete mode 100644 docker/blocks/influxdb/docker-compose.yaml delete mode 100644 docker/blocks/jaeger/docker-compose.yaml delete mode 100644 docker/blocks/memcached/docker-compose.yaml delete mode 100644 docker/blocks/mssql/docker-compose.yaml delete mode 100644 docker/blocks/mssql_tests/docker-compose.yaml delete mode 100644 docker/blocks/mysql/docker-compose.yaml delete mode 100644 docker/blocks/mysql_opendata/docker-compose.yaml delete mode 100644 docker/blocks/mysql_tests/docker-compose.yaml delete mode 100644 docker/blocks/nginx_proxy/docker-compose.yaml delete mode 100644 docker/blocks/openldap/docker-compose.yaml delete mode 100644 docker/blocks/opentsdb/docker-compose.yaml delete mode 100644 docker/blocks/postgres/docker-compose.yaml delete mode 100644 docker/blocks/postgres_tests/docker-compose.yaml delete mode 100644 docker/blocks/prometheus/docker-compose.yaml delete mode 100644 docker/blocks/prometheus2/docker-compose.yaml delete mode 100644 docker/blocks/prometheus_mac/docker-compose.yaml delete mode 100644 docker/blocks/smtp/docker-compose.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index 186997d0045..e631e0a8d33 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ jobs: - run: sudo apt update - run: sudo apt install -y mysql-client - run: dockerize -wait tcp://127.0.0.1:3306 -timeout 120s - - run: cat docker/blocks/mysql_tests/setup.sql | mysql -h 127.0.0.1 -P 3306 -u root -prootpass + - run: cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h 127.0.0.1 -P 3306 -u root -prootpass - run: name: mysql integration tests command: 'GRAFANA_TEST_DB=mysql go test ./pkg/services/sqlstore/... ./pkg/tsdb/mysql/... ' @@ -51,7 +51,7 @@ jobs: - run: sudo apt update - run: sudo apt install -y postgresql-client - run: dockerize -wait tcp://127.0.0.1:5432 -timeout 120s - - run: 'PGPASSWORD=grafanatest psql -p 5432 -h 127.0.0.1 -U grafanatest -d grafanatest -f docker/blocks/postgres_tests/setup.sql' + - run: 'PGPASSWORD=grafanatest psql -p 5432 -h 127.0.0.1 -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql' - run: name: postgres integration tests command: 'GRAFANA_TEST_DB=postgres go test ./pkg/services/sqlstore/... ./pkg/tsdb/postgres/...' diff --git a/docker/create_docker_compose.sh b/devenv/create_docker_compose.sh similarity index 94% rename from docker/create_docker_compose.sh rename to devenv/create_docker_compose.sh index 9d28ede8e7e..5da9e8f5c8f 100755 --- a/docker/create_docker_compose.sh +++ b/devenv/create_docker_compose.sh @@ -1,13 +1,13 @@ #!/bin/bash -blocks_dir=blocks +blocks_dir=docker/blocks docker_dir=docker template_dir=templates grafana_config_file=conf.tmp grafana_config=config -compose_header_file=compose_header.yml +compose_header_file=docker/compose_header.yml fig_file=docker-compose.yaml fig_config=docker-compose.yaml diff --git a/docker/blocks/apache_proxy/Dockerfile b/devenv/docker/blocks/apache_proxy/Dockerfile similarity index 100% rename from docker/blocks/apache_proxy/Dockerfile rename to devenv/docker/blocks/apache_proxy/Dockerfile diff --git a/docker/blocks/apache_proxy/ports.conf b/devenv/docker/blocks/apache_proxy/ports.conf similarity index 100% rename from docker/blocks/apache_proxy/ports.conf rename to devenv/docker/blocks/apache_proxy/ports.conf diff --git a/docker/blocks/apache_proxy/proxy.conf b/devenv/docker/blocks/apache_proxy/proxy.conf similarity index 100% rename from docker/blocks/apache_proxy/proxy.conf rename to devenv/docker/blocks/apache_proxy/proxy.conf diff --git a/docker/blocks/collectd/Dockerfile b/devenv/docker/blocks/collectd/Dockerfile similarity index 100% rename from docker/blocks/collectd/Dockerfile rename to devenv/docker/blocks/collectd/Dockerfile diff --git a/docker/blocks/collectd/README.md b/devenv/docker/blocks/collectd/README.md similarity index 100% rename from docker/blocks/collectd/README.md rename to devenv/docker/blocks/collectd/README.md diff --git a/docker/blocks/collectd/collectd.conf.tpl b/devenv/docker/blocks/collectd/collectd.conf.tpl similarity index 100% rename from docker/blocks/collectd/collectd.conf.tpl rename to devenv/docker/blocks/collectd/collectd.conf.tpl diff --git a/docker/blocks/collectd/etc_mtab b/devenv/docker/blocks/collectd/etc_mtab similarity index 100% rename from docker/blocks/collectd/etc_mtab rename to devenv/docker/blocks/collectd/etc_mtab diff --git a/docker/blocks/collectd/start_container b/devenv/docker/blocks/collectd/start_container similarity index 100% rename from docker/blocks/collectd/start_container rename to devenv/docker/blocks/collectd/start_container diff --git a/docker/blocks/elastic/elasticsearch.yml b/devenv/docker/blocks/elastic/elasticsearch.yml similarity index 100% rename from docker/blocks/elastic/elasticsearch.yml rename to devenv/docker/blocks/elastic/elasticsearch.yml diff --git a/docker/blocks/elastic1/elasticsearch.yml b/devenv/docker/blocks/elastic1/elasticsearch.yml similarity index 100% rename from docker/blocks/elastic1/elasticsearch.yml rename to devenv/docker/blocks/elastic1/elasticsearch.yml diff --git a/docker/blocks/elastic5/elasticsearch.yml b/devenv/docker/blocks/elastic5/elasticsearch.yml similarity index 100% rename from docker/blocks/elastic5/elasticsearch.yml rename to devenv/docker/blocks/elastic5/elasticsearch.yml diff --git a/docker/blocks/elastic6/elasticsearch.yml b/devenv/docker/blocks/elastic6/elasticsearch.yml similarity index 100% rename from docker/blocks/elastic6/elasticsearch.yml rename to devenv/docker/blocks/elastic6/elasticsearch.yml diff --git a/docker/blocks/graphite/Dockerfile b/devenv/docker/blocks/graphite/Dockerfile similarity index 100% rename from docker/blocks/graphite/Dockerfile rename to devenv/docker/blocks/graphite/Dockerfile diff --git a/docker/blocks/graphite/files/carbon.conf b/devenv/docker/blocks/graphite/files/carbon.conf similarity index 100% rename from docker/blocks/graphite/files/carbon.conf rename to devenv/docker/blocks/graphite/files/carbon.conf diff --git a/docker/blocks/graphite/files/events_views.py b/devenv/docker/blocks/graphite/files/events_views.py similarity index 100% rename from docker/blocks/graphite/files/events_views.py rename to devenv/docker/blocks/graphite/files/events_views.py diff --git a/docker/blocks/graphite/files/initial_data.json b/devenv/docker/blocks/graphite/files/initial_data.json similarity index 100% rename from docker/blocks/graphite/files/initial_data.json rename to devenv/docker/blocks/graphite/files/initial_data.json diff --git a/docker/blocks/graphite/files/local_settings.py b/devenv/docker/blocks/graphite/files/local_settings.py similarity index 100% rename from docker/blocks/graphite/files/local_settings.py rename to devenv/docker/blocks/graphite/files/local_settings.py diff --git a/docker/blocks/graphite/files/my_htpasswd b/devenv/docker/blocks/graphite/files/my_htpasswd similarity index 100% rename from docker/blocks/graphite/files/my_htpasswd rename to devenv/docker/blocks/graphite/files/my_htpasswd diff --git a/docker/blocks/graphite/files/nginx.conf b/devenv/docker/blocks/graphite/files/nginx.conf similarity index 100% rename from docker/blocks/graphite/files/nginx.conf rename to devenv/docker/blocks/graphite/files/nginx.conf diff --git a/docker/blocks/graphite/files/statsd_config.js b/devenv/docker/blocks/graphite/files/statsd_config.js similarity index 100% rename from docker/blocks/graphite/files/statsd_config.js rename to devenv/docker/blocks/graphite/files/statsd_config.js diff --git a/docker/blocks/graphite/files/storage-aggregation.conf b/devenv/docker/blocks/graphite/files/storage-aggregation.conf similarity index 100% rename from docker/blocks/graphite/files/storage-aggregation.conf rename to devenv/docker/blocks/graphite/files/storage-aggregation.conf diff --git a/docker/blocks/graphite/files/storage-schemas.conf b/devenv/docker/blocks/graphite/files/storage-schemas.conf similarity index 100% rename from docker/blocks/graphite/files/storage-schemas.conf rename to devenv/docker/blocks/graphite/files/storage-schemas.conf diff --git a/docker/blocks/graphite/files/supervisord.conf b/devenv/docker/blocks/graphite/files/supervisord.conf similarity index 100% rename from docker/blocks/graphite/files/supervisord.conf rename to devenv/docker/blocks/graphite/files/supervisord.conf diff --git a/docker/blocks/graphite1/Dockerfile b/devenv/docker/blocks/graphite1/Dockerfile similarity index 100% rename from docker/blocks/graphite1/Dockerfile rename to devenv/docker/blocks/graphite1/Dockerfile diff --git a/docker/blocks/graphite1/big-dashboard.json b/devenv/docker/blocks/graphite1/big-dashboard.json similarity index 100% rename from docker/blocks/graphite1/big-dashboard.json rename to devenv/docker/blocks/graphite1/big-dashboard.json diff --git a/docker/blocks/graphite1/conf/etc/logrotate.d/graphite-statsd b/devenv/docker/blocks/graphite1/conf/etc/logrotate.d/graphite-statsd similarity index 100% rename from docker/blocks/graphite1/conf/etc/logrotate.d/graphite-statsd rename to devenv/docker/blocks/graphite1/conf/etc/logrotate.d/graphite-statsd diff --git a/docker/blocks/graphite1/conf/etc/my_init.d/01_conf_init.sh b/devenv/docker/blocks/graphite1/conf/etc/my_init.d/01_conf_init.sh similarity index 100% rename from docker/blocks/graphite1/conf/etc/my_init.d/01_conf_init.sh rename to devenv/docker/blocks/graphite1/conf/etc/my_init.d/01_conf_init.sh diff --git a/docker/blocks/graphite1/conf/etc/nginx/nginx.conf b/devenv/docker/blocks/graphite1/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/blocks/graphite1/conf/etc/nginx/nginx.conf rename to devenv/docker/blocks/graphite1/conf/etc/nginx/nginx.conf diff --git a/docker/blocks/graphite1/conf/etc/nginx/sites-enabled/graphite-statsd.conf b/devenv/docker/blocks/graphite1/conf/etc/nginx/sites-enabled/graphite-statsd.conf similarity index 100% rename from docker/blocks/graphite1/conf/etc/nginx/sites-enabled/graphite-statsd.conf rename to devenv/docker/blocks/graphite1/conf/etc/nginx/sites-enabled/graphite-statsd.conf diff --git a/docker/blocks/graphite1/conf/etc/service/carbon-aggregator/run b/devenv/docker/blocks/graphite1/conf/etc/service/carbon-aggregator/run similarity index 100% rename from docker/blocks/graphite1/conf/etc/service/carbon-aggregator/run rename to devenv/docker/blocks/graphite1/conf/etc/service/carbon-aggregator/run diff --git a/docker/blocks/graphite1/conf/etc/service/carbon/run b/devenv/docker/blocks/graphite1/conf/etc/service/carbon/run similarity index 100% rename from docker/blocks/graphite1/conf/etc/service/carbon/run rename to devenv/docker/blocks/graphite1/conf/etc/service/carbon/run diff --git a/docker/blocks/graphite1/conf/etc/service/graphite/run b/devenv/docker/blocks/graphite1/conf/etc/service/graphite/run similarity index 100% rename from docker/blocks/graphite1/conf/etc/service/graphite/run rename to devenv/docker/blocks/graphite1/conf/etc/service/graphite/run diff --git a/docker/blocks/graphite1/conf/etc/service/nginx/run b/devenv/docker/blocks/graphite1/conf/etc/service/nginx/run similarity index 100% rename from docker/blocks/graphite1/conf/etc/service/nginx/run rename to devenv/docker/blocks/graphite1/conf/etc/service/nginx/run diff --git a/docker/blocks/graphite1/conf/etc/service/statsd/run b/devenv/docker/blocks/graphite1/conf/etc/service/statsd/run similarity index 100% rename from docker/blocks/graphite1/conf/etc/service/statsd/run rename to devenv/docker/blocks/graphite1/conf/etc/service/statsd/run diff --git a/docker/blocks/graphite1/conf/opt/graphite/conf/aggregation-rules.conf b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/aggregation-rules.conf similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/conf/aggregation-rules.conf rename to devenv/docker/blocks/graphite1/conf/opt/graphite/conf/aggregation-rules.conf diff --git a/docker/blocks/graphite1/conf/opt/graphite/conf/blacklist.conf b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/blacklist.conf similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/conf/blacklist.conf rename to devenv/docker/blocks/graphite1/conf/opt/graphite/conf/blacklist.conf diff --git a/docker/blocks/graphite1/conf/opt/graphite/conf/carbon.amqp.conf b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/carbon.amqp.conf similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/conf/carbon.amqp.conf rename to devenv/docker/blocks/graphite1/conf/opt/graphite/conf/carbon.amqp.conf diff --git a/docker/blocks/graphite1/conf/opt/graphite/conf/carbon.conf b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/carbon.conf similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/conf/carbon.conf rename to devenv/docker/blocks/graphite1/conf/opt/graphite/conf/carbon.conf diff --git a/docker/blocks/graphite1/conf/opt/graphite/conf/dashboard.conf b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/dashboard.conf similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/conf/dashboard.conf rename to devenv/docker/blocks/graphite1/conf/opt/graphite/conf/dashboard.conf diff --git a/docker/blocks/graphite1/conf/opt/graphite/conf/graphTemplates.conf b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/graphTemplates.conf similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/conf/graphTemplates.conf rename to devenv/docker/blocks/graphite1/conf/opt/graphite/conf/graphTemplates.conf diff --git a/docker/blocks/graphite1/conf/opt/graphite/conf/relay-rules.conf b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/relay-rules.conf similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/conf/relay-rules.conf rename to devenv/docker/blocks/graphite1/conf/opt/graphite/conf/relay-rules.conf diff --git a/docker/blocks/graphite1/conf/opt/graphite/conf/rewrite-rules.conf b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/rewrite-rules.conf similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/conf/rewrite-rules.conf rename to devenv/docker/blocks/graphite1/conf/opt/graphite/conf/rewrite-rules.conf diff --git a/docker/blocks/graphite1/conf/opt/graphite/conf/storage-aggregation.conf b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/storage-aggregation.conf similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/conf/storage-aggregation.conf rename to devenv/docker/blocks/graphite1/conf/opt/graphite/conf/storage-aggregation.conf diff --git a/docker/blocks/graphite1/conf/opt/graphite/conf/storage-schemas.conf b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/storage-schemas.conf similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/conf/storage-schemas.conf rename to devenv/docker/blocks/graphite1/conf/opt/graphite/conf/storage-schemas.conf diff --git a/docker/blocks/graphite1/conf/opt/graphite/conf/whitelist.conf b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/whitelist.conf similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/conf/whitelist.conf rename to devenv/docker/blocks/graphite1/conf/opt/graphite/conf/whitelist.conf diff --git a/docker/blocks/graphite1/conf/opt/graphite/webapp/graphite/app_settings.py b/devenv/docker/blocks/graphite1/conf/opt/graphite/webapp/graphite/app_settings.py similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/webapp/graphite/app_settings.py rename to devenv/docker/blocks/graphite1/conf/opt/graphite/webapp/graphite/app_settings.py diff --git a/docker/blocks/graphite1/conf/opt/graphite/webapp/graphite/local_settings.py b/devenv/docker/blocks/graphite1/conf/opt/graphite/webapp/graphite/local_settings.py similarity index 100% rename from docker/blocks/graphite1/conf/opt/graphite/webapp/graphite/local_settings.py rename to devenv/docker/blocks/graphite1/conf/opt/graphite/webapp/graphite/local_settings.py diff --git a/docker/blocks/graphite1/conf/opt/statsd/config.js b/devenv/docker/blocks/graphite1/conf/opt/statsd/config.js similarity index 100% rename from docker/blocks/graphite1/conf/opt/statsd/config.js rename to devenv/docker/blocks/graphite1/conf/opt/statsd/config.js diff --git a/docker/blocks/graphite1/conf/usr/local/bin/django_admin_init.exp b/devenv/docker/blocks/graphite1/conf/usr/local/bin/django_admin_init.exp similarity index 100% rename from docker/blocks/graphite1/conf/usr/local/bin/django_admin_init.exp rename to devenv/docker/blocks/graphite1/conf/usr/local/bin/django_admin_init.exp diff --git a/docker/blocks/graphite1/conf/usr/local/bin/manage.sh b/devenv/docker/blocks/graphite1/conf/usr/local/bin/manage.sh similarity index 100% rename from docker/blocks/graphite1/conf/usr/local/bin/manage.sh rename to devenv/docker/blocks/graphite1/conf/usr/local/bin/manage.sh diff --git a/docker/blocks/graphite11/big-dashboard.json b/devenv/docker/blocks/graphite11/big-dashboard.json similarity index 100% rename from docker/blocks/graphite11/big-dashboard.json rename to devenv/docker/blocks/graphite11/big-dashboard.json diff --git a/docker/blocks/influxdb/influxdb.conf b/devenv/docker/blocks/influxdb/influxdb.conf similarity index 100% rename from docker/blocks/influxdb/influxdb.conf rename to devenv/docker/blocks/influxdb/influxdb.conf diff --git a/docker/blocks/mssql/build/Dockerfile b/devenv/docker/blocks/mssql/build/Dockerfile similarity index 100% rename from docker/blocks/mssql/build/Dockerfile rename to devenv/docker/blocks/mssql/build/Dockerfile diff --git a/docker/blocks/mssql/build/entrypoint.sh b/devenv/docker/blocks/mssql/build/entrypoint.sh similarity index 100% rename from docker/blocks/mssql/build/entrypoint.sh rename to devenv/docker/blocks/mssql/build/entrypoint.sh diff --git a/docker/blocks/mssql/build/setup.sh b/devenv/docker/blocks/mssql/build/setup.sh similarity index 100% rename from docker/blocks/mssql/build/setup.sh rename to devenv/docker/blocks/mssql/build/setup.sh diff --git a/docker/blocks/mssql/build/setup.sql.template b/devenv/docker/blocks/mssql/build/setup.sql.template similarity index 100% rename from docker/blocks/mssql/build/setup.sql.template rename to devenv/docker/blocks/mssql/build/setup.sql.template diff --git a/docker/blocks/mysql/config b/devenv/docker/blocks/mysql/config similarity index 100% rename from docker/blocks/mysql/config rename to devenv/docker/blocks/mysql/config diff --git a/docker/blocks/mysql_opendata/Dockerfile b/devenv/docker/blocks/mysql_opendata/Dockerfile similarity index 100% rename from docker/blocks/mysql_opendata/Dockerfile rename to devenv/docker/blocks/mysql_opendata/Dockerfile diff --git a/docker/blocks/mysql_opendata/import_csv.sql b/devenv/docker/blocks/mysql_opendata/import_csv.sql similarity index 100% rename from docker/blocks/mysql_opendata/import_csv.sql rename to devenv/docker/blocks/mysql_opendata/import_csv.sql diff --git a/docker/blocks/mysql_tests/Dockerfile b/devenv/docker/blocks/mysql_tests/Dockerfile similarity index 100% rename from docker/blocks/mysql_tests/Dockerfile rename to devenv/docker/blocks/mysql_tests/Dockerfile diff --git a/docker/blocks/mysql_tests/setup.sql b/devenv/docker/blocks/mysql_tests/setup.sql similarity index 100% rename from docker/blocks/mysql_tests/setup.sql rename to devenv/docker/blocks/mysql_tests/setup.sql diff --git a/docker/blocks/nginx_proxy/Dockerfile b/devenv/docker/blocks/nginx_proxy/Dockerfile similarity index 100% rename from docker/blocks/nginx_proxy/Dockerfile rename to devenv/docker/blocks/nginx_proxy/Dockerfile diff --git a/docker/blocks/nginx_proxy/htpasswd b/devenv/docker/blocks/nginx_proxy/htpasswd similarity index 100% rename from docker/blocks/nginx_proxy/htpasswd rename to devenv/docker/blocks/nginx_proxy/htpasswd diff --git a/docker/blocks/nginx_proxy/nginx.conf b/devenv/docker/blocks/nginx_proxy/nginx.conf similarity index 100% rename from docker/blocks/nginx_proxy/nginx.conf rename to devenv/docker/blocks/nginx_proxy/nginx.conf diff --git a/docker/blocks/openldap/Dockerfile b/devenv/docker/blocks/openldap/Dockerfile similarity index 100% rename from docker/blocks/openldap/Dockerfile rename to devenv/docker/blocks/openldap/Dockerfile diff --git a/docker/blocks/openldap/entrypoint.sh b/devenv/docker/blocks/openldap/entrypoint.sh similarity index 100% rename from docker/blocks/openldap/entrypoint.sh rename to devenv/docker/blocks/openldap/entrypoint.sh diff --git a/docker/blocks/openldap/ldap_dev.toml b/devenv/docker/blocks/openldap/ldap_dev.toml similarity index 100% rename from docker/blocks/openldap/ldap_dev.toml rename to devenv/docker/blocks/openldap/ldap_dev.toml diff --git a/docker/blocks/openldap/modules/memberof.ldif b/devenv/docker/blocks/openldap/modules/memberof.ldif similarity index 100% rename from docker/blocks/openldap/modules/memberof.ldif rename to devenv/docker/blocks/openldap/modules/memberof.ldif diff --git a/docker/blocks/openldap/notes.md b/devenv/docker/blocks/openldap/notes.md similarity index 100% rename from docker/blocks/openldap/notes.md rename to devenv/docker/blocks/openldap/notes.md diff --git a/docker/blocks/openldap/prepopulate.sh b/devenv/docker/blocks/openldap/prepopulate.sh similarity index 100% rename from docker/blocks/openldap/prepopulate.sh rename to devenv/docker/blocks/openldap/prepopulate.sh diff --git a/docker/blocks/openldap/prepopulate/1_units.ldif b/devenv/docker/blocks/openldap/prepopulate/1_units.ldif similarity index 100% rename from docker/blocks/openldap/prepopulate/1_units.ldif rename to devenv/docker/blocks/openldap/prepopulate/1_units.ldif diff --git a/docker/blocks/openldap/prepopulate/2_users.ldif b/devenv/docker/blocks/openldap/prepopulate/2_users.ldif similarity index 100% rename from docker/blocks/openldap/prepopulate/2_users.ldif rename to devenv/docker/blocks/openldap/prepopulate/2_users.ldif diff --git a/docker/blocks/openldap/prepopulate/3_groups.ldif b/devenv/docker/blocks/openldap/prepopulate/3_groups.ldif similarity index 100% rename from docker/blocks/openldap/prepopulate/3_groups.ldif rename to devenv/docker/blocks/openldap/prepopulate/3_groups.ldif diff --git a/docker/blocks/postgres_tests/Dockerfile b/devenv/docker/blocks/postgres_tests/Dockerfile similarity index 100% rename from docker/blocks/postgres_tests/Dockerfile rename to devenv/docker/blocks/postgres_tests/Dockerfile diff --git a/docker/blocks/postgres_tests/setup.sql b/devenv/docker/blocks/postgres_tests/setup.sql similarity index 100% rename from docker/blocks/postgres_tests/setup.sql rename to devenv/docker/blocks/postgres_tests/setup.sql diff --git a/docker/blocks/prometheus/Dockerfile b/devenv/docker/blocks/prometheus/Dockerfile similarity index 100% rename from docker/blocks/prometheus/Dockerfile rename to devenv/docker/blocks/prometheus/Dockerfile diff --git a/docker/blocks/prometheus/alert.rules b/devenv/docker/blocks/prometheus/alert.rules similarity index 100% rename from docker/blocks/prometheus/alert.rules rename to devenv/docker/blocks/prometheus/alert.rules diff --git a/docker/blocks/prometheus/prometheus.yml b/devenv/docker/blocks/prometheus/prometheus.yml similarity index 100% rename from docker/blocks/prometheus/prometheus.yml rename to devenv/docker/blocks/prometheus/prometheus.yml diff --git a/docker/blocks/prometheus2/Dockerfile b/devenv/docker/blocks/prometheus2/Dockerfile similarity index 100% rename from docker/blocks/prometheus2/Dockerfile rename to devenv/docker/blocks/prometheus2/Dockerfile diff --git a/docker/blocks/prometheus2/alert.rules b/devenv/docker/blocks/prometheus2/alert.rules similarity index 100% rename from docker/blocks/prometheus2/alert.rules rename to devenv/docker/blocks/prometheus2/alert.rules diff --git a/docker/blocks/prometheus2/prometheus.yml b/devenv/docker/blocks/prometheus2/prometheus.yml similarity index 100% rename from docker/blocks/prometheus2/prometheus.yml rename to devenv/docker/blocks/prometheus2/prometheus.yml diff --git a/docker/blocks/prometheus_mac/Dockerfile b/devenv/docker/blocks/prometheus_mac/Dockerfile similarity index 100% rename from docker/blocks/prometheus_mac/Dockerfile rename to devenv/docker/blocks/prometheus_mac/Dockerfile diff --git a/docker/blocks/prometheus_mac/alert.rules b/devenv/docker/blocks/prometheus_mac/alert.rules similarity index 100% rename from docker/blocks/prometheus_mac/alert.rules rename to devenv/docker/blocks/prometheus_mac/alert.rules diff --git a/docker/blocks/prometheus_mac/prometheus.yml b/devenv/docker/blocks/prometheus_mac/prometheus.yml similarity index 100% rename from docker/blocks/prometheus_mac/prometheus.yml rename to devenv/docker/blocks/prometheus_mac/prometheus.yml diff --git a/docker/blocks/prometheus_random_data/Dockerfile b/devenv/docker/blocks/prometheus_random_data/Dockerfile similarity index 100% rename from docker/blocks/prometheus_random_data/Dockerfile rename to devenv/docker/blocks/prometheus_random_data/Dockerfile diff --git a/docker/blocks/smtp/Dockerfile b/devenv/docker/blocks/smtp/Dockerfile similarity index 100% rename from docker/blocks/smtp/Dockerfile rename to devenv/docker/blocks/smtp/Dockerfile diff --git a/docker/blocks/smtp/bootstrap.sh b/devenv/docker/blocks/smtp/bootstrap.sh similarity index 100% rename from docker/blocks/smtp/bootstrap.sh rename to devenv/docker/blocks/smtp/bootstrap.sh diff --git a/docker/buildcontainer/Dockerfile b/devenv/docker/buildcontainer/Dockerfile similarity index 100% rename from docker/buildcontainer/Dockerfile rename to devenv/docker/buildcontainer/Dockerfile diff --git a/docker/buildcontainer/build.sh b/devenv/docker/buildcontainer/build.sh similarity index 100% rename from docker/buildcontainer/build.sh rename to devenv/docker/buildcontainer/build.sh diff --git a/docker/buildcontainer/build_circle.sh b/devenv/docker/buildcontainer/build_circle.sh similarity index 100% rename from docker/buildcontainer/build_circle.sh rename to devenv/docker/buildcontainer/build_circle.sh diff --git a/docker/buildcontainer/run_circle.sh b/devenv/docker/buildcontainer/run_circle.sh similarity index 100% rename from docker/buildcontainer/run_circle.sh rename to devenv/docker/buildcontainer/run_circle.sh diff --git a/docker/compose_header.yml b/devenv/docker/compose_header.yml similarity index 100% rename from docker/compose_header.yml rename to devenv/docker/compose_header.yml diff --git a/docker/debtest/Dockerfile b/devenv/docker/debtest/Dockerfile similarity index 100% rename from docker/debtest/Dockerfile rename to devenv/docker/debtest/Dockerfile diff --git a/docker/debtest/build.sh b/devenv/docker/debtest/build.sh similarity index 100% rename from docker/debtest/build.sh rename to devenv/docker/debtest/build.sh diff --git a/docker/rpmtest/build.sh b/devenv/docker/rpmtest/build.sh similarity index 100% rename from docker/rpmtest/build.sh rename to devenv/docker/rpmtest/build.sh diff --git a/docker/blocks/apache_proxy/docker-compose.yaml b/docker/blocks/apache_proxy/docker-compose.yaml deleted file mode 100644 index 86d4befadd6..00000000000 --- a/docker/blocks/apache_proxy/docker-compose.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# This will proxy all requests for http://localhost:10081/grafana/ to -# http://localhost:3000 (Grafana running locally) -# -# Please note that you'll need to change the root_url in the Grafana configuration: -# root_url = %(protocol)s://%(domain)s:10081/grafana/ - - apacheproxy: - build: blocks/apache_proxy - network_mode: host diff --git a/docker/blocks/collectd/docker-compose.yaml b/docker/blocks/collectd/docker-compose.yaml deleted file mode 100644 index c95827f7928..00000000000 --- a/docker/blocks/collectd/docker-compose.yaml +++ /dev/null @@ -1,11 +0,0 @@ - collectd: - build: blocks/collectd - environment: - HOST_NAME: myserver - GRAPHITE_HOST: graphite - GRAPHITE_PORT: 2003 - GRAPHITE_PREFIX: collectd. - REPORT_BY_CPU: 'false' - COLLECT_INTERVAL: 10 - links: - - graphite diff --git a/docker/blocks/elastic/docker-compose.yaml b/docker/blocks/elastic/docker-compose.yaml deleted file mode 100644 index 2eba60f38be..00000000000 --- a/docker/blocks/elastic/docker-compose.yaml +++ /dev/null @@ -1,15 +0,0 @@ - elasticsearch: - image: elasticsearch:2.4.1 - command: elasticsearch -Des.network.host=0.0.0.0 - ports: - - "9200:9200" - - "9300:9300" - volumes: - - ./blocks/elastic/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - - fake-elastic-data: - image: grafana/fake-data-gen - network_mode: bridge - environment: - FD_DATASOURCE: elasticsearch - FD_PORT: 9200 diff --git a/docker/blocks/elastic1/docker-compose.yaml b/docker/blocks/elastic1/docker-compose.yaml deleted file mode 100644 index 518ae76e6ee..00000000000 --- a/docker/blocks/elastic1/docker-compose.yaml +++ /dev/null @@ -1,8 +0,0 @@ - elasticsearch1: - image: elasticsearch:1.7.6 - command: elasticsearch -Des.network.host=0.0.0.0 - ports: - - "11200:9200" - - "11300:9300" - volumes: - - ./blocks/elastic/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml diff --git a/docker/blocks/elastic5/docker-compose.yaml b/docker/blocks/elastic5/docker-compose.yaml deleted file mode 100644 index 7148aa18c42..00000000000 --- a/docker/blocks/elastic5/docker-compose.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine - - elasticsearch5: - image: elasticsearch:5 - command: elasticsearch - ports: - - "10200:9200" - - "10300:9300" - - fake-elastic5-data: - image: grafana/fake-data-gen - network_mode: bridge - environment: - FD_DATASOURCE: elasticsearch - FD_PORT: 10200 diff --git a/docker/blocks/elastic6/docker-compose.yaml b/docker/blocks/elastic6/docker-compose.yaml deleted file mode 100644 index dd2439f88e4..00000000000 --- a/docker/blocks/elastic6/docker-compose.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine - - elasticsearch6: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4 - command: elasticsearch - ports: - - "11200:9200" - - "11300:9300" - - fake-elastic6-data: - image: grafana/fake-data-gen - network_mode: bridge - environment: - FD_DATASOURCE: elasticsearch6 - FD_PORT: 11200 diff --git a/docker/blocks/graphite/docker-compose.yaml b/docker/blocks/graphite/docker-compose.yaml deleted file mode 100644 index 606e28638f7..00000000000 --- a/docker/blocks/graphite/docker-compose.yaml +++ /dev/null @@ -1,16 +0,0 @@ - graphite09: - build: blocks/graphite - ports: - - "8080:80" - - "2003:2003" - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - fake-graphite-data: - image: grafana/fake-data-gen - network_mode: bridge - environment: - FD_DATASOURCE: graphite - FD_PORT: 2003 - diff --git a/docker/blocks/graphite1/docker-compose.yaml b/docker/blocks/graphite1/docker-compose.yaml deleted file mode 100644 index cd10593f423..00000000000 --- a/docker/blocks/graphite1/docker-compose.yaml +++ /dev/null @@ -1,21 +0,0 @@ - graphite: - build: - context: blocks/graphite1 - args: - version: master - ports: - - "8080:80" - - "2003:2003" - - "8125:8125/udp" - - "8126:8126" - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - fake-graphite-data: - image: grafana/fake-data-gen - network_mode: bridge - environment: - FD_DATASOURCE: graphite - FD_PORT: 2003 - diff --git a/docker/blocks/graphite11/docker-compose.yaml b/docker/blocks/graphite11/docker-compose.yaml deleted file mode 100644 index 4b0d837a619..00000000000 --- a/docker/blocks/graphite11/docker-compose.yaml +++ /dev/null @@ -1,18 +0,0 @@ - graphite11: - image: graphiteapp/graphite-statsd - ports: - - "8180:80" - - "2103-2104:2003-2004" - - "2123-2124:2023-2024" - - "8225:8125/udp" - - "8226:8126" - - fake-graphite11-data: - image: grafana/fake-data-gen - network_mode: bridge - environment: - FD_DATASOURCE: graphite - FD_PORT: 2103 - FD_GRAPHITE_VERSION: 1.1 - depends_on: - - graphite11 \ No newline at end of file diff --git a/docker/blocks/influxdb/docker-compose.yaml b/docker/blocks/influxdb/docker-compose.yaml deleted file mode 100644 index 3434f5d09b9..00000000000 --- a/docker/blocks/influxdb/docker-compose.yaml +++ /dev/null @@ -1,17 +0,0 @@ - influxdb: - image: influxdb:latest - container_name: influxdb - ports: - - "2004:2004" - - "8083:8083" - - "8086:8086" - volumes: - - ./blocks/influxdb/influxdb.conf:/etc/influxdb/influxdb.conf - - fake-influxdb-data: - image: grafana/fake-data-gen - network_mode: bridge - environment: - FD_DATASOURCE: influxdb - FD_PORT: 8086 - diff --git a/docker/blocks/jaeger/docker-compose.yaml b/docker/blocks/jaeger/docker-compose.yaml deleted file mode 100644 index 2b57c863425..00000000000 --- a/docker/blocks/jaeger/docker-compose.yaml +++ /dev/null @@ -1,6 +0,0 @@ - jaeger: - image: jaegertracing/all-in-one:latest - ports: - - "127.0.0.1:6831:6831/udp" - - "16686:16686" - diff --git a/docker/blocks/memcached/docker-compose.yaml b/docker/blocks/memcached/docker-compose.yaml deleted file mode 100644 index b3201da0f95..00000000000 --- a/docker/blocks/memcached/docker-compose.yaml +++ /dev/null @@ -1,5 +0,0 @@ - memcached: - image: memcached:latest - ports: - - "11211:11211" - diff --git a/docker/blocks/mssql/docker-compose.yaml b/docker/blocks/mssql/docker-compose.yaml deleted file mode 100644 index a346fb791f7..00000000000 --- a/docker/blocks/mssql/docker-compose.yaml +++ /dev/null @@ -1,19 +0,0 @@ - mssql: - build: - context: blocks/mssql/build - environment: - ACCEPT_EULA: Y - MSSQL_SA_PASSWORD: Password! - MSSQL_PID: Developer - MSSQL_DATABASE: grafana - MSSQL_USER: grafana - MSSQL_PASSWORD: Password! - ports: - - "1433:1433" - - fake-mssql-data: - image: grafana/fake-data-gen - network_mode: bridge - environment: - FD_DATASOURCE: mssql - FD_PORT: 1433 \ No newline at end of file diff --git a/docker/blocks/mssql_tests/docker-compose.yaml b/docker/blocks/mssql_tests/docker-compose.yaml deleted file mode 100644 index 5da6aad82af..00000000000 --- a/docker/blocks/mssql_tests/docker-compose.yaml +++ /dev/null @@ -1,12 +0,0 @@ - mssqltests: - build: - context: blocks/mssql/build - environment: - ACCEPT_EULA: Y - MSSQL_SA_PASSWORD: Password! - MSSQL_PID: Express - MSSQL_DATABASE: grafanatest - MSSQL_USER: grafana - MSSQL_PASSWORD: Password! - ports: - - "1433:1433" \ No newline at end of file diff --git a/docker/blocks/mysql/docker-compose.yaml b/docker/blocks/mysql/docker-compose.yaml deleted file mode 100644 index 381b04a53c8..00000000000 --- a/docker/blocks/mysql/docker-compose.yaml +++ /dev/null @@ -1,18 +0,0 @@ - mysql: - image: mysql:5.6 - environment: - MYSQL_ROOT_PASSWORD: rootpass - MYSQL_DATABASE: grafana - MYSQL_USER: grafana - MYSQL_PASSWORD: password - ports: - - "3306:3306" - command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --innodb_monitor_enable=all] - - fake-mysql-data: - image: grafana/fake-data-gen - network_mode: bridge - environment: - FD_DATASOURCE: mysql - FD_PORT: 3306 - diff --git a/docker/blocks/mysql_opendata/docker-compose.yaml b/docker/blocks/mysql_opendata/docker-compose.yaml deleted file mode 100644 index 594eeed284a..00000000000 --- a/docker/blocks/mysql_opendata/docker-compose.yaml +++ /dev/null @@ -1,9 +0,0 @@ - mysql_opendata: - build: blocks/mysql_opendata - environment: - MYSQL_ROOT_PASSWORD: rootpass - MYSQL_DATABASE: testdata - MYSQL_USER: grafana - MYSQL_PASSWORD: password - ports: - - "3307:3306" diff --git a/docker/blocks/mysql_tests/docker-compose.yaml b/docker/blocks/mysql_tests/docker-compose.yaml deleted file mode 100644 index 035a6167017..00000000000 --- a/docker/blocks/mysql_tests/docker-compose.yaml +++ /dev/null @@ -1,11 +0,0 @@ - mysqltests: - build: - context: blocks/mysql_tests - environment: - MYSQL_ROOT_PASSWORD: rootpass - MYSQL_DATABASE: grafana_tests - MYSQL_USER: grafana - MYSQL_PASSWORD: password - ports: - - "3306:3306" - tmpfs: /var/lib/mysql:rw diff --git a/docker/blocks/nginx_proxy/docker-compose.yaml b/docker/blocks/nginx_proxy/docker-compose.yaml deleted file mode 100644 index a0ceceb83ac..00000000000 --- a/docker/blocks/nginx_proxy/docker-compose.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# This will proxy all requests for http://localhost:10080/grafana/ to -# http://localhost:3000 (Grafana running locally) -# -# Please note that you'll need to change the root_url in the Grafana configuration: -# root_url = %(protocol)s://%(domain)s:10080/grafana/ - - nginxproxy: - build: blocks/nginx_proxy - network_mode: host diff --git a/docker/blocks/openldap/docker-compose.yaml b/docker/blocks/openldap/docker-compose.yaml deleted file mode 100644 index be06524a57d..00000000000 --- a/docker/blocks/openldap/docker-compose.yaml +++ /dev/null @@ -1,10 +0,0 @@ - openldap: - build: blocks/openldap - environment: - SLAPD_PASSWORD: grafana - SLAPD_DOMAIN: grafana.org - SLAPD_ADDITIONAL_MODULES: memberof - ports: - - "389:389" - - diff --git a/docker/blocks/opentsdb/docker-compose.yaml b/docker/blocks/opentsdb/docker-compose.yaml deleted file mode 100644 index ee064bb107d..00000000000 --- a/docker/blocks/opentsdb/docker-compose.yaml +++ /dev/null @@ -1,11 +0,0 @@ - opentsdb: - image: opower/opentsdb:latest - ports: - - "4242:4242" - - fake-opentsdb-data: - image: grafana/fake-data-gen - network_mode: bridge - environment: - FD_DATASOURCE: opentsdb - diff --git a/docker/blocks/postgres/docker-compose.yaml b/docker/blocks/postgres/docker-compose.yaml deleted file mode 100644 index 27736042f7b..00000000000 --- a/docker/blocks/postgres/docker-compose.yaml +++ /dev/null @@ -1,16 +0,0 @@ - postgrestest: - image: postgres:9.3 - environment: - POSTGRES_USER: grafana - POSTGRES_PASSWORD: password - POSTGRES_DATABASE: grafana - ports: - - "5432:5432" - command: postgres -c log_connections=on -c logging_collector=on -c log_destination=stderr -c log_directory=/var/log/postgresql - - fake-postgres-data: - image: grafana/fake-data-gen - network_mode: bridge - environment: - FD_DATASOURCE: postgres - FD_PORT: 5432 diff --git a/docker/blocks/postgres_tests/docker-compose.yaml b/docker/blocks/postgres_tests/docker-compose.yaml deleted file mode 100644 index f5ce0a5a3d3..00000000000 --- a/docker/blocks/postgres_tests/docker-compose.yaml +++ /dev/null @@ -1,9 +0,0 @@ - postgrestest: - build: - context: blocks/postgres_tests - environment: - POSTGRES_USER: grafanatest - POSTGRES_PASSWORD: grafanatest - ports: - - "5432:5432" - tmpfs: /var/lib/postgresql/data:rw \ No newline at end of file diff --git a/docker/blocks/prometheus/docker-compose.yaml b/docker/blocks/prometheus/docker-compose.yaml deleted file mode 100644 index 3c304cc74ad..00000000000 --- a/docker/blocks/prometheus/docker-compose.yaml +++ /dev/null @@ -1,31 +0,0 @@ - prometheus: - build: blocks/prometheus - network_mode: host - ports: - - "9090:9090" - - node_exporter: - image: prom/node-exporter - network_mode: host - ports: - - "9100:9100" - - fake-prometheus-data: - image: grafana/fake-data-gen - network_mode: host - ports: - - "9091:9091" - environment: - FD_DATASOURCE: prom - - alertmanager: - image: quay.io/prometheus/alertmanager - network_mode: host - ports: - - "9093:9093" - - prometheus-random-data: - build: blocks/prometheus_random_data - network_mode: host - ports: - - "8081:8080" diff --git a/docker/blocks/prometheus2/docker-compose.yaml b/docker/blocks/prometheus2/docker-compose.yaml deleted file mode 100644 index 589df868084..00000000000 --- a/docker/blocks/prometheus2/docker-compose.yaml +++ /dev/null @@ -1,31 +0,0 @@ - prometheus: - build: blocks/prometheus2 - network_mode: host - ports: - - "9090:9090" - - node_exporter: - image: prom/node-exporter - network_mode: host - ports: - - "9100:9100" - - fake-prometheus-data: - image: grafana/fake-data-gen - network_mode: host - ports: - - "9091:9091" - environment: - FD_DATASOURCE: prom - - alertmanager: - image: quay.io/prometheus/alertmanager - network_mode: host - ports: - - "9093:9093" - - prometheus-random-data: - build: blocks/prometheus_random_data - network_mode: host - ports: - - "8081:8080" diff --git a/docker/blocks/prometheus_mac/docker-compose.yaml b/docker/blocks/prometheus_mac/docker-compose.yaml deleted file mode 100644 index ef53b07418a..00000000000 --- a/docker/blocks/prometheus_mac/docker-compose.yaml +++ /dev/null @@ -1,26 +0,0 @@ - prometheus: - build: blocks/prometheus_mac - ports: - - "9090:9090" - - node_exporter: - image: prom/node-exporter - ports: - - "9100:9100" - - fake-prometheus-data: - image: grafana/fake-data-gen - ports: - - "9091:9091" - environment: - FD_DATASOURCE: prom - - alertmanager: - image: quay.io/prometheus/alertmanager - ports: - - "9093:9093" - - prometheus-random-data: - build: blocks/prometheus_random_data - ports: - - "8081:8080" diff --git a/docker/blocks/smtp/docker-compose.yaml b/docker/blocks/smtp/docker-compose.yaml deleted file mode 100644 index 85d598b6167..00000000000 --- a/docker/blocks/smtp/docker-compose.yaml +++ /dev/null @@ -1,4 +0,0 @@ - snmpd: - image: namshi/smtp - ports: - - "25:25" From 8dbba467f158703948103c7d9c0a5dd4cbb04e0e Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 17 Sep 2018 17:29:11 +0200 Subject: [PATCH 3/7] moves /tests to /pkg/plugins ref #11433 --- pkg/plugins/dashboard_importer_test.go | 4 ++-- pkg/plugins/dashboards_test.go | 2 +- pkg/plugins/plugins_test.go | 2 +- {tests => pkg/plugins/testdata}/datasource-test/module.js | 0 {tests => pkg/plugins/testdata}/datasource-test/plugin.json | 0 .../plugins/testdata}/test-app/dashboards/connections.json | 0 .../testdata}/test-app/dashboards/connections_result.json | 0 .../plugins/testdata}/test-app/dashboards/memory.json | 0 {tests => pkg/plugins/testdata}/test-app/plugin.json | 0 9 files changed, 4 insertions(+), 4 deletions(-) rename {tests => pkg/plugins/testdata}/datasource-test/module.js (100%) rename {tests => pkg/plugins/testdata}/datasource-test/plugin.json (100%) rename {tests => pkg/plugins/testdata}/test-app/dashboards/connections.json (100%) rename {tests => pkg/plugins/testdata}/test-app/dashboards/connections_result.json (100%) rename {tests => pkg/plugins/testdata}/test-app/dashboards/memory.json (100%) rename {tests => pkg/plugins/testdata}/test-app/plugin.json (100%) diff --git a/pkg/plugins/dashboard_importer_test.go b/pkg/plugins/dashboard_importer_test.go index 6f31b49f99d..ca8dfcd515c 100644 --- a/pkg/plugins/dashboard_importer_test.go +++ b/pkg/plugins/dashboard_importer_test.go @@ -35,7 +35,7 @@ func TestDashboardImport(t *testing.T) { So(cmd.Result, ShouldNotBeNil) resultStr, _ := mock.SavedDashboards[0].Dashboard.Data.EncodePretty() - expectedBytes, _ := ioutil.ReadFile("../../tests/test-app/dashboards/connections_result.json") + expectedBytes, _ := ioutil.ReadFile("testdata/test-app/dashboards/connections_result.json") expectedJson, _ := simplejson.NewJson(expectedBytes) expectedStr, _ := expectedJson.EncodePretty() @@ -89,7 +89,7 @@ func pluginScenario(desc string, t *testing.T, fn func()) { Convey("Given a plugin", t, func() { setting.Raw = ini.Empty() sec, _ := setting.Raw.NewSection("plugin.test-app") - sec.NewKey("path", "../../tests/test-app") + sec.NewKey("path", "testdata/test-app") pm := &PluginManager{} err := pm.Init() diff --git a/pkg/plugins/dashboards_test.go b/pkg/plugins/dashboards_test.go index c422a1431c0..6fc6ace0e00 100644 --- a/pkg/plugins/dashboards_test.go +++ b/pkg/plugins/dashboards_test.go @@ -16,7 +16,7 @@ func TestPluginDashboards(t *testing.T) { Convey("When asking plugin dashboard info", t, func() { setting.Raw = ini.Empty() sec, _ := setting.Raw.NewSection("plugin.test-app") - sec.NewKey("path", "../../tests/test-app") + sec.NewKey("path", "testdata/test-app") pm := &PluginManager{} err := pm.Init() diff --git a/pkg/plugins/plugins_test.go b/pkg/plugins/plugins_test.go index fa68ae4389d..d16e6abb4c7 100644 --- a/pkg/plugins/plugins_test.go +++ b/pkg/plugins/plugins_test.go @@ -30,7 +30,7 @@ func TestPluginScans(t *testing.T) { Convey("When reading app plugin definition", t, func() { setting.Raw = ini.Empty() sec, _ := setting.Raw.NewSection("plugin.nginx-app") - sec.NewKey("path", "../../tests/test-app") + sec.NewKey("path", "testdata/test-app") pm := &PluginManager{} err := pm.Init() diff --git a/tests/datasource-test/module.js b/pkg/plugins/testdata/datasource-test/module.js similarity index 100% rename from tests/datasource-test/module.js rename to pkg/plugins/testdata/datasource-test/module.js diff --git a/tests/datasource-test/plugin.json b/pkg/plugins/testdata/datasource-test/plugin.json similarity index 100% rename from tests/datasource-test/plugin.json rename to pkg/plugins/testdata/datasource-test/plugin.json diff --git a/tests/test-app/dashboards/connections.json b/pkg/plugins/testdata/test-app/dashboards/connections.json similarity index 100% rename from tests/test-app/dashboards/connections.json rename to pkg/plugins/testdata/test-app/dashboards/connections.json diff --git a/tests/test-app/dashboards/connections_result.json b/pkg/plugins/testdata/test-app/dashboards/connections_result.json similarity index 100% rename from tests/test-app/dashboards/connections_result.json rename to pkg/plugins/testdata/test-app/dashboards/connections_result.json diff --git a/tests/test-app/dashboards/memory.json b/pkg/plugins/testdata/test-app/dashboards/memory.json similarity index 100% rename from tests/test-app/dashboards/memory.json rename to pkg/plugins/testdata/test-app/dashboards/memory.json diff --git a/tests/test-app/plugin.json b/pkg/plugins/testdata/test-app/plugin.json similarity index 100% rename from tests/test-app/plugin.json rename to pkg/plugins/testdata/test-app/plugin.json From f8ca55bb1f444107baad5f16bed9c971ce17cb47 Mon Sep 17 00:00:00 2001 From: Nick Triller Date: Mon, 17 Sep 2018 17:56:52 +0200 Subject: [PATCH 4/7] Fix setting test --- pkg/setting/setting_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go index 9b19b6c6bfa..6524073e4da 100644 --- a/pkg/setting/setting_test.go +++ b/pkg/setting/setting_test.go @@ -130,7 +130,7 @@ func TestLoadingSettings(t *testing.T) { cfg := NewCfg() cfg.Load(&CommandLineArgs{ HomePath: "../../", - Config: filepath.Join(HomePath, "tests/config-files/override_windows.ini"), + Config: filepath.Join(HomePath, "pkg/setting/testdata/override_windows.ini"), Args: []string{`cfg:paths.data=c:\tmp\data`}, }) From 1be26ad362a95074a85fdea3b1def47eff12d91d Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 18 Sep 2018 10:47:01 +0200 Subject: [PATCH 5/7] disable codecov --- scripts/circle-test-backend.sh | 12 +----------- scripts/circle-test-frontend.sh | 7 +------ 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/scripts/circle-test-backend.sh b/scripts/circle-test-backend.sh index 4740ef99f1a..959a5812d81 100755 --- a/scripts/circle-test-backend.sh +++ b/scripts/circle-test-backend.sh @@ -17,17 +17,7 @@ echo "building backend with install to cache pkgs" exit_if_fail time go install ./pkg/cmd/grafana-server echo "running go test" - set -e -echo "" > coverage.txt - time for d in $(go list ./pkg/...); do - exit_if_fail go test -coverprofile=profile.out -covermode=atomic $d - if [ -f profile.out ]; then - cat profile.out >> coverage.txt - rm profile.out - fi + exit_if_fail go test -covermode=atomic $d done - -echo "Publishing go code coverage" -bash <(curl -s https://codecov.io/bash) -cF go diff --git a/scripts/circle-test-frontend.sh b/scripts/circle-test-frontend.sh index 796af82e7d8..3af199d3ff2 100755 --- a/scripts/circle-test-frontend.sh +++ b/scripts/circle-test-frontend.sh @@ -10,9 +10,4 @@ function exit_if_fail { fi } -exit_if_fail npm run test:coverage - -# publish code coverage -echo "Publishing javascript code coverage" -bash <(curl -s https://codecov.io/bash) -cF javascript -rm -rf coverage +exit_if_fail npm run test From 63ed02e626939eb4ff342d324c1863f1ad314fb3 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 18 Sep 2018 11:44:31 +0200 Subject: [PATCH 6/7] removes codedov refs --- Gruntfile.js | 1 - codecov.yml | 11 ----------- package.json | 1 - scripts/grunt/options/exec.js | 7 +------ 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 codecov.yml diff --git a/Gruntfile.js b/Gruntfile.js index 8a71fb44148..2d5990b5f58 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -25,7 +25,6 @@ module.exports = function (grunt) { } } - config.coverage = grunt.option('coverage'); config.phjs = grunt.option('phjsToRelease'); config.pkg.version = grunt.option('pkgVer') || config.pkg.version; diff --git a/codecov.yml b/codecov.yml deleted file mode 100644 index b2a839365ac..00000000000 --- a/codecov.yml +++ /dev/null @@ -1,11 +0,0 @@ -coverage: - precision: 2 - round: down - range: "50...100" - - status: - project: yes - patch: yes - changes: no - -comment: off diff --git a/package.json b/package.json index f4846f9fc51..1e7ed02c87b 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,6 @@ "watch": "webpack --progress --colors --watch --mode development --config scripts/webpack/webpack.dev.js", "build": "grunt build", "test": "grunt test", - "test:coverage": "grunt test --coverage=true", "lint": "tslint -c tslint.json --project tsconfig.json", "jest": "jest --notify --watch", "api-tests": "jest --notify --watch --config=tests/api/jest.js", diff --git a/scripts/grunt/options/exec.js b/scripts/grunt/options/exec.js index 087439f7ea9..2634f2b546b 100644 --- a/scripts/grunt/options/exec.js +++ b/scripts/grunt/options/exec.js @@ -1,14 +1,9 @@ module.exports = function(config, grunt) { 'use strict'; - var coverage = ''; - if (config.coverage) { - coverage = '--coverage --maxWorkers 2'; - } - return { tslint: 'node ./node_modules/tslint/lib/tslintCli.js -c tslint.json --project ./tsconfig.json', - jest: 'node ./node_modules/jest-cli/bin/jest.js ' + coverage, + jest: 'node ./node_modules/jest-cli/bin/jest.js', webpack: 'node ./node_modules/webpack/bin/webpack.js --config scripts/webpack/webpack.prod.js', }; }; From 0f8b9b8ff9e01d7c4cbe705101ee87d21082d4bd Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 18 Sep 2018 12:07:53 +0200 Subject: [PATCH 7/7] set maxworkers 2 for frontend tests --- scripts/circle-test-frontend.sh | 1 + scripts/grunt/options/exec.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/circle-test-frontend.sh b/scripts/circle-test-frontend.sh index 3af199d3ff2..68c044b395c 100755 --- a/scripts/circle-test-frontend.sh +++ b/scripts/circle-test-frontend.sh @@ -11,3 +11,4 @@ function exit_if_fail { } exit_if_fail npm run test +exit_if_fail npm run build diff --git a/scripts/grunt/options/exec.js b/scripts/grunt/options/exec.js index 2634f2b546b..92e530cd5fd 100644 --- a/scripts/grunt/options/exec.js +++ b/scripts/grunt/options/exec.js @@ -3,7 +3,7 @@ module.exports = function(config, grunt) { return { tslint: 'node ./node_modules/tslint/lib/tslintCli.js -c tslint.json --project ./tsconfig.json', - jest: 'node ./node_modules/jest-cli/bin/jest.js', + jest: 'node ./node_modules/jest-cli/bin/jest.js --maxWorkers 2', webpack: 'node ./node_modules/webpack/bin/webpack.js --config scripts/webpack/webpack.prod.js', }; };