diff options
| author | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-03-16 12:49:21 +0300 |
|---|---|---|
| committer | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-03-16 12:49:21 +0300 |
| commit | c29da2dabf5f5caca2e401f2cd6707b225f94e82 (patch) | |
| tree | e123d05caa56f9bb25c1e2de5577b3d2f67a8ad4 /create | |
| parent | eb09b8db4eb658e34f16e6b8e4949d53506a610c (diff) | |
| parent | 04d51f70511ddf4bcc52d42bd2d57f2228dafae6 (diff) | |
.......... [ZBXNEXT-7402] upgraded to master, fixed conflicts
Diffstat (limited to 'create')
| -rw-r--r-- | create/src/data.tmpl | 4 | ||||
| -rw-r--r-- | create/src/schema.tmpl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/create/src/data.tmpl b/create/src/data.tmpl index e731776d680..a7a994c462e 100644 --- a/create/src/data.tmpl +++ b/create/src/data.tmpl @@ -879,8 +879,8 @@ ROW |7 |5 |23 |0 |2 | | ROW |8 |6 |23 |0 |4 | | TABLE |config -FIELDS|configid|work_period |alert_usrgrpid|discovery_groupid|dbversion_status| -ROW |1 |1-5,09:00-18:00|7 |5 | | +FIELDS|configid|work_period |alert_usrgrpid|discovery_groupid|dbversion_status|geomaps_tile_provider| +ROW |1 |1-5,09:00-18:00|7 |5 | |OpenStreetMap.Mapnik | TABLE |graph_theme FIELDS|graphthemeid|theme |backgroundcolor|graphcolor|gridcolor|maingridcolor|gridbordercolor|textcolor|highlightcolor|leftpercentilecolor|rightpercentilecolor|nonworktimecolor|colorpalette | diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl index 4c715a0bad9..ff3a9991548 100644 --- a/create/src/schema.tmpl +++ b/create/src/schema.tmpl @@ -589,7 +589,7 @@ FIELD |passwd_min_length |t_integer |'8' |NOT NULL |ZBX_NODATA FIELD |passwd_check_rules |t_integer |'8' |NOT NULL |ZBX_NODATA FIELD |auditlog_enabled |t_integer |'1' |NOT NULL |ZBX_NODATA FIELD |ha_failover_delay |t_varchar(32) |'1m' |NOT NULL |ZBX_NODATA -FIELD |geomaps_tile_provider|t_varchar(255) |'' |NOT NULL |ZBX_NODATA +FIELD |geomaps_tile_provider|t_varchar(255) |'' |NOT NULL |0 FIELD |geomaps_tile_url |t_varchar(1024)|'' |NOT NULL |ZBX_NODATA FIELD |geomaps_max_zoom |t_integer |'0' |NOT NULL |ZBX_NODATA FIELD |geomaps_attribution|t_varchar(1024)|'' |NOT NULL |ZBX_NODATA @@ -1937,4 +1937,4 @@ TABLE|dbversion|dbversionid| FIELD |dbversionid |t_id | |NOT NULL |0 FIELD |mandatory |t_integer |'0' |NOT NULL | FIELD |optional |t_integer |'0' |NOT NULL | -ROW |1 |6010000 |6010000 +ROW |1 |6010002 |6010002 |