111 lines
3.3 KiB
INI
Raw Normal View History

#HA Proxy Config
global
ulimit-n 500000
maxconn 99999
maxpipes 99999
tune.maxaccept 500
log 127.0.0.1 local0
log 127.0.0.1 local1 notice
ca-base /etc/ssl/certs
crt-base /etc/ssl/private
ssl-default-bind-ciphers ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS
ssl-default-bind-options no-sslv3
defaults
log global
mode http
timeout connect 5000ms
timeout client 50000ms
timeout server 50000ms
timeout tunnel 1h # timeout to use with WebSocket and CONNECT
default-server init-addr none
#enable resolving throught docker dns and avoid crashing if service is down while proxy is starting
resolvers docker_resolver
nameserver dns 127.0.0.11:53
listen stats
bind *:9999
stats enable
stats hide-version
stats uri /stats
stats auth admin:admin@123
listen mqtt-in
bind *:${MQTT_PORT}
mode tcp
option clitcpka # For TCP keep-alive
timeout client 3h
timeout server 3h
option tcplog
balance leastconn
server tbMqtt1 tb-mqtt-transport1:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4
server tbMqtt2 tb-mqtt-transport2:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4
frontend http-in
bind *:${HTTP_PORT}
option forwardfor
reqadd X-Forwarded-Proto:\ http
acl transport_http_acl path_beg /api/v1/
acl letsencrypt_http_acl path_beg /.well-known/acme-challenge/
Develop/3.0 (#2760) * save position fix * [3.0] Add support ticks to digital gauge (#2508) * Add support ticks to digital gauge * Add link code * [3.0] Add inputs widgets (#2526) * Add location widget * Fix translate, clear code * Fix translate * Add date input widgets * Add image input widgets * Init web camera input widget * Add functional web camera input widget * Add styles to webcamera iputs widget * Add link code * Map/3.0 (#2535) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Fix UI budget * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * Update packages * fix sizes * Map/3.0 (#2542) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Update node and npm versions * Minor fixes * Update license * entity and map fixes * Map/3.0 (#2543) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Page not found rouring * Fix tile server support form OSM and zoom level fix * Map/3.0 (#2544) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes * Fix tile server support form OSM and zoom level fix Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Remove empty strings from Spanish translations (#2541) * Remove empty string from Spanish translation * Map widget types improvements * Map widget types improvements * Metadata improvements * Update rule node config ui * UI: Fix toast target for editor components * UI: fix routing * Fix Map fitBounds method * [3.0] Add gateway widget (#2547) * Create gateway widget * Refacoring and add styled * Update bundle * Add model and refactoring * [3.0] New samples for custom action with html (#2549) * Update example custom action to new Angular * Save settings to change type custom action * Revert change * UI: Import/export code improvements * UI: minor improvements * UI: Theme improvement * Fix JSON object edit component * Update styles * [3.0] [WIP] Minor fixed to style (#2562) * Added support Safari browser (not support DragEvent) * Imporovement style login page * Change flex responsive API breakpoint * Add support long name menu item * Home page add link to page * Revert .mat-icon vertical-align to middle * Revert .mat-icon vertical-align to middle * Fix value input style * Headline styles * [3.0] Minor fix (#2571) * Fix breadcrumb and breakroint api to header * Fix layout profile * Clear code and fix layout (admin and profile pages) * Improvements import * Fix entity table * Fix rulenode tooltip header * Clear import-export (Safari) * Entities table actions improvement * Improvement dialog and component style * Ace based editors disabled state handling * Improvement view on mobile device * Fix widget library details * Fix revert thingsboard.yml * Add entity title function * Remove unnecessary widgets bundle type * UI: Entity table models improvements * UI: dynamic annotation for abstract entity component * UI: Entities table model improvements. * add sendActivationEmail as request param (default -> true) to activate method in auth controller and login service * UI: Model improvement, new entity table methods * [3.0] Improvements import and tables for mobile view (#2594) * Fix width table in Safari * Improvement in mobile view * Improvement attributes-table from mobile view * Relation-table improvement for mobile view * Improvement entity-table from mobile view * UI: Attribute table disable edit for client side attributes * [3.0] Added possibility to login by url params (#2592) * Added possibility to login by url params * Fixes after code review * UI: Fix login url params * UI: Fix assets import columns * fix activate method for new UI * UI: Fixed add user dialog * Add new alias Current Tenant (#2604) * fix error create dialog new dashboard (#2606) * Minor fixes * UI: Fix scss import to relative path * UI: Fix scss import to relative path * UI: Fix scss import to relative path * UI: Revert entity.component annotation to directive * UI: Minor improvements * UI: Breadcrumb component improvements * UI: Minor improvements * UI: Improve page link default search function * [3.0] Minor fix (#2615) * Improvement tenant setting from mobile view * Improvement timewindow setting from mobile view * Improvement entity-view setting from mobile view * Update license header and license config * UI: Entity details panel improvements * UI: Entities table improvements * UI: Json React Form - textarea height fix * UI: Entity autocomplete error handling * UI: Entity autocomplete error handling * Update rule nodes ui * Rule node models improvements * Add utils to public-api * UI: Rule node ui external modules * UI: Rule nodes ui api * add support custom actions * Cleanup * [3.0] minor fix (#2645) * Improvement layout-setting setting from mobile/tablet view * Fix EntityView not show type in translate * Clear code and update tablet/mobile view * Update tablet/mobile view * Fix hide title and text-overflow * Add support Safari * Minor fix * Update package.json versions * Angular update * Angular update * Fix issues after angular update * Update rule nodes UI * Fix toolbar and share buttons (#2646) * Change resize events to observer (#2652) * Remove javascript-detect-element-resize * Update package.lock * Improvement resize (#2654) * Fix typo * UI: Minor fixes * Minor UI fixes * Fix: reset entity table sort and pagination on entities specific filtering changes * Update MSA docker readme * map fixes * Merge with master. AlarmRepository.findAlarms is failing (#2663) * Merge with master. AlarmRepository.findAlarms is failing * Fix Alarm repository. Add queue type list select. Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io> * Map/3.0 (#2664) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes * Fix tile server support form OSM and zoom level fix * add support custom actions * map fixes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Add support Safari and improvement view (#2662) * Update rule node core config. * public api import fix * Fix bundles budget * IE11 fixes * Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)" This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d. * wip on ie 11 fixes * WIP on es support * Fix Alarm repository. Add queue type list select. * [3.0] Entity list not correct find index for model (#2668) * Entity list not correct find index for model * Clear import * Revert change * Revert change * [3.0] Improvement code style (#2670) * Clear code and styles * Clear import * Fix tenant isolated checkbox fields * Update rule nodes ui * UI: Get rid of 'multiple directives with 'exportAs' set to ngForm' * map fixes * update map bundles * Remove redudant css import * wip on image-map fixes * image map alias image support * Add gateway type and clear import (#2677) * merge fixes * saveEntity && minor fixes * small css fix * Minor fixes * Add new widgetContext field currentUser * entity save fix #2 * entity save fix#3 * Update dashboard (#2684) * fix some ds problems * UI: Migrate gateway widgets and gateways demo dashboard to 3.0 * tile layers and locations set fixes * input bundles updates * Update default dashboard thermostats (#2689) * Dashboard page fixes and improvements * Clear code (#2692) * Improve database migration - create indexes after inserts * Handle component_descriptor contraints during migration * [3.0] Improved login by params to support nagivation to different dashboards (#2703) * Improved login by params to support nagivation to different dashboards * Refactorting * Minor improvements * bugfixes * bugfixes (#2705) * [3.0] Improvement map (#2706) * Fix load custom marker image for Firefox * Fix update polygon color * [WIP] [3.0] Added OAuth2 Support (#2709) * Added base impl for OAuth-2 * Added basic and custom OAuth2 user mappers * Removed comment line * Refactoring to review. Added tenantId and customerId. Added email tenant name strategy * Revert debug logger * Fixed compilation * Test fixed * Create UI for OAuthService * Revert package-lock.json * Add translate login es_ES Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io> * provide entity to custom actions * Fix Manage dashboard customers * remove image map zoom * Fix docker hybrid db mode * fix empty center position & fix entity id * Minor refactoring * Refactoring * Minor fixes * [3.0] Improvment image map (#2729) * Add support setting position function * Improved setting image map * Add support setting offset marker * Minor fixes * Fix Auth guard * Cassandra to SQL boolean column fix * Fix entity state controller name resolution * Fix oauth2 login button * Improve OAuth buttons style * OAuth button style improvement * Update haproxy.cfg with oauth rules * Introduce OAuth failure handling * Fix tests * [3.0] Improvement image map (#2740) * Fixed not correct center image map Fixed update position marker for image map * Add support IE and clear code * Fix not correct update image for datasource * Update marker position * Fix tests * Fix error update websocket to change user (#2744) * Map/3.0 (#2738) * WIP on trip-animation settings * trip-animation points & anchors * fixes Co-authored-by: Adsumus <artemtv42@gmail.com> Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io> * Fix typo * Improve table widgets mobile mode * Update Cassandra Driver * [3.0] Fixed polygon functionality (#2747) * Add default setting and title for group * Fix polygon: updateColor, functions tooltip and color polygon, update coordinate polygon * Improvement code * Refactoring code * Improve Cassandra resultSet pagination Co-authored-by: Artem Halushko <ahalushko@thingsboard.io> Co-authored-by: Vladyslav <vprykhodko@thingsboard.io> Co-authored-by: ArtemHalushko <61501795+ArtemHalushko@users.noreply.github.com> Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> Co-authored-by: Chantsova Ekaterina <chantsova.ekaterina@gmail.com> Co-authored-by: Dmytro Shvaika <dshvaika@thingsboard.io> Co-authored-by: VoBa <volodymyr.babak@gmail.com> Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
2020-05-12 14:11:26 +03:00
acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/
redirect scheme https if !letsencrypt_http_acl !transport_http_acl { env(FORCE_HTTPS_REDIRECT) -m str true }
use_backend letsencrypt_http if letsencrypt_http_acl
2018-10-18 16:21:50 +03:00
use_backend tb-http-backend if transport_http_acl
Develop/3.0 (#2760) * save position fix * [3.0] Add support ticks to digital gauge (#2508) * Add support ticks to digital gauge * Add link code * [3.0] Add inputs widgets (#2526) * Add location widget * Fix translate, clear code * Fix translate * Add date input widgets * Add image input widgets * Init web camera input widget * Add functional web camera input widget * Add styles to webcamera iputs widget * Add link code * Map/3.0 (#2535) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Fix UI budget * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * Update packages * fix sizes * Map/3.0 (#2542) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Update node and npm versions * Minor fixes * Update license * entity and map fixes * Map/3.0 (#2543) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Page not found rouring * Fix tile server support form OSM and zoom level fix * Map/3.0 (#2544) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes * Fix tile server support form OSM and zoom level fix Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Remove empty strings from Spanish translations (#2541) * Remove empty string from Spanish translation * Map widget types improvements * Map widget types improvements * Metadata improvements * Update rule node config ui * UI: Fix toast target for editor components * UI: fix routing * Fix Map fitBounds method * [3.0] Add gateway widget (#2547) * Create gateway widget * Refacoring and add styled * Update bundle * Add model and refactoring * [3.0] New samples for custom action with html (#2549) * Update example custom action to new Angular * Save settings to change type custom action * Revert change * UI: Import/export code improvements * UI: minor improvements * UI: Theme improvement * Fix JSON object edit component * Update styles * [3.0] [WIP] Minor fixed to style (#2562) * Added support Safari browser (not support DragEvent) * Imporovement style login page * Change flex responsive API breakpoint * Add support long name menu item * Home page add link to page * Revert .mat-icon vertical-align to middle * Revert .mat-icon vertical-align to middle * Fix value input style * Headline styles * [3.0] Minor fix (#2571) * Fix breadcrumb and breakroint api to header * Fix layout profile * Clear code and fix layout (admin and profile pages) * Improvements import * Fix entity table * Fix rulenode tooltip header * Clear import-export (Safari) * Entities table actions improvement * Improvement dialog and component style * Ace based editors disabled state handling * Improvement view on mobile device * Fix widget library details * Fix revert thingsboard.yml * Add entity title function * Remove unnecessary widgets bundle type * UI: Entity table models improvements * UI: dynamic annotation for abstract entity component * UI: Entities table model improvements. * add sendActivationEmail as request param (default -> true) to activate method in auth controller and login service * UI: Model improvement, new entity table methods * [3.0] Improvements import and tables for mobile view (#2594) * Fix width table in Safari * Improvement in mobile view * Improvement attributes-table from mobile view * Relation-table improvement for mobile view * Improvement entity-table from mobile view * UI: Attribute table disable edit for client side attributes * [3.0] Added possibility to login by url params (#2592) * Added possibility to login by url params * Fixes after code review * UI: Fix login url params * UI: Fix assets import columns * fix activate method for new UI * UI: Fixed add user dialog * Add new alias Current Tenant (#2604) * fix error create dialog new dashboard (#2606) * Minor fixes * UI: Fix scss import to relative path * UI: Fix scss import to relative path * UI: Fix scss import to relative path * UI: Revert entity.component annotation to directive * UI: Minor improvements * UI: Breadcrumb component improvements * UI: Minor improvements * UI: Improve page link default search function * [3.0] Minor fix (#2615) * Improvement tenant setting from mobile view * Improvement timewindow setting from mobile view * Improvement entity-view setting from mobile view * Update license header and license config * UI: Entity details panel improvements * UI: Entities table improvements * UI: Json React Form - textarea height fix * UI: Entity autocomplete error handling * UI: Entity autocomplete error handling * Update rule nodes ui * Rule node models improvements * Add utils to public-api * UI: Rule node ui external modules * UI: Rule nodes ui api * add support custom actions * Cleanup * [3.0] minor fix (#2645) * Improvement layout-setting setting from mobile/tablet view * Fix EntityView not show type in translate * Clear code and update tablet/mobile view * Update tablet/mobile view * Fix hide title and text-overflow * Add support Safari * Minor fix * Update package.json versions * Angular update * Angular update * Fix issues after angular update * Update rule nodes UI * Fix toolbar and share buttons (#2646) * Change resize events to observer (#2652) * Remove javascript-detect-element-resize * Update package.lock * Improvement resize (#2654) * Fix typo * UI: Minor fixes * Minor UI fixes * Fix: reset entity table sort and pagination on entities specific filtering changes * Update MSA docker readme * map fixes * Merge with master. AlarmRepository.findAlarms is failing (#2663) * Merge with master. AlarmRepository.findAlarms is failing * Fix Alarm repository. Add queue type list select. Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io> * Map/3.0 (#2664) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes * Fix tile server support form OSM and zoom level fix * add support custom actions * map fixes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Add support Safari and improvement view (#2662) * Update rule node core config. * public api import fix * Fix bundles budget * IE11 fixes * Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)" This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d. * wip on ie 11 fixes * WIP on es support * Fix Alarm repository. Add queue type list select. * [3.0] Entity list not correct find index for model (#2668) * Entity list not correct find index for model * Clear import * Revert change * Revert change * [3.0] Improvement code style (#2670) * Clear code and styles * Clear import * Fix tenant isolated checkbox fields * Update rule nodes ui * UI: Get rid of 'multiple directives with 'exportAs' set to ngForm' * map fixes * update map bundles * Remove redudant css import * wip on image-map fixes * image map alias image support * Add gateway type and clear import (#2677) * merge fixes * saveEntity && minor fixes * small css fix * Minor fixes * Add new widgetContext field currentUser * entity save fix #2 * entity save fix#3 * Update dashboard (#2684) * fix some ds problems * UI: Migrate gateway widgets and gateways demo dashboard to 3.0 * tile layers and locations set fixes * input bundles updates * Update default dashboard thermostats (#2689) * Dashboard page fixes and improvements * Clear code (#2692) * Improve database migration - create indexes after inserts * Handle component_descriptor contraints during migration * [3.0] Improved login by params to support nagivation to different dashboards (#2703) * Improved login by params to support nagivation to different dashboards * Refactorting * Minor improvements * bugfixes * bugfixes (#2705) * [3.0] Improvement map (#2706) * Fix load custom marker image for Firefox * Fix update polygon color * [WIP] [3.0] Added OAuth2 Support (#2709) * Added base impl for OAuth-2 * Added basic and custom OAuth2 user mappers * Removed comment line * Refactoring to review. Added tenantId and customerId. Added email tenant name strategy * Revert debug logger * Fixed compilation * Test fixed * Create UI for OAuthService * Revert package-lock.json * Add translate login es_ES Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io> * provide entity to custom actions * Fix Manage dashboard customers * remove image map zoom * Fix docker hybrid db mode * fix empty center position & fix entity id * Minor refactoring * Refactoring * Minor fixes * [3.0] Improvment image map (#2729) * Add support setting position function * Improved setting image map * Add support setting offset marker * Minor fixes * Fix Auth guard * Cassandra to SQL boolean column fix * Fix entity state controller name resolution * Fix oauth2 login button * Improve OAuth buttons style * OAuth button style improvement * Update haproxy.cfg with oauth rules * Introduce OAuth failure handling * Fix tests * [3.0] Improvement image map (#2740) * Fixed not correct center image map Fixed update position marker for image map * Add support IE and clear code * Fix not correct update image for datasource * Update marker position * Fix tests * Fix error update websocket to change user (#2744) * Map/3.0 (#2738) * WIP on trip-animation settings * trip-animation points & anchors * fixes Co-authored-by: Adsumus <artemtv42@gmail.com> Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io> * Fix typo * Improve table widgets mobile mode * Update Cassandra Driver * [3.0] Fixed polygon functionality (#2747) * Add default setting and title for group * Fix polygon: updateColor, functions tooltip and color polygon, update coordinate polygon * Improvement code * Refactoring code * Improve Cassandra resultSet pagination Co-authored-by: Artem Halushko <ahalushko@thingsboard.io> Co-authored-by: Vladyslav <vprykhodko@thingsboard.io> Co-authored-by: ArtemHalushko <61501795+ArtemHalushko@users.noreply.github.com> Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> Co-authored-by: Chantsova Ekaterina <chantsova.ekaterina@gmail.com> Co-authored-by: Dmytro Shvaika <dshvaika@thingsboard.io> Co-authored-by: VoBa <volodymyr.babak@gmail.com> Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
2020-05-12 14:11:26 +03:00
use_backend tb-api-backend if tb_api_acl
Develop/3.0 (#2760) * save position fix * [3.0] Add support ticks to digital gauge (#2508) * Add support ticks to digital gauge * Add link code * [3.0] Add inputs widgets (#2526) * Add location widget * Fix translate, clear code * Fix translate * Add date input widgets * Add image input widgets * Init web camera input widget * Add functional web camera input widget * Add styles to webcamera iputs widget * Add link code * Map/3.0 (#2535) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Fix UI budget * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * Update packages * fix sizes * Map/3.0 (#2542) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Update node and npm versions * Minor fixes * Update license * entity and map fixes * Map/3.0 (#2543) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Page not found rouring * Fix tile server support form OSM and zoom level fix * Map/3.0 (#2544) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes * Fix tile server support form OSM and zoom level fix Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Remove empty strings from Spanish translations (#2541) * Remove empty string from Spanish translation * Map widget types improvements * Map widget types improvements * Metadata improvements * Update rule node config ui * UI: Fix toast target for editor components * UI: fix routing * Fix Map fitBounds method * [3.0] Add gateway widget (#2547) * Create gateway widget * Refacoring and add styled * Update bundle * Add model and refactoring * [3.0] New samples for custom action with html (#2549) * Update example custom action to new Angular * Save settings to change type custom action * Revert change * UI: Import/export code improvements * UI: minor improvements * UI: Theme improvement * Fix JSON object edit component * Update styles * [3.0] [WIP] Minor fixed to style (#2562) * Added support Safari browser (not support DragEvent) * Imporovement style login page * Change flex responsive API breakpoint * Add support long name menu item * Home page add link to page * Revert .mat-icon vertical-align to middle * Revert .mat-icon vertical-align to middle * Fix value input style * Headline styles * [3.0] Minor fix (#2571) * Fix breadcrumb and breakroint api to header * Fix layout profile * Clear code and fix layout (admin and profile pages) * Improvements import * Fix entity table * Fix rulenode tooltip header * Clear import-export (Safari) * Entities table actions improvement * Improvement dialog and component style * Ace based editors disabled state handling * Improvement view on mobile device * Fix widget library details * Fix revert thingsboard.yml * Add entity title function * Remove unnecessary widgets bundle type * UI: Entity table models improvements * UI: dynamic annotation for abstract entity component * UI: Entities table model improvements. * add sendActivationEmail as request param (default -> true) to activate method in auth controller and login service * UI: Model improvement, new entity table methods * [3.0] Improvements import and tables for mobile view (#2594) * Fix width table in Safari * Improvement in mobile view * Improvement attributes-table from mobile view * Relation-table improvement for mobile view * Improvement entity-table from mobile view * UI: Attribute table disable edit for client side attributes * [3.0] Added possibility to login by url params (#2592) * Added possibility to login by url params * Fixes after code review * UI: Fix login url params * UI: Fix assets import columns * fix activate method for new UI * UI: Fixed add user dialog * Add new alias Current Tenant (#2604) * fix error create dialog new dashboard (#2606) * Minor fixes * UI: Fix scss import to relative path * UI: Fix scss import to relative path * UI: Fix scss import to relative path * UI: Revert entity.component annotation to directive * UI: Minor improvements * UI: Breadcrumb component improvements * UI: Minor improvements * UI: Improve page link default search function * [3.0] Minor fix (#2615) * Improvement tenant setting from mobile view * Improvement timewindow setting from mobile view * Improvement entity-view setting from mobile view * Update license header and license config * UI: Entity details panel improvements * UI: Entities table improvements * UI: Json React Form - textarea height fix * UI: Entity autocomplete error handling * UI: Entity autocomplete error handling * Update rule nodes ui * Rule node models improvements * Add utils to public-api * UI: Rule node ui external modules * UI: Rule nodes ui api * add support custom actions * Cleanup * [3.0] minor fix (#2645) * Improvement layout-setting setting from mobile/tablet view * Fix EntityView not show type in translate * Clear code and update tablet/mobile view * Update tablet/mobile view * Fix hide title and text-overflow * Add support Safari * Minor fix * Update package.json versions * Angular update * Angular update * Fix issues after angular update * Update rule nodes UI * Fix toolbar and share buttons (#2646) * Change resize events to observer (#2652) * Remove javascript-detect-element-resize * Update package.lock * Improvement resize (#2654) * Fix typo * UI: Minor fixes * Minor UI fixes * Fix: reset entity table sort and pagination on entities specific filtering changes * Update MSA docker readme * map fixes * Merge with master. AlarmRepository.findAlarms is failing (#2663) * Merge with master. AlarmRepository.findAlarms is failing * Fix Alarm repository. Add queue type list select. Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io> * Map/3.0 (#2664) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes * Fix tile server support form OSM and zoom level fix * add support custom actions * map fixes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Add support Safari and improvement view (#2662) * Update rule node core config. * public api import fix * Fix bundles budget * IE11 fixes * Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)" This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d. * wip on ie 11 fixes * WIP on es support * Fix Alarm repository. Add queue type list select. * [3.0] Entity list not correct find index for model (#2668) * Entity list not correct find index for model * Clear import * Revert change * Revert change * [3.0] Improvement code style (#2670) * Clear code and styles * Clear import * Fix tenant isolated checkbox fields * Update rule nodes ui * UI: Get rid of 'multiple directives with 'exportAs' set to ngForm' * map fixes * update map bundles * Remove redudant css import * wip on image-map fixes * image map alias image support * Add gateway type and clear import (#2677) * merge fixes * saveEntity && minor fixes * small css fix * Minor fixes * Add new widgetContext field currentUser * entity save fix #2 * entity save fix#3 * Update dashboard (#2684) * fix some ds problems * UI: Migrate gateway widgets and gateways demo dashboard to 3.0 * tile layers and locations set fixes * input bundles updates * Update default dashboard thermostats (#2689) * Dashboard page fixes and improvements * Clear code (#2692) * Improve database migration - create indexes after inserts * Handle component_descriptor contraints during migration * [3.0] Improved login by params to support nagivation to different dashboards (#2703) * Improved login by params to support nagivation to different dashboards * Refactorting * Minor improvements * bugfixes * bugfixes (#2705) * [3.0] Improvement map (#2706) * Fix load custom marker image for Firefox * Fix update polygon color * [WIP] [3.0] Added OAuth2 Support (#2709) * Added base impl for OAuth-2 * Added basic and custom OAuth2 user mappers * Removed comment line * Refactoring to review. Added tenantId and customerId. Added email tenant name strategy * Revert debug logger * Fixed compilation * Test fixed * Create UI for OAuthService * Revert package-lock.json * Add translate login es_ES Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io> * provide entity to custom actions * Fix Manage dashboard customers * remove image map zoom * Fix docker hybrid db mode * fix empty center position & fix entity id * Minor refactoring * Refactoring * Minor fixes * [3.0] Improvment image map (#2729) * Add support setting position function * Improved setting image map * Add support setting offset marker * Minor fixes * Fix Auth guard * Cassandra to SQL boolean column fix * Fix entity state controller name resolution * Fix oauth2 login button * Improve OAuth buttons style * OAuth button style improvement * Update haproxy.cfg with oauth rules * Introduce OAuth failure handling * Fix tests * [3.0] Improvement image map (#2740) * Fixed not correct center image map Fixed update position marker for image map * Add support IE and clear code * Fix not correct update image for datasource * Update marker position * Fix tests * Fix error update websocket to change user (#2744) * Map/3.0 (#2738) * WIP on trip-animation settings * trip-animation points & anchors * fixes Co-authored-by: Adsumus <artemtv42@gmail.com> Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io> * Fix typo * Improve table widgets mobile mode * Update Cassandra Driver * [3.0] Fixed polygon functionality (#2747) * Add default setting and title for group * Fix polygon: updateColor, functions tooltip and color polygon, update coordinate polygon * Improvement code * Refactoring code * Improve Cassandra resultSet pagination Co-authored-by: Artem Halushko <ahalushko@thingsboard.io> Co-authored-by: Vladyslav <vprykhodko@thingsboard.io> Co-authored-by: ArtemHalushko <61501795+ArtemHalushko@users.noreply.github.com> Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> Co-authored-by: Chantsova Ekaterina <chantsova.ekaterina@gmail.com> Co-authored-by: Dmytro Shvaika <dshvaika@thingsboard.io> Co-authored-by: VoBa <volodymyr.babak@gmail.com> Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
2020-05-12 14:11:26 +03:00
default_backend tb-web-backend
frontend https_in
bind *:${HTTPS_PORT} ssl crt /usr/local/etc/haproxy/default.pem crt /usr/local/etc/haproxy/certs.d ciphers ECDHE-RSA-AES256-SHA:RC4-SHA:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM
option forwardfor
reqadd X-Forwarded-Proto:\ https
acl transport_http_acl path_beg /api/v1/
Develop/3.0 (#2760) * save position fix * [3.0] Add support ticks to digital gauge (#2508) * Add support ticks to digital gauge * Add link code * [3.0] Add inputs widgets (#2526) * Add location widget * Fix translate, clear code * Fix translate * Add date input widgets * Add image input widgets * Init web camera input widget * Add functional web camera input widget * Add styles to webcamera iputs widget * Add link code * Map/3.0 (#2535) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Fix UI budget * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * Update packages * fix sizes * Map/3.0 (#2542) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Update node and npm versions * Minor fixes * Update license * entity and map fixes * Map/3.0 (#2543) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Page not found rouring * Fix tile server support form OSM and zoom level fix * Map/3.0 (#2544) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes * Fix tile server support form OSM and zoom level fix Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Remove empty strings from Spanish translations (#2541) * Remove empty string from Spanish translation * Map widget types improvements * Map widget types improvements * Metadata improvements * Update rule node config ui * UI: Fix toast target for editor components * UI: fix routing * Fix Map fitBounds method * [3.0] Add gateway widget (#2547) * Create gateway widget * Refacoring and add styled * Update bundle * Add model and refactoring * [3.0] New samples for custom action with html (#2549) * Update example custom action to new Angular * Save settings to change type custom action * Revert change * UI: Import/export code improvements * UI: minor improvements * UI: Theme improvement * Fix JSON object edit component * Update styles * [3.0] [WIP] Minor fixed to style (#2562) * Added support Safari browser (not support DragEvent) * Imporovement style login page * Change flex responsive API breakpoint * Add support long name menu item * Home page add link to page * Revert .mat-icon vertical-align to middle * Revert .mat-icon vertical-align to middle * Fix value input style * Headline styles * [3.0] Minor fix (#2571) * Fix breadcrumb and breakroint api to header * Fix layout profile * Clear code and fix layout (admin and profile pages) * Improvements import * Fix entity table * Fix rulenode tooltip header * Clear import-export (Safari) * Entities table actions improvement * Improvement dialog and component style * Ace based editors disabled state handling * Improvement view on mobile device * Fix widget library details * Fix revert thingsboard.yml * Add entity title function * Remove unnecessary widgets bundle type * UI: Entity table models improvements * UI: dynamic annotation for abstract entity component * UI: Entities table model improvements. * add sendActivationEmail as request param (default -> true) to activate method in auth controller and login service * UI: Model improvement, new entity table methods * [3.0] Improvements import and tables for mobile view (#2594) * Fix width table in Safari * Improvement in mobile view * Improvement attributes-table from mobile view * Relation-table improvement for mobile view * Improvement entity-table from mobile view * UI: Attribute table disable edit for client side attributes * [3.0] Added possibility to login by url params (#2592) * Added possibility to login by url params * Fixes after code review * UI: Fix login url params * UI: Fix assets import columns * fix activate method for new UI * UI: Fixed add user dialog * Add new alias Current Tenant (#2604) * fix error create dialog new dashboard (#2606) * Minor fixes * UI: Fix scss import to relative path * UI: Fix scss import to relative path * UI: Fix scss import to relative path * UI: Revert entity.component annotation to directive * UI: Minor improvements * UI: Breadcrumb component improvements * UI: Minor improvements * UI: Improve page link default search function * [3.0] Minor fix (#2615) * Improvement tenant setting from mobile view * Improvement timewindow setting from mobile view * Improvement entity-view setting from mobile view * Update license header and license config * UI: Entity details panel improvements * UI: Entities table improvements * UI: Json React Form - textarea height fix * UI: Entity autocomplete error handling * UI: Entity autocomplete error handling * Update rule nodes ui * Rule node models improvements * Add utils to public-api * UI: Rule node ui external modules * UI: Rule nodes ui api * add support custom actions * Cleanup * [3.0] minor fix (#2645) * Improvement layout-setting setting from mobile/tablet view * Fix EntityView not show type in translate * Clear code and update tablet/mobile view * Update tablet/mobile view * Fix hide title and text-overflow * Add support Safari * Minor fix * Update package.json versions * Angular update * Angular update * Fix issues after angular update * Update rule nodes UI * Fix toolbar and share buttons (#2646) * Change resize events to observer (#2652) * Remove javascript-detect-element-resize * Update package.lock * Improvement resize (#2654) * Fix typo * UI: Minor fixes * Minor UI fixes * Fix: reset entity table sort and pagination on entities specific filtering changes * Update MSA docker readme * map fixes * Merge with master. AlarmRepository.findAlarms is failing (#2663) * Merge with master. AlarmRepository.findAlarms is failing * Fix Alarm repository. Add queue type list select. Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io> * Map/3.0 (#2664) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes * Fix tile server support form OSM and zoom level fix * add support custom actions * map fixes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Add support Safari and improvement view (#2662) * Update rule node core config. * public api import fix * Fix bundles budget * IE11 fixes * Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)" This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d. * wip on ie 11 fixes * WIP on es support * Fix Alarm repository. Add queue type list select. * [3.0] Entity list not correct find index for model (#2668) * Entity list not correct find index for model * Clear import * Revert change * Revert change * [3.0] Improvement code style (#2670) * Clear code and styles * Clear import * Fix tenant isolated checkbox fields * Update rule nodes ui * UI: Get rid of 'multiple directives with 'exportAs' set to ngForm' * map fixes * update map bundles * Remove redudant css import * wip on image-map fixes * image map alias image support * Add gateway type and clear import (#2677) * merge fixes * saveEntity && minor fixes * small css fix * Minor fixes * Add new widgetContext field currentUser * entity save fix #2 * entity save fix#3 * Update dashboard (#2684) * fix some ds problems * UI: Migrate gateway widgets and gateways demo dashboard to 3.0 * tile layers and locations set fixes * input bundles updates * Update default dashboard thermostats (#2689) * Dashboard page fixes and improvements * Clear code (#2692) * Improve database migration - create indexes after inserts * Handle component_descriptor contraints during migration * [3.0] Improved login by params to support nagivation to different dashboards (#2703) * Improved login by params to support nagivation to different dashboards * Refactorting * Minor improvements * bugfixes * bugfixes (#2705) * [3.0] Improvement map (#2706) * Fix load custom marker image for Firefox * Fix update polygon color * [WIP] [3.0] Added OAuth2 Support (#2709) * Added base impl for OAuth-2 * Added basic and custom OAuth2 user mappers * Removed comment line * Refactoring to review. Added tenantId and customerId. Added email tenant name strategy * Revert debug logger * Fixed compilation * Test fixed * Create UI for OAuthService * Revert package-lock.json * Add translate login es_ES Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io> * provide entity to custom actions * Fix Manage dashboard customers * remove image map zoom * Fix docker hybrid db mode * fix empty center position & fix entity id * Minor refactoring * Refactoring * Minor fixes * [3.0] Improvment image map (#2729) * Add support setting position function * Improved setting image map * Add support setting offset marker * Minor fixes * Fix Auth guard * Cassandra to SQL boolean column fix * Fix entity state controller name resolution * Fix oauth2 login button * Improve OAuth buttons style * OAuth button style improvement * Update haproxy.cfg with oauth rules * Introduce OAuth failure handling * Fix tests * [3.0] Improvement image map (#2740) * Fixed not correct center image map Fixed update position marker for image map * Add support IE and clear code * Fix not correct update image for datasource * Update marker position * Fix tests * Fix error update websocket to change user (#2744) * Map/3.0 (#2738) * WIP on trip-animation settings * trip-animation points & anchors * fixes Co-authored-by: Adsumus <artemtv42@gmail.com> Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io> * Fix typo * Improve table widgets mobile mode * Update Cassandra Driver * [3.0] Fixed polygon functionality (#2747) * Add default setting and title for group * Fix polygon: updateColor, functions tooltip and color polygon, update coordinate polygon * Improvement code * Refactoring code * Improve Cassandra resultSet pagination Co-authored-by: Artem Halushko <ahalushko@thingsboard.io> Co-authored-by: Vladyslav <vprykhodko@thingsboard.io> Co-authored-by: ArtemHalushko <61501795+ArtemHalushko@users.noreply.github.com> Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> Co-authored-by: Chantsova Ekaterina <chantsova.ekaterina@gmail.com> Co-authored-by: Dmytro Shvaika <dshvaika@thingsboard.io> Co-authored-by: VoBa <volodymyr.babak@gmail.com> Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
2020-05-12 14:11:26 +03:00
acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /static/rulenode/ /oauth2/ /login/oauth2/
2018-10-15 18:24:51 +03:00
use_backend tb-http-backend if transport_http_acl
Develop/3.0 (#2760) * save position fix * [3.0] Add support ticks to digital gauge (#2508) * Add support ticks to digital gauge * Add link code * [3.0] Add inputs widgets (#2526) * Add location widget * Fix translate, clear code * Fix translate * Add date input widgets * Add image input widgets * Init web camera input widget * Add functional web camera input widget * Add styles to webcamera iputs widget * Add link code * Map/3.0 (#2535) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Fix UI budget * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * Update packages * fix sizes * Map/3.0 (#2542) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Update node and npm versions * Minor fixes * Update license * entity and map fixes * Map/3.0 (#2543) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Page not found rouring * Fix tile server support form OSM and zoom level fix * Map/3.0 (#2544) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes * Fix tile server support form OSM and zoom level fix Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Remove empty strings from Spanish translations (#2541) * Remove empty string from Spanish translation * Map widget types improvements * Map widget types improvements * Metadata improvements * Update rule node config ui * UI: Fix toast target for editor components * UI: fix routing * Fix Map fitBounds method * [3.0] Add gateway widget (#2547) * Create gateway widget * Refacoring and add styled * Update bundle * Add model and refactoring * [3.0] New samples for custom action with html (#2549) * Update example custom action to new Angular * Save settings to change type custom action * Revert change * UI: Import/export code improvements * UI: minor improvements * UI: Theme improvement * Fix JSON object edit component * Update styles * [3.0] [WIP] Minor fixed to style (#2562) * Added support Safari browser (not support DragEvent) * Imporovement style login page * Change flex responsive API breakpoint * Add support long name menu item * Home page add link to page * Revert .mat-icon vertical-align to middle * Revert .mat-icon vertical-align to middle * Fix value input style * Headline styles * [3.0] Minor fix (#2571) * Fix breadcrumb and breakroint api to header * Fix layout profile * Clear code and fix layout (admin and profile pages) * Improvements import * Fix entity table * Fix rulenode tooltip header * Clear import-export (Safari) * Entities table actions improvement * Improvement dialog and component style * Ace based editors disabled state handling * Improvement view on mobile device * Fix widget library details * Fix revert thingsboard.yml * Add entity title function * Remove unnecessary widgets bundle type * UI: Entity table models improvements * UI: dynamic annotation for abstract entity component * UI: Entities table model improvements. * add sendActivationEmail as request param (default -> true) to activate method in auth controller and login service * UI: Model improvement, new entity table methods * [3.0] Improvements import and tables for mobile view (#2594) * Fix width table in Safari * Improvement in mobile view * Improvement attributes-table from mobile view * Relation-table improvement for mobile view * Improvement entity-table from mobile view * UI: Attribute table disable edit for client side attributes * [3.0] Added possibility to login by url params (#2592) * Added possibility to login by url params * Fixes after code review * UI: Fix login url params * UI: Fix assets import columns * fix activate method for new UI * UI: Fixed add user dialog * Add new alias Current Tenant (#2604) * fix error create dialog new dashboard (#2606) * Minor fixes * UI: Fix scss import to relative path * UI: Fix scss import to relative path * UI: Fix scss import to relative path * UI: Revert entity.component annotation to directive * UI: Minor improvements * UI: Breadcrumb component improvements * UI: Minor improvements * UI: Improve page link default search function * [3.0] Minor fix (#2615) * Improvement tenant setting from mobile view * Improvement timewindow setting from mobile view * Improvement entity-view setting from mobile view * Update license header and license config * UI: Entity details panel improvements * UI: Entities table improvements * UI: Json React Form - textarea height fix * UI: Entity autocomplete error handling * UI: Entity autocomplete error handling * Update rule nodes ui * Rule node models improvements * Add utils to public-api * UI: Rule node ui external modules * UI: Rule nodes ui api * add support custom actions * Cleanup * [3.0] minor fix (#2645) * Improvement layout-setting setting from mobile/tablet view * Fix EntityView not show type in translate * Clear code and update tablet/mobile view * Update tablet/mobile view * Fix hide title and text-overflow * Add support Safari * Minor fix * Update package.json versions * Angular update * Angular update * Fix issues after angular update * Update rule nodes UI * Fix toolbar and share buttons (#2646) * Change resize events to observer (#2652) * Remove javascript-detect-element-resize * Update package.lock * Improvement resize (#2654) * Fix typo * UI: Minor fixes * Minor UI fixes * Fix: reset entity table sort and pagination on entities specific filtering changes * Update MSA docker readme * map fixes * Merge with master. AlarmRepository.findAlarms is failing (#2663) * Merge with master. AlarmRepository.findAlarms is failing * Fix Alarm repository. Add queue type list select. Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io> * Map/3.0 (#2664) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes * Fix tile server support form OSM and zoom level fix * add support custom actions * map fixes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Add support Safari and improvement view (#2662) * Update rule node core config. * public api import fix * Fix bundles budget * IE11 fixes * Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)" This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d. * wip on ie 11 fixes * WIP on es support * Fix Alarm repository. Add queue type list select. * [3.0] Entity list not correct find index for model (#2668) * Entity list not correct find index for model * Clear import * Revert change * Revert change * [3.0] Improvement code style (#2670) * Clear code and styles * Clear import * Fix tenant isolated checkbox fields * Update rule nodes ui * UI: Get rid of 'multiple directives with 'exportAs' set to ngForm' * map fixes * update map bundles * Remove redudant css import * wip on image-map fixes * image map alias image support * Add gateway type and clear import (#2677) * merge fixes * saveEntity && minor fixes * small css fix * Minor fixes * Add new widgetContext field currentUser * entity save fix #2 * entity save fix#3 * Update dashboard (#2684) * fix some ds problems * UI: Migrate gateway widgets and gateways demo dashboard to 3.0 * tile layers and locations set fixes * input bundles updates * Update default dashboard thermostats (#2689) * Dashboard page fixes and improvements * Clear code (#2692) * Improve database migration - create indexes after inserts * Handle component_descriptor contraints during migration * [3.0] Improved login by params to support nagivation to different dashboards (#2703) * Improved login by params to support nagivation to different dashboards * Refactorting * Minor improvements * bugfixes * bugfixes (#2705) * [3.0] Improvement map (#2706) * Fix load custom marker image for Firefox * Fix update polygon color * [WIP] [3.0] Added OAuth2 Support (#2709) * Added base impl for OAuth-2 * Added basic and custom OAuth2 user mappers * Removed comment line * Refactoring to review. Added tenantId and customerId. Added email tenant name strategy * Revert debug logger * Fixed compilation * Test fixed * Create UI for OAuthService * Revert package-lock.json * Add translate login es_ES Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io> * provide entity to custom actions * Fix Manage dashboard customers * remove image map zoom * Fix docker hybrid db mode * fix empty center position & fix entity id * Minor refactoring * Refactoring * Minor fixes * [3.0] Improvment image map (#2729) * Add support setting position function * Improved setting image map * Add support setting offset marker * Minor fixes * Fix Auth guard * Cassandra to SQL boolean column fix * Fix entity state controller name resolution * Fix oauth2 login button * Improve OAuth buttons style * OAuth button style improvement * Update haproxy.cfg with oauth rules * Introduce OAuth failure handling * Fix tests * [3.0] Improvement image map (#2740) * Fixed not correct center image map Fixed update position marker for image map * Add support IE and clear code * Fix not correct update image for datasource * Update marker position * Fix tests * Fix error update websocket to change user (#2744) * Map/3.0 (#2738) * WIP on trip-animation settings * trip-animation points & anchors * fixes Co-authored-by: Adsumus <artemtv42@gmail.com> Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io> * Fix typo * Improve table widgets mobile mode * Update Cassandra Driver * [3.0] Fixed polygon functionality (#2747) * Add default setting and title for group * Fix polygon: updateColor, functions tooltip and color polygon, update coordinate polygon * Improvement code * Refactoring code * Improve Cassandra resultSet pagination Co-authored-by: Artem Halushko <ahalushko@thingsboard.io> Co-authored-by: Vladyslav <vprykhodko@thingsboard.io> Co-authored-by: ArtemHalushko <61501795+ArtemHalushko@users.noreply.github.com> Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> Co-authored-by: Chantsova Ekaterina <chantsova.ekaterina@gmail.com> Co-authored-by: Dmytro Shvaika <dshvaika@thingsboard.io> Co-authored-by: VoBa <volodymyr.babak@gmail.com> Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
2020-05-12 14:11:26 +03:00
use_backend tb-api-backend if tb_api_acl
Develop/3.0 (#2760) * save position fix * [3.0] Add support ticks to digital gauge (#2508) * Add support ticks to digital gauge * Add link code * [3.0] Add inputs widgets (#2526) * Add location widget * Fix translate, clear code * Fix translate * Add date input widgets * Add image input widgets * Init web camera input widget * Add functional web camera input widget * Add styles to webcamera iputs widget * Add link code * Map/3.0 (#2535) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Fix UI budget * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * Update packages * fix sizes * Map/3.0 (#2542) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Update node and npm versions * Minor fixes * Update license * entity and map fixes * Map/3.0 (#2543) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Page not found rouring * Fix tile server support form OSM and zoom level fix * Map/3.0 (#2544) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes * Fix tile server support form OSM and zoom level fix Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Remove empty strings from Spanish translations (#2541) * Remove empty string from Spanish translation * Map widget types improvements * Map widget types improvements * Metadata improvements * Update rule node config ui * UI: Fix toast target for editor components * UI: fix routing * Fix Map fitBounds method * [3.0] Add gateway widget (#2547) * Create gateway widget * Refacoring and add styled * Update bundle * Add model and refactoring * [3.0] New samples for custom action with html (#2549) * Update example custom action to new Angular * Save settings to change type custom action * Revert change * UI: Import/export code improvements * UI: minor improvements * UI: Theme improvement * Fix JSON object edit component * Update styles * [3.0] [WIP] Minor fixed to style (#2562) * Added support Safari browser (not support DragEvent) * Imporovement style login page * Change flex responsive API breakpoint * Add support long name menu item * Home page add link to page * Revert .mat-icon vertical-align to middle * Revert .mat-icon vertical-align to middle * Fix value input style * Headline styles * [3.0] Minor fix (#2571) * Fix breadcrumb and breakroint api to header * Fix layout profile * Clear code and fix layout (admin and profile pages) * Improvements import * Fix entity table * Fix rulenode tooltip header * Clear import-export (Safari) * Entities table actions improvement * Improvement dialog and component style * Ace based editors disabled state handling * Improvement view on mobile device * Fix widget library details * Fix revert thingsboard.yml * Add entity title function * Remove unnecessary widgets bundle type * UI: Entity table models improvements * UI: dynamic annotation for abstract entity component * UI: Entities table model improvements. * add sendActivationEmail as request param (default -> true) to activate method in auth controller and login service * UI: Model improvement, new entity table methods * [3.0] Improvements import and tables for mobile view (#2594) * Fix width table in Safari * Improvement in mobile view * Improvement attributes-table from mobile view * Relation-table improvement for mobile view * Improvement entity-table from mobile view * UI: Attribute table disable edit for client side attributes * [3.0] Added possibility to login by url params (#2592) * Added possibility to login by url params * Fixes after code review * UI: Fix login url params * UI: Fix assets import columns * fix activate method for new UI * UI: Fixed add user dialog * Add new alias Current Tenant (#2604) * fix error create dialog new dashboard (#2606) * Minor fixes * UI: Fix scss import to relative path * UI: Fix scss import to relative path * UI: Fix scss import to relative path * UI: Revert entity.component annotation to directive * UI: Minor improvements * UI: Breadcrumb component improvements * UI: Minor improvements * UI: Improve page link default search function * [3.0] Minor fix (#2615) * Improvement tenant setting from mobile view * Improvement timewindow setting from mobile view * Improvement entity-view setting from mobile view * Update license header and license config * UI: Entity details panel improvements * UI: Entities table improvements * UI: Json React Form - textarea height fix * UI: Entity autocomplete error handling * UI: Entity autocomplete error handling * Update rule nodes ui * Rule node models improvements * Add utils to public-api * UI: Rule node ui external modules * UI: Rule nodes ui api * add support custom actions * Cleanup * [3.0] minor fix (#2645) * Improvement layout-setting setting from mobile/tablet view * Fix EntityView not show type in translate * Clear code and update tablet/mobile view * Update tablet/mobile view * Fix hide title and text-overflow * Add support Safari * Minor fix * Update package.json versions * Angular update * Angular update * Fix issues after angular update * Update rule nodes UI * Fix toolbar and share buttons (#2646) * Change resize events to observer (#2652) * Remove javascript-detect-element-resize * Update package.lock * Improvement resize (#2654) * Fix typo * UI: Minor fixes * Minor UI fixes * Fix: reset entity table sort and pagination on entities specific filtering changes * Update MSA docker readme * map fixes * Merge with master. AlarmRepository.findAlarms is failing (#2663) * Merge with master. AlarmRepository.findAlarms is failing * Fix Alarm repository. Add queue type list select. Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io> * Map/3.0 (#2664) * add base map infrastructure * add leaflet css * add tencent map * add google maps support * added image map support * refactor schemes * here maps support && WIP on markers * add simple marker suppor * data update & polyline support * map bouds support * add some settings support * add map provider select to settings * labels support * WIP on trip animation widget * WIP on history control and route interpolation * trip-animation map provider & custom markers * comleted track marker & history controls * add license headers * label fix & tooltips support * WIP on polygons * marker dropping support * add polygon support * add label to trip animation * WIP on tooltips * lint anf typed leaflet AddMarker * some typing and poly improvements * add typing * add marker creation * update proxy * save position fix * add bounds padding * update map widget bendle && bugfixes * update marker placement widget * add licenses * reomove log * fix sizes * entity and map fixes * Fix tile server support form OSM and zoom level fix * add support custom actions * map fixes Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> * Add support Safari and improvement view (#2662) * Update rule node core config. * public api import fix * Fix bundles budget * IE11 fixes * Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)" This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d. * wip on ie 11 fixes * WIP on es support * Fix Alarm repository. Add queue type list select. * [3.0] Entity list not correct find index for model (#2668) * Entity list not correct find index for model * Clear import * Revert change * Revert change * [3.0] Improvement code style (#2670) * Clear code and styles * Clear import * Fix tenant isolated checkbox fields * Update rule nodes ui * UI: Get rid of 'multiple directives with 'exportAs' set to ngForm' * map fixes * update map bundles * Remove redudant css import * wip on image-map fixes * image map alias image support * Add gateway type and clear import (#2677) * merge fixes * saveEntity && minor fixes * small css fix * Minor fixes * Add new widgetContext field currentUser * entity save fix #2 * entity save fix#3 * Update dashboard (#2684) * fix some ds problems * UI: Migrate gateway widgets and gateways demo dashboard to 3.0 * tile layers and locations set fixes * input bundles updates * Update default dashboard thermostats (#2689) * Dashboard page fixes and improvements * Clear code (#2692) * Improve database migration - create indexes after inserts * Handle component_descriptor contraints during migration * [3.0] Improved login by params to support nagivation to different dashboards (#2703) * Improved login by params to support nagivation to different dashboards * Refactorting * Minor improvements * bugfixes * bugfixes (#2705) * [3.0] Improvement map (#2706) * Fix load custom marker image for Firefox * Fix update polygon color * [WIP] [3.0] Added OAuth2 Support (#2709) * Added base impl for OAuth-2 * Added basic and custom OAuth2 user mappers * Removed comment line * Refactoring to review. Added tenantId and customerId. Added email tenant name strategy * Revert debug logger * Fixed compilation * Test fixed * Create UI for OAuthService * Revert package-lock.json * Add translate login es_ES Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io> * provide entity to custom actions * Fix Manage dashboard customers * remove image map zoom * Fix docker hybrid db mode * fix empty center position & fix entity id * Minor refactoring * Refactoring * Minor fixes * [3.0] Improvment image map (#2729) * Add support setting position function * Improved setting image map * Add support setting offset marker * Minor fixes * Fix Auth guard * Cassandra to SQL boolean column fix * Fix entity state controller name resolution * Fix oauth2 login button * Improve OAuth buttons style * OAuth button style improvement * Update haproxy.cfg with oauth rules * Introduce OAuth failure handling * Fix tests * [3.0] Improvement image map (#2740) * Fixed not correct center image map Fixed update position marker for image map * Add support IE and clear code * Fix not correct update image for datasource * Update marker position * Fix tests * Fix error update websocket to change user (#2744) * Map/3.0 (#2738) * WIP on trip-animation settings * trip-animation points & anchors * fixes Co-authored-by: Adsumus <artemtv42@gmail.com> Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io> * Fix typo * Improve table widgets mobile mode * Update Cassandra Driver * [3.0] Fixed polygon functionality (#2747) * Add default setting and title for group * Fix polygon: updateColor, functions tooltip and color polygon, update coordinate polygon * Improvement code * Refactoring code * Improve Cassandra resultSet pagination Co-authored-by: Artem Halushko <ahalushko@thingsboard.io> Co-authored-by: Vladyslav <vprykhodko@thingsboard.io> Co-authored-by: ArtemHalushko <61501795+ArtemHalushko@users.noreply.github.com> Co-authored-by: Artem Halushko <ahalushko@thingboards.io> Co-authored-by: Adsumus <artemtv42@gmail.com> Co-authored-by: Chantsova Ekaterina <chantsova.ekaterina@gmail.com> Co-authored-by: Dmytro Shvaika <dshvaika@thingsboard.io> Co-authored-by: VoBa <volodymyr.babak@gmail.com> Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
2020-05-12 14:11:26 +03:00
default_backend tb-web-backend
backend letsencrypt_http
server letsencrypt_http_srv 127.0.0.1:8080
backend tb-web-backend
balance leastconn
option tcp-check
option log-health-checks
server tbWeb1 tb-web-ui1:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
server tbWeb2 tb-web-ui2:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
http-request set-header X-Forwarded-Port %[dst_port]
2018-10-15 18:24:51 +03:00
2018-10-18 16:21:50 +03:00
backend tb-http-backend
balance leastconn
option tcp-check
option log-health-checks
server tbHttp1 tb-http-transport1:8081 check inter 5s resolvers docker_resolver resolve-prefer ipv4
server tbHttp2 tb-http-transport2:8081 check inter 5s resolvers docker_resolver resolve-prefer ipv4
backend tb-api-backend
balance source
option tcp-check
option log-health-checks
2020-04-24 14:54:25 +03:00
server tbApi1 tb-core1:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
server tbApi2 tb-core2:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
http-request set-header X-Forwarded-Port %[dst_port]