Skip to content

Commit c128b46

Browse files
make: remove deprecated build targets
After introducing config-based static (actually, not only static) builds in [1] old way of static building through `make` was deprecated. Since we'll need to extend deprecated commands to support Tarantool 3 and Tarantool Cartridge at the same time, it's a good motivation to remove them. 1. #206 Part of #224
1 parent e344090 commit c128b46

27 files changed

+1
-317492
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
It affects all custom-built dashboards which had used `cluster` (#224)
1212
- Renamed build `replication` panels section to `replication_cartridge`.
1313
It affects all custom-built dashboards which had used `replication` (#224)
14+
- Remove deprecated `build-static-*` targets from `make` (#224)
1415

1516
### Fixed
1617
- Removed extra quotation mark for TDG jobs_average_panel query (#220)

Makefile

-61
Original file line numberDiff line numberDiff line change
@@ -23,67 +23,6 @@ endif
2323
-e "local build = import 'dashboard/build/from_config.libsonnet'; local file = importstr '${CONFIG}'; build(std.parseYaml(file))" \
2424
-o ${OUTPUT}
2525

26-
27-
_build-static-prometheus:
28-
ifndef DATASOURCE
29-
@echo 1>&2 "DATASOURCE must be set"
30-
false
31-
endif
32-
# JOB is optional, default is "tarantool"
33-
# WITH_INSTANCE_VARIABLE is optional, default is "FALSE"
34-
# TITLE is optional, default is "Tarantool dashboard" for plain dashboard
35-
# and "Tarantool Data Grid dashboard" for TDG one
36-
jsonnet -J ./vendor -J . \
37-
--ext-str DASHBOARD_TEMPLATE=${DASHBOARD_TEMPLATE} \
38-
--ext-str DATASOURCE_TYPE='prometheus' \
39-
--ext-str DATASOURCE=${DATASOURCE} \
40-
--ext-str JOB=${JOB} \
41-
--ext-str WITH_INSTANCE_VARIABLE=${WITH_INSTANCE_VARIABLE} \
42-
--ext-str TITLE='${TITLE}' \
43-
dashboard/build/from_ext_var.jsonnet -o ${OUTPUT_STATIC_DASHBOARD}
44-
45-
.PHONY: build-static-prometheus
46-
build-static-prometheus:
47-
@echo "This command is deprecated. Please, migrate to using 'CONFIG=config.yml make build' instead"
48-
${MAKE} DASHBOARD_TEMPLATE='Tarantool' _build-static-prometheus
49-
50-
.PHONY: build-static-tdg-prometheus
51-
build-static-tdg-prometheus:
52-
@echo "This command is deprecated. Please, migrate to using 'CONFIG=config.yml make build' instead"
53-
${MAKE} DASHBOARD_TEMPLATE='TDG' _build-static-prometheus
54-
55-
56-
_build-static-influxdb:
57-
ifndef DATASOURCE
58-
@echo 1>&2 "DATASOURCE must be set"
59-
false
60-
endif
61-
# POLICY is optional, default is "autogen"
62-
# MEASUREMENT is optional, default is "tarantool_http"
63-
# WITH_INSTANCE_VARIABLE is optional, default is "FALSE"
64-
# TITLE is optional, default is "Tarantool dashboard" for plain dashboard
65-
# and "Tarantool Data Grid dashboard" for TDG one
66-
jsonnet -J ./vendor -J . \
67-
--ext-str DASHBOARD_TEMPLATE=${DASHBOARD_TEMPLATE} \
68-
--ext-str DATASOURCE_TYPE='influxdb' \
69-
--ext-str DATASOURCE=${DATASOURCE} \
70-
--ext-str POLICY=${POLICY} \
71-
--ext-str MEASUREMENT=${MEASUREMENT} \
72-
--ext-str WITH_INSTANCE_VARIABLE=${WITH_INSTANCE_VARIABLE} \
73-
--ext-str TITLE='${TITLE}' \
74-
dashboard/build/from_ext_var.jsonnet -o ${OUTPUT_STATIC_DASHBOARD}
75-
76-
.PHONY: build-static-influxdb
77-
build-static-influxdb:
78-
@echo "This command is deprecated. Please, migrate to using 'CONFIG=config.yml make build' instead"
79-
${MAKE} DASHBOARD_TEMPLATE='Tarantool' _build-static-influxdb
80-
81-
.PHONY: build-static-tdg-influxdb
82-
build-static-tdg-influxdb:
83-
@echo "This command is deprecated. Please, migrate to using 'CONFIG=config.yml make build' instead"
84-
${MAKE} DASHBOARD_TEMPLATE='TDG' _build-static-influxdb
85-
86-
8726
.PHONY: test-deps
8827
test-deps: build-deps
8928
go install github.com/google/go-jsonnet/cmd/[email protected]

dashboard/build/from_ext_var.jsonnet

-93
This file was deleted.

tests.sh

-26
Original file line numberDiff line numberDiff line change
@@ -44,32 +44,6 @@ do
4444
fi
4545
done
4646

47-
for i in tests/*/*.sh
48-
do
49-
json=$(dirname $i)/$( basename $i .sh )_test_output.json
50-
json_e=$(dirname $i)/$( basename $i .sh )_compiled.json
51-
t="Executing $i..."
52-
if OUTPUT_STATIC_DASHBOARD=$json $i > /dev/null
53-
then
54-
echo $t OK
55-
else
56-
echo $t NOK
57-
x=1
58-
continue
59-
fi
60-
61-
if [[ "$1" == "update" ]]; then cp $json $json_e; fi
62-
63-
t="Checking $i..."
64-
if diff -urt $json_e $json
65-
then
66-
echo $t OK
67-
else
68-
echo $t NOK
69-
x=1
70-
fi
71-
done
72-
7347
for i in tests/*/*.yml
7448
do
7549
json=$(dirname $i)/$( basename $i .yml )_test_output.json

tests/InfluxDB/dashboard_static.sh

-6
This file was deleted.

0 commit comments

Comments
 (0)