Removed support for elastic search 3

Signed-off-by: Łukasz Gryglicki <[email protected]>
cncf · May 24, 2024 · b048467 · b048467
1 parent 2026275
commit b048467
Show file tree

Hide file tree

Showing 21 changed files with 11 additions and 179 deletions.
diff --git a/all/reinit.sh b/all/reinit.sh
@@ -25,7 +25,7 @@ then
   ./devel/db.sh psql allprj -c "delete from gha_vars" || exit 3
   ./devel/db.sh psql allprj -c "delete from gha_computed" || exit 4
   GHA2DB_PROJECT=all PG_DB=allprj GHA2DB_LOCAL=1 vars || exit 5
-  GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_SKIP_METRICS="projects_health" GHA2DB_EXCLUDE_VARS="projects_health_partial_html" GHA2DB_PROJECT=all PG_DB=allprj GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 GHA2DB_RESET_ES_RAW=1 GHA2DB_LOCAL=1 GHA2DB_SKIP_VARS=1 gha2db_sync || exit 6
+  GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_SKIP_METRICS="projects_health" GHA2DB_EXCLUDE_VARS="projects_health_partial_html" GHA2DB_PROJECT=all PG_DB=allprj GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 GHA2DB_LOCAL=1 GHA2DB_SKIP_VARS=1 gha2db_sync || exit 6
   if [ ! -z "$HEALTH" ]
   then
     ./devel/add_all_annotations.sh || exit 7
@@ -43,7 +43,7 @@ else
   ./devel/db.sh psql allprj_temp -c "delete from gha_vars" || exit 14
   ./devel/db.sh psql allprj_temp -c "delete from gha_computed" || exit 15
   GHA2DB_PROJECT=all PG_DB=allprj_temp GHA2DB_LOCAL=1 vars || exit 16
-  GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_SKIP_METRICS="projects_health" GHA2DB_EXCLUDE_VARS="projects_health_partial_html" GHA2DB_PROJECT=all PG_DB=allprj_temp GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 GHA2DB_RESET_ES_RAW=1 GHA2DB_LOCAL=1 GHA2DB_SKIP_VARS=1 gha2db_sync || exit 17
+  GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_SKIP_METRICS="projects_health" GHA2DB_EXCLUDE_VARS="projects_health_partial_html" GHA2DB_PROJECT=all PG_DB=allprj_temp GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 GHA2DB_LOCAL=1 GHA2DB_SKIP_VARS=1 gha2db_sync || exit 17
   # HEALTH=1 unsupported in temp database mode
   ./devel/drop_psql_db.sh allprj || exit 18
   ./devel/db.sh psql postgres -c "select pg_terminate_backend(pid) from pg_stat_activity where datname = 'allprj_temp'" || exit 19

diff --git a/all/reinit_es_only.sh b/all/reinit_es_only.sh
diff --git a/allcdf/reinit.sh b/allcdf/reinit.sh
@@ -25,7 +25,7 @@ then
   ./devel/db.sh psql allcdf -c "delete from gha_vars" || exit 3
   ./devel/db.sh psql allcdf -c "delete from gha_computed" || exit 4
   GHA2DB_PROJECT=allcdf PG_DB=allcdf GHA2DB_LOCAL=1 vars || exit 5
-  GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_SKIP_METRICS="projects_health" GHA2DB_EXCLUDE_VARS="projects_health_partial_html" GHA2DB_PROJECT=allcdf PG_DB=allcdf GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 GHA2DB_RESET_ES_RAW=1 GHA2DB_LOCAL=1 GHA2DB_SKIP_VARS=1 gha2db_sync || exit 6
+  GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_SKIP_METRICS="projects_health" GHA2DB_EXCLUDE_VARS="projects_health_partial_html" GHA2DB_PROJECT=allcdf PG_DB=allcdf GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 GHA2DB_LOCAL=1 GHA2DB_SKIP_VARS=1 gha2db_sync || exit 6
   if [ ! -z "$HEALTH" ]
   then
     TEST_SERVER=1 LIST_FN_PREFIX="./cdf/all_" GHA2DB_PROJECTS_YAML="cdf/projects.yaml" ./devel/add_all_annotations.sh || exit 7
@@ -43,7 +43,7 @@ else
   ./devel/db.sh psql allcdf_temp -c "delete from gha_vars" || exit 14
   ./devel/db.sh psql allcdf_temp -c "delete from gha_computed" || exit 15
   GHA2DB_PROJECT=all PG_DB=allcdf_temp GHA2DB_LOCAL=1 vars || exit 16
-  GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_SKIP_METRICS="projects_health" GHA2DB_EXCLUDE_VARS="projects_health_partial_html" GHA2DB_PROJECT=all PG_DB=allcdf_temp GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 GHA2DB_RESET_ES_RAW=1 GHA2DB_LOCAL=1 GHA2DB_SKIP_VARS=1 gha2db_sync || exit 17
+  GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_SKIP_METRICS="projects_health" GHA2DB_EXCLUDE_VARS="projects_health_partial_html" GHA2DB_PROJECT=all PG_DB=allcdf_temp GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 GHA2DB_LOCAL=1 GHA2DB_SKIP_VARS=1 gha2db_sync || exit 17
   # HEALTH=1 unsupported in temp database mode
   ./devel/drop_psql_db.sh allcdf || exit 18
   ./devel/db.sh psql postgres -c "select pg_terminate_backend(pid) from pg_stat_activity where datname = 'allcdf_temp'" || exit 19

diff --git a/allcdf/reinit_es_only.sh b/allcdf/reinit_es_only.sh
diff --git a/devel/add_single_metric_all_es.sh b/devel/add_single_metric_all_es.sh
diff --git a/devel/reinit_es_only.sh b/devel/reinit_es_only.sh
diff --git a/devel/test_reinit_all.sh b/devel/test_reinit_all.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 ./devel/drop_ts_tables.sh test || exit 1
-PG_DB=gha PG_DB=test GHA2DB_SKIPPDB=1 GHA2DB_LOCAL=1 GHA2DB_CMDDEBUG=1 GHA2DB_RESET_ES_RAW=1 GHA2DB_RESETTSDB=1 gha2db_sync || exit 1
+PG_DB=gha PG_DB=test GHA2DB_SKIPPDB=1 GHA2DB_LOCAL=1 GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 gha2db_sync || exit 1
diff --git a/shared/reinit.sh b/shared/reinit.sh
@@ -29,7 +29,7 @@ then
   PG_USER="${user}" ./devel/db.sh psql "$PG_DB" -c "delete from gha_vars" || exit 3
   PG_USER="${user}" ./devel/db.sh psql "$PG_DB" -c "delete from gha_computed" || exit 4
   GHA2DB_LOCAL=1 vars || exit 5
-  GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 GHA2DB_RESET_ES_RAW=1 GHA2DB_LOCAL=1 gha2db_sync || exit 6
+  GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 GHA2DB_LOCAL=1 gha2db_sync || exit 6
 else
   db=$PG_DB
   tdb="${PG_DB}_temp"
@@ -43,7 +43,7 @@ else
   PG_USER="${user}" ./devel/db.sh psql $tdb -c "delete from gha_vars" || exit 11
   PG_USER="${user}" ./devel/db.sh psql $tdb -c "delete from gha_computed" || exit 12
   GHA2DB_LOCAL=1 PG_DB=$tdb vars || exit 13
-  GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 GHA2DB_RESET_ES_RAW=1 GHA2DB_LOCAL=1 PG_DB=$tdb gha2db_sync || exit 14
+  GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_CMDDEBUG=1 GHA2DB_RESETTSDB=1 GHA2DB_LOCAL=1 PG_DB=$tdb gha2db_sync || exit 14
   ./devel/drop_psql_db.sh $db || exit 15
   ./devel/db.sh psql postgres -c "select pg_terminate_backend(pid) from pg_stat_activity where datname = '$tdb'" || exit 16
   ./devel/db.sh psql postgres -c "alter database \"$tdb\" rename to \"$db\"" || exit 17

diff --git a/shared/reinit_es_only.sh b/shared/reinit_es_only.sh
diff --git a/shared/update_affs.sh b/shared/update_affs.sh
@@ -20,4 +20,4 @@ then
   ./devel/drop_tsdb_affs_tables.sh "$PG_DB"
 fi
 # GHA2DB_COLUMNS_YAML=metrics/$GHA2DB_PROJECT/columns_affs.yaml GHA2DB_LOCAL=1 columns
-GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_CMDDEBUG=1 GHA2DB_LOCAL=1 GHA2DB_RESET_ES_RAW=1 GHA2DB_RESETTSDB=1 GHA2DB_COLUMNS_YAML=./metrics/$proj/columns_affs.yaml GHA2DB_METRICS_YAML=./metrics/$proj/metrics_affs.yaml GHA2DB_TAGS_YAML=./metrics/$proj/tags_affs.yaml gha2db_sync
+GHA2DB_ENABLE_METRICS_DROP=1 GHA2DB_CMDDEBUG=1 GHA2DB_LOCAL=1 GHA2DB_RESETTSDB=1 GHA2DB_COLUMNS_YAML=./metrics/$proj/columns_affs.yaml GHA2DB_METRICS_YAML=./metrics/$proj/metrics_affs.yaml GHA2DB_TAGS_YAML=./metrics/$proj/tags_affs.yaml gha2db_sync
diff --git a/util_sh/annotations.sh b/util_sh/annotations.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-GHA2DB_PROJECT=kubernetes GHA2DB_DEBUG=1 GHA2DB_USE_ES=1 GHA2DB_ES_URL="http://127.0.0.1:9200" GHA2DB_SKIPTSDB=1 ./shared/annotations.sh
+GHA2DB_PROJECT=kubernetes GHA2DB_DEBUG=1 GHA2DB_SKIPTSDB=1 ./shared/annotations.sh
diff --git a/util_sh/calc_metric.sh b/util_sh/calc_metric.sh
diff --git a/util_sh/calc_metric_inside_container.sh b/util_sh/calc_metric_inside_container.sh
diff --git a/util_sh/generate_es.sh b/util_sh/generate_es.sh
diff --git a/util_sh/k8s_es_data.sh b/util_sh/k8s_es_data.sh
diff --git a/util_sh/projects_health_es.sh b/util_sh/projects_health_es.sh
diff --git a/util_sh/recalculate_periods_from.sh b/util_sh/recalculate_periods_from.sh
@@ -32,4 +32,4 @@ then
   trap finish EXIT
   export TRAP=1
 fi
-GHA2DB_LOCAL=1 GHA2DB_RESET_ES_RAW=1 GHA2DB_SKIP_TAGS=1 GHA2DB_SKIP_ANNOTATIONS=1 GHA2DB_SKIP_COLUMNS=1 GHA2DB_SKIPPDB=1 GHA2DB_STARTDT_FORCE=1 GHA2DB_STARTDT="$1" GHA2DB_RESETTSDB=1 GHA2DB_FORCE_PERIODS="$2" gha2db_sync
+GHA2DB_LOCAL=1 GHA2DB_SKIP_TAGS=1 GHA2DB_SKIP_ANNOTATIONS=1 GHA2DB_SKIP_COLUMNS=1 GHA2DB_SKIPPDB=1 GHA2DB_STARTDT_FORCE=1 GHA2DB_STARTDT="$1" GHA2DB_RESETTSDB=1 GHA2DB_FORCE_PERIODS="$2" gha2db_sync
diff --git a/util_sh/reinit_es_cncf.sh b/util_sh/reinit_es_cncf.sh
diff --git a/util_sh/tags.sh b/util_sh/tags.sh
@@ -1 +1 @@
-clear; GHA2DB_DEBUG=1 GHA2DB_USE_ES=1 GHA2DB_ES_URL="http://127.0.0.1:9200" GHA2DB_SKIPTSDB=1 GHA2DB_TAGS_YAML=devel/test_tags.yaml GHA2DB_LOCAL=1 GHA2DB_PROJECT=kubernetes tags
+clear; GHA2DB_DEBUG=1 GHA2DB_SKIPTSDB=1 GHA2DB_TAGS_YAML=devel/test_tags.yaml GHA2DB_LOCAL=1 GHA2DB_PROJECT=kubernetes tags
diff --git a/util_sh/vars.sh b/util_sh/vars.sh
diff --git a/util_sh/vars_inside_container.sh b/util_sh/vars_inside_container.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		clear; GHA2DB_DEBUG=1 GHA2DB_USE_ES=1 GHA2DB_ES_URL="http://127.0.0.1:9200" GHA2DB_SKIPTSDB=1 GHA2DB_TAGS_YAML=devel/test_tags.yaml GHA2DB_LOCAL=1 GHA2DB_PROJECT=kubernetes tags
		clear; GHA2DB_DEBUG=1 GHA2DB_SKIPTSDB=1 GHA2DB_TAGS_YAML=devel/test_tags.yaml GHA2DB_LOCAL=1 GHA2DB_PROJECT=kubernetes tags