jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into dev

Browse source 
# Conflicts:
#	api/build.sh
#	api/build_alerts.sh
#	assist/build.sh
#	peers/build.sh
#	scripts/helmcharts/openreplay/charts/chalice/Chart.yaml
#	scripts/helmcharts/openreplay/charts/frontend/Chart.yaml
#	sourcemap-reader/build.sh
This commit is contained in:
Taha Yassine Kraiem 2023-03-29 16:49:29 +01:00
commit d290cd8276
6 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ee/scripts/schema/db/init_dbs/postgresql/1.10.0/1.10.0.sql
View file

@ -87,8 +87,8 @@ $$
);
CREATE TABLE backup_v1_10_0.metric_series
(
series_id integer generated BY DEFAULT AS IDENTITY PRIMARY KEY,
metric_id integer REFERENCES metrics (metric_id) ON DELETE CASCADE,
series_id integer,
metric_id integer,
index integer NOT NULL,
name text NULL,
filter jsonb NOT NULL,

2
scripts/dev_env/colima/README.md
View file

@ -22,7 +22,7 @@ colima start --with-kubernetes --cpu 2 --memory 8 -p openreplay
```yaml
git clone https://github.com/openreplay/openreplay -b dev
cd openreplay/scripts/helmcharts
SKIP_K8S_INSTALL=true SKIP_K8S_TOOLS=true gDOMAIN_NAME=openreplay.local bash -x init.sh
SKIP_K8S_INSTALL=true SKIP_K8S_TOOLS=true DOMAIN_NAME=openreplay.local bash -x init.sh
```
## Updating DNS

9
scripts/helmcharts/init.sh
View file

@ -145,11 +145,11 @@ function set_permissions() {
## Installing OpenReplay
function install_openreplay() {
info "installing toolings"
helm upgrade --install toolings ./toolings -n app --create-namespace --wait -f ./vars.yaml --atomic
helm upgrade --install toolings ./toolings -n app --create-namespace --wait -f ./vars.yaml --atomic --debug
info "installing databases"
helm upgrade --install databases ./databases -n db --create-namespace --wait -f ./vars.yaml --atomic
helm upgrade --install databases ./databases -n db --create-namespace --wait -f ./vars.yaml --atomic --debug
info "installing application"
helm upgrade --install openreplay ./openreplay -n app --create-namespace --wait -f ./vars.yaml --atomic
helm upgrade --install openreplay ./openreplay -n app --create-namespace --wait -f ./vars.yaml --atomic --debug
}
function main() {
@ -172,9 +172,9 @@ function main() {
info "Skipping OpenReplay installation"
} || {
set_permissions
install_openreplay
sudo mkdir -p /var/lib/openreplay
sudo cp -f openreplay-cli /bin/openreplay
install_openreplay
[[ ! -d /var/lib/openreplay/openreplay ]] || {
cd /var/lib/openreplay/openreplay
date +%m-%d-%Y-%H%M%S | sudo tee -a /var/lib/openreplay/or_versions.txt
@ -183,6 +183,7 @@ function main() {
cd -
}
sudo cp -rf $(cd ../.. && pwd) /var/lib/openreplay/openreplay
sudo cp -rf ./vars.yaml /var/lib/openreplay/
}
}

2
scripts/helmcharts/openreplay/charts/chalice/Chart.yaml
View file

@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.0
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to

2
scripts/helmcharts/openreplay/charts/frontend/Chart.yaml
View file

@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (frontends://semver.org/)
version: 0.1.0
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to

4
scripts/schema/db/init_dbs/postgresql/1.10.0/1.10.0.sql
View file

@ -87,8 +87,8 @@ $$
);
CREATE TABLE backup_v1_10_0.metric_series
(
series_id integer generated BY DEFAULT AS IDENTITY PRIMARY KEY,
metric_id integer REFERENCES metrics (metric_id) ON DELETE CASCADE,
series_id integer,
metric_id integer,
index integer NOT NULL,
name text NULL,
filter jsonb NOT NULL,