Commit Graph
100 Commits
Author SHA1 Message Date
Andrej OcenasandDavid Kaltschmidt 1864807b15 Tracing: Performance optimization (#23474)
* Add integration with Jeager
Add Jaeger datasource and modify derived fields in loki to allow for opening a trace in Jager in separate split.
Modifies build so that this branch docker images are pushed to docker hub
Add a traceui dir with docker-compose and provision files for demoing.:wq

* Enable docker logger plugin to send logs to loki

* Add placeholder zipkin datasource

* Fixed rebase issues, added enhanceDataFrame to non-legacy code path

* Trace selector for jaeger query field

* Fix logs default mode for Loki

* Fix loading jaeger query field services on split

* Updated grafana image in traceui/compose file

* Fix prettier error

* Hide behind feature flag, clean up unused code.

* Fix tests

* Fix tests

* Cleanup code and review feedback

* Remove traceui directory

* Remove circle build changes

* Fix feature toggles object

* Fix merge issues

* Add trace ui in Explore

* WIP

* WIP

* WIP

* Make jaeger datasource return trace data instead of link

* Allow js in jest tests

* Return data from Jaeger datasource

* Take yarn.lock from master

* Fix missing component

* Update yarn lock

* Fix some ts and lint errors

* Fix merge

* Fix type errors

* Make tests pass again

* Add tests

* Fix es5 compatibility

* Add header with minimap

* Fix sizing issue due to column resizer handle

* Fix issues with sizing, search functionality, duplicate react, tests

* Refactor TraceView component, fix tests

* Fix type errors

* Add dark theme styling

* Add tests for hooks

* More color changes

* Fix tests to deal with additional theme wrappers.

* Add memoization

* Fix duplicate identifier

Co-authored-by: David Kaltschmidt <david.kaltschmidt@gmail.com>
2020-04-15 16:04:01 +02:00
Andrej OcenasandDavid Kaltschmidt cf1ebd5a3d Tracing: Dark theme styling for TraceView (#23406)
* Add integration with Jeager
Add Jaeger datasource and modify derived fields in loki to allow for opening a trace in Jager in separate split.
Modifies build so that this branch docker images are pushed to docker hub
Add a traceui dir with docker-compose and provision files for demoing.:wq

* Enable docker logger plugin to send logs to loki

* Add placeholder zipkin datasource

* Fixed rebase issues, added enhanceDataFrame to non-legacy code path

* Trace selector for jaeger query field

* Fix logs default mode for Loki

* Fix loading jaeger query field services on split

* Updated grafana image in traceui/compose file

* Fix prettier error

* Hide behind feature flag, clean up unused code.

* Fix tests

* Fix tests

* Cleanup code and review feedback

* Remove traceui directory

* Remove circle build changes

* Fix feature toggles object

* Fix merge issues

* Add trace ui in Explore

* WIP

* WIP

* WIP

* Make jaeger datasource return trace data instead of link

* Allow js in jest tests

* Return data from Jaeger datasource

* Take yarn.lock from master

* Fix missing component

* Update yarn lock

* Fix some ts and lint errors

* Fix merge

* Fix type errors

* Make tests pass again

* Add tests

* Fix es5 compatibility

* Add header with minimap

* Fix sizing issue due to column resizer handle

* Fix issues with sizing, search functionality, duplicate react, tests

* Refactor TraceView component, fix tests

* Fix type errors

* Add dark theme styling

* Add tests for hooks

* More color changes

* Fix tests to deal with additional theme wrappers.

Co-authored-by: David Kaltschmidt <david.kaltschmidt@gmail.com>
2020-04-14 13:26:33 +02:00
Andrej Ocenas 263dcb1452 Chore: Fix bunch of strict null error to fix master CI (#23443)
* Fix bunch of null error

* Fix failing test

* Another test fix
2020-04-08 23:44:10 +02:00
Andrej OcenasandDavid Kaltschmidt 008bee8f27 Tracing: Adds header and minimap (#23315)
* Add integration with Jeager
Add Jaeger datasource and modify derived fields in loki to allow for opening a trace in Jager in separate split.
Modifies build so that this branch docker images are pushed to docker hub
Add a traceui dir with docker-compose and provision files for demoing.:wq

* Enable docker logger plugin to send logs to loki

* Add placeholder zipkin datasource

* Fixed rebase issues, added enhanceDataFrame to non-legacy code path

* Trace selector for jaeger query field

* Fix logs default mode for Loki

* Fix loading jaeger query field services on split

* Updated grafana image in traceui/compose file

* Fix prettier error

* Hide behind feature flag, clean up unused code.

* Fix tests

* Fix tests

* Cleanup code and review feedback

* Remove traceui directory

* Remove circle build changes

* Fix feature toggles object

* Fix merge issues

* Add trace ui in Explore

* WIP

* WIP

* WIP

* Make jaeger datasource return trace data instead of link

* Allow js in jest tests

* Return data from Jaeger datasource

* Take yarn.lock from master

* Fix missing component

* Update yarn lock

* Fix some ts and lint errors

* Fix merge

* Fix type errors

* Make tests pass again

* Add tests

* Fix es5 compatibility

* Add header with minimap

* Fix sizing issue due to column resizer handle

* Fix issues with sizing, search functionality, duplicate react, tests

* Refactor TraceView component, fix tests

* Fix type errors

* Add tests for hooks

Co-authored-by: David Kaltschmidt <david.kaltschmidt@gmail.com>
2020-04-08 17:16:22 +02:00
Andrej Ocenas e257536e88 Remove sidebar border (#23325) 2020-04-03 20:08:40 +02:00
Andrej Ocenas 7f6bb1c6e0 Tracing: Fix failing test (#23332) 2020-04-03 19:15:33 +02:00
Andrej OcenasandDavid Kaltschmidt a4d4dd325f Explore: Add trace UI to show traces from tracing datasources (#23047)
* Add integration with Jeager
Add Jaeger datasource and modify derived fields in loki to allow for opening a trace in Jager in separate split.
Modifies build so that this branch docker images are pushed to docker hub
Add a traceui dir with docker-compose and provision files for demoing.:wq

* Enable docker logger plugin to send logs to loki

* Add placeholder zipkin datasource

* Fixed rebase issues, added enhanceDataFrame to non-legacy code path

* Trace selector for jaeger query field

* Fix logs default mode for Loki

* Fix loading jaeger query field services on split

* Updated grafana image in traceui/compose file

* Fix prettier error

* Hide behind feature flag, clean up unused code.

* Fix tests

* Fix tests

* Cleanup code and review feedback

* Remove traceui directory

* Remove circle build changes

* Fix feature toggles object

* Fix merge issues

* Add trace ui in Explore

* WIP

* WIP

* WIP

* Make jaeger datasource return trace data instead of link

* Allow js in jest tests

* Return data from Jaeger datasource

* Take yarn.lock from master

* Fix missing component

* Update yarn lock

* Fix some ts and lint errors

* Fix merge

* Fix type errors

* Make tests pass again

* Add tests

* Fix es5 compatibility

Co-authored-by: David Kaltschmidt <david.kaltschmidt@gmail.com>
2020-04-02 13:34:16 +02:00
Andrej OcenasandArve Knudsen e799d0fdec Docs: Add note about ulimit in bash_profile (#22562)
* Add note about ulimit in bash_profile

* developer-guide.md: Document retaining ulimit changes

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix language

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* developer-guide.md: Describe troubleshooting ulimit issues

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-03-31 10:00:55 +02:00
Andrej Ocenas 4c5005e575 Explore: Fix 100% height of graph and table panel (#23101)
* Fix 100% height styles

* Move utility class to component styles
2020-03-26 13:24:58 +01:00
Andrej OcenasandDavid Kaltschmidt ae09ccbf79 Trace UI demo (#20297)
* Add integration with Jeager
Add Jaeger datasource and modify derived fields in loki to allow for opening a trace in Jager in separate split.
Modifies build so that this branch docker images are pushed to docker hub
Add a traceui dir with docker-compose and provision files for demoing.:wq

* Enable docker logger plugin to send logs to loki

* Add placeholder zipkin datasource

* Fixed rebase issues, added enhanceDataFrame to non-legacy code path

* Trace selector for jaeger query field

* Fix logs default mode for Loki

* Fix loading jaeger query field services on split

* Updated grafana image in traceui/compose file

* Fix prettier error

* Hide behind feature flag, clean up unused code.

* Fix tests

* Fix tests

* Cleanup code and review feedback

* Remove traceui directory

* Remove circle build changes

* Fix feature toggles object

* Fix merge issues

* Fix some null errors

* Fix test after strict null changes

* Review feedback fixes

* Fix toggle name

Co-authored-by: David Kaltschmidt <david.kaltschmidt@gmail.com>
2020-03-25 12:25:39 +01:00
Andrej Ocenas c64182d579 Webpack: Add relative node_modules path (#22806) 2020-03-16 15:44:23 +01:00
Andrej Ocenas 934d93ad94 Elastic: Map level field based on config. (#22182)
* Map level field based on config.

* Fix type
2020-02-17 16:49:24 +01:00
Andrej Ocenas 9c55500cc0 Elastic: Replace range as number not string (#22173) 2020-02-13 16:00:01 +01:00
Andrej Ocenas 85dad73e9d Influxdb: Fix cascader when doing log query in explore (#21787)
* Fix cascader options and add tests

* Add comment

* Fix typo
2020-01-28 18:12:15 +01:00
Andrej Ocenas c3a19c6d98 Influxdb: Fix issues with request creation and parsing (#21743) 2020-01-27 18:21:41 +01:00
Andrej Ocenas 0fda3c4f44 Explore: Fix context view in logs, where some rows may have been filtered out. (#21729)
* Fix timestamp formats and use uid to filter context rows

* Remove timestamps from tests
2020-01-26 23:13:56 +01:00
Andrej Ocenas 39f7cff7c7 Loki: Refactor editor and syntax hooks (#21687) 2020-01-24 15:07:45 +01:00
Andrej Ocenas 1a0df77b32 Update latest to 6.5.3 (#21509) 2020-01-16 14:16:58 +01:00
Andrej Ocenas 32f055111c Add changelog for 6.5.3 2020-01-15 14:34:46 +01:00
Andrej Ocenas 27a308a3a4 Docs: Fix link (#21358) 2020-01-06 07:43:01 -08:00
Andrej Ocenas 5a3c1dc6a4 Elastic: Add data links in datasource config (#20186) 2019-12-11 17:40:56 +01:00
Andrej Ocenas a7f4e4c56a Prometheus: Refactor labels caching (#20898) 2019-12-09 09:46:52 +01:00
Andrej Ocenas c4c031ef43 Explore: Cleanup redundant state variables and unused actions (#20837) 2019-12-05 11:22:46 +01:00
Andrej Ocenas 4c9cb415ec Elastic: Fix parsing for millisecond number timestamps (#20290)
* Stop parsing 'field'

* Remove time field from query for docs queries

* Test refactor to test all versions

* Fix tests
2019-12-04 14:43:43 +01:00
Andrej Ocenas 6682a36b8a Explore: Fix reset reducer duplication (#20838) 2019-12-04 12:51:15 +01:00
Andrej Ocenas 700b93a75c Docs: Add section about derived fields for Loki (#20648) 2019-12-03 23:38:25 +01:00
Andrej Ocenas f2574f4944 Prometheus: Fix caching for default labels request (#20718) 2019-11-28 16:55:38 +01:00
Andrej Ocenas 2f101d1db5 DataLinks: Refactor title state (#20256) 2019-11-27 09:52:41 +01:00
Andrej Ocenas 3f144bdd05 Provisioning: Fix unmarshaling nested jsonData values (#20399)
Problem was that yaml unmarshal returned nested maps as
 map[interface{}]interface{} which are then not marshal-able 
to json because of that interface{} key type. This adds explicit 
casting of the keys in the yaml value types to string which 
then makes the values marshal-able to JSON in DB.

Fixes: #11537
2019-11-18 11:06:39 +01:00
Andrej Ocenas a08c2c43db Explore: Fix interpolation of error message (#20301) 2019-11-11 16:29:11 +01:00
Andrej Ocenas 0f709cffbc Fix when only icon is present (#20208) 2019-11-06 17:28:41 +01:00
Andrej Ocenas 0a78652404 Explore: Add custom DataLinks on datasource level for Loki (#20060)
Adds a config section with derived fields which is a config that allows you to create a new field based on a regex matcher run on a log message create DataLink to it which is the clickable in the log detail.
2019-11-06 16:15:08 +01:00
Andrej Ocenas dca872f75f Explore: Memory leak fix due to dedup selector (#20107)
Change custom hashing and lodash.memoize based selector for standard reselect.
2019-11-01 16:38:34 +01:00
Andrej Ocenas 6dde81d839 grafana/ui: fix button icon styles (#20084)
Fix spacing and margins in case you use icon only button.
2019-11-01 10:25:44 +01:00
Andrej Ocenas 2715d6535f Explore: Fix deferred rendering of logs (#20110)
Remove artificial delay before first 100 rows were rendered and defer just the rest.
2019-10-31 11:06:11 +01:00
Andrej Ocenas a1e8157969 DataLinks: Fix blur issues (#19883) 2019-10-29 14:27:39 +01:00
Andrej Ocenas 49c44da73b Grafana/ui: Refactor button and add default type = button (#20042) 2019-10-29 09:39:44 +01:00
Andrej Ocenas 18d72ab327 Add some typings for react events (#20038) 2019-10-29 09:38:59 +01:00
Andrej Ocenas 551e24f9f8 ReactMigration: Migrate Loki and Elastic config pages to React (#19979) 2019-10-25 16:43:20 +02:00
Andrej Ocenas fc1ded5026 grafana/ui: Fix modal component (#19987)
* Fix modal

* Fix test message
2019-10-25 09:41:58 +02:00
Andrej Ocenas 80a6853fd4 Refactor: Suggestion plugin for slate (#19825) 2019-10-21 18:53:35 +02:00
Andrej Ocenas 4d214f5aea Loki: Remove param (#19854) 2019-10-16 14:20:21 +02:00
Andrej Ocenas 945b815fe0 Fix: Unsubscribe from events in dashboards (#19788)
* Unsubscribe on unmount

* Fix unsubscribe
2019-10-16 12:54:13 +02:00
Andrej Ocenas 09a599900c DataLinks: Fix url field not releasing focus (#19804) 2019-10-16 09:57:51 +02:00
Andrej Ocenas 5cf5d89dff Fix: clicking outside of some query editors required 2 clicks (#19822) 2019-10-15 17:04:11 +02:00
Andrej Ocenas 14cf2a3514 Call next in azure editor (#19799) 2019-10-15 14:56:54 +02:00
Andrej Ocenas 9b483e765b UX: Fix empty space in select (#19713) 2019-10-09 14:11:45 +02:00
Andrej Ocenas 5238faf6da Loki: Fix lookup for label key token (#19579) 2019-10-07 19:36:52 +02:00
Andrej Ocenas 16b041608d Explore: Move data source loader into the select (#19465) 2019-10-02 10:15:06 +02:00
Andrej Ocenas 3e99e8fb6c Docs: Updates about Loki annotations (#19537) 2019-10-02 10:00:23 +02:00
Andrej Ocenas 72c15d7aa3 Refactor: Split LogRow component (#19471) 2019-09-30 16:01:30 +02:00
Andrej Ocenas 3866814ea9 CLI: Fix version selection for plugin install (#19498) 2019-09-30 15:34:09 +02:00
Andrej Ocenas 0490dbb88d Explore: Generate log row uid (#18994) 2019-09-30 14:44:15 +02:00
Andrej Ocenas 649d745262 Docs: Add Live tail section in Explore (#19321) 2019-09-30 12:06:00 +02:00
Andrej Ocenas 234a2c599d Refactor: RefreshPicker export things as statics on class (#19443) 2019-09-27 10:15:05 +02:00
Andrej Ocenas 0b85e34b20 Docs: Update Loki docs with new syntax and features (#19370) 2019-09-25 18:16:22 +02:00
Andrej Ocenas 3bd04d63c4 Docs: Update readme with info about ongoing migration (#19362) 2019-09-25 11:27:20 +02:00
Andrej Ocenas f203e82b40 Explore: Do not send explicit maxDataPoints for logs. (#19235) 2019-09-24 16:20:45 +02:00
Andrej Ocenas 6a699af27b Explore: Refactor mode selection (#19356) 2019-09-24 12:19:48 +02:00
Andrej Ocenas b0d6ac5f42 Explore: Refactor live tail controls (#19328) 2019-09-24 10:18:34 +02:00
Andrej Ocenas 4c1bc59889 Explore: Fix unsubscribing from Loki websocket (#19263) 2019-09-23 22:48:39 +02:00
Andrej Ocenas bf24cbba76 Explore: live tail UI fixes and improvements (#19187) 2019-09-20 13:00:11 +02:00
Andrej Ocenas 359404eb77 Explore: Update live tail buttons (#19143) 2019-09-17 11:25:12 +02:00
Andrej Ocenas d55261aac7 Explore: Move throttling before processing (#19095) 2019-09-13 15:32:53 +02:00
Andrej Ocenas 5fdc6da3ec Prometheus: Fix response states (#19092) 2019-09-13 15:08:29 +02:00
Andrej Ocenas 81ec76bdef Explore: Add throttling when doing live queries (#19085) 2019-09-13 10:58:29 +02:00
Andrej Ocenas bc4ba64a24 Explore: Fix auto completion on label values for Loki (#18988) 2019-09-12 10:02:49 +02:00
Andrej Ocenas 0e3e874eee Annotations: Add annotations support to Loki (#18949) 2019-09-10 11:04:44 +02:00
Andrej Ocenas 8c79085351 Annotations: Fix query editor rendering on datasource change (#18945) 2019-09-09 17:10:26 +02:00
Andrej Ocenas 05434cffb1 Docs: Add PR review practices link (#18937) 2019-09-09 07:50:17 +02:00
Andrej Ocenas aab224ef29 Explore: elastic small fixes (#18879)
- Fix cancellation error showing in UI
- Fix display of object values in log rows
2019-09-04 10:49:09 +02:00
Andrej Ocenas e0e3a4db54 Explore: Add typings for queryTransaction.request (#18847) 2019-09-03 22:04:33 +02:00
Andrej Ocenas e3181e66b4 Explore: Allow pausing and resuming of live tailing (#18836)
Adding pause/resume buttons and pause on scroll to prevent new rows messing with the scroll position.
2019-09-03 11:23:39 +02:00
Andrej Ocenas 6402391638 Explore: Add memoization and remove unused props (#18775) 2019-08-29 13:41:45 +02:00
Andrej Ocenas d4382ad906 Add typings to package.json in packages (#18640)
Fixes Go to definition in webstorm
2019-08-22 10:20:17 +02:00
Andrej Ocenas b3a75cee68 Docs: Update issue triage doc with external PRs section (#18464)
Triaging external PRs to the extent of making sure they have assigned reviewer.
2019-08-12 12:00:05 +02:00
Andrej Ocenas 8c49d27705 CLI: Allow installing custom binary plugins (#17551)
Make sure all data is sent to API to be able to select correct archive version.
2019-07-29 10:44:58 +02:00
Andrej Ocenas 7f1214ac46 Permissions: Show plugins in nav for non admin users but hide plugin configuration (#18234)
Allow non admins to see plugins list but only with readme. Any config tabs are hidden from the plugin page. Also plugin panel does not show action buttons (like Enable) for non admins.
2019-07-25 16:54:26 +02:00
Andrej Ocenas 743f8420bc devenv: Fix typo in nginix docker for mac (#18068) 2019-07-11 18:13:01 +02:00
Andrej Ocenas 97f7c92455 Devenv: Add nginx proxy for mac (#17572) 2019-06-13 21:29:33 +02:00
Andrej Ocenas 0fa60a8450 Update latest (#17456) 2019-06-05 17:35:04 +02:00
Andrej Ocenas dd52ff5ac5 Update changelog for 6.2.2 (#17452)
* Update changelog

* Fix whitespace
2019-06-05 15:05:44 +02:00
Andrej Ocenas 1c3ad78672 Perf: Fix slow dashboards ACL query (#17427)
Fix slow ACL query for dashboards that was used as subquery on multiple places slowing down search and login in instances with many dashboards.
2019-06-05 10:55:50 +02:00
Andrej Ocenas 151b24b95f CLI: Add command to migrate all datasources to use encrypted password fields (#17118)
closes: #17107
2019-05-27 10:47:21 +02:00
Andrej Ocenas 3dbc3251d1 Chore: Deduplicate sqlstore transaction code (#17069)
* Deduplicate transaction code

* More deduplication
2019-05-16 12:39:59 +02:00
Andrej Ocenas fd10aa902d Chore: Use executable dir instead of pwd in CLI for isDev check (#16974)
* Use executable dir for the dev check

* Handle executable in bin and platform dirs

* Remove commented code

* Rename variable
2019-05-14 14:13:41 +02:00
Andrej Ocenas cf39a264ca Fix: Wrap value of multi variable in array when coming from URL (#16992)
*  Wrap variable value in array if multi

* Fix typo

* Fix case with multiple custom values
2019-05-10 22:19:46 +02:00
Andrej Ocenas 2abb009d68 Chore: Add prometheus basic auth proxy (#16882) 2019-05-09 12:08:27 +02:00
Andrej Ocenas 568d7373f7 Chore: Add Input stories (#16897) 2019-05-09 07:45:57 +02:00
Andrej Ocenas 1b61344096 Update changelog for 6.2.0-beta1 2019-05-07 16:05:12 +02:00
Andrej Ocenas 2596ce5076 Add pattern validation in configs (#16837)
Datasources: Add pattern validation for time input on datasource config pages
2019-05-02 11:02:00 +02:00
Andrej Ocenas eb82a75668 Provisioning: Show file path of provisioning file in save/delete dialogs (#16706)
* Add file path to metadata and show it in dialogs

* Make path relative to config directory

* Fix tests

* Add test for the relative path

* Refactor to use path relative to provisioner path

* Change return types

* Rename attribute

* Small fixes from review
2019-04-30 13:32:18 +02:00
Andrej Ocenas 0433af6385 Config: Fixes bug where timeouts for alerting was not parsed correctly (#16784)
* Fix parsing of the config

* Remove unnecessary conversion

* Remove timeout modification

Co-Authored-By: aocenas <mr.ocenas@gmail.com>

* Remove unused import
2019-04-30 12:05:38 +02:00
Andrej Ocenas 42b745a098 Provisioning: Add API endpoint to reload provisioning configs (#16579)
* Add api to reaload provisioning

* Refactor and simplify the polling code

* Add test for the provisioning service

* Fix provider initialization and move some code to file reader

* Simplify the code and move initialization

* Remove unused code

* Update comment

* Add comment

* Change error messages

* Add DashboardProvisionerFactory type

* Update imports

* Use new assert lib

* Use mutext for synchronizing the reloading

* Fix typo

Co-Authored-By: aocenas <mr.ocenas@gmail.com>

* Add docs about the new api
2019-04-25 09:06:44 +02:00
Andrej Ocenas fcebd713a5 Provisioning: Interpolate env vars in provisioning files (#16499)
* Add value types with custom unmarshalling logic

* Add env support for notifications config

* Use env vars in json data tests for values

* Add some more complexities to value tests

* Update comment with example usage

* Set env directly in the tests, removing patching

* Update documentation

* Add env var to the file reader tests

* Add raw value

* Post merge fixes

* Add comment
2019-04-24 15:39:47 +02:00
Andrej Ocenas e4f649e2c8 Chore: Small improvements to grafana-cli (#16670)
* Small improvements

* Better error handling
2019-04-23 12:34:34 +02:00
Andrej Ocenas c429934a66 Chore: Use x/xerrors instead of pkg/errors (#16668)
* Use xerrors instead of pkg/errors

* Add Wrap util func

* Move Wrap to errutil package
2019-04-23 11:50:31 +02:00
Andrej Ocenas 79299f9bca Fix typo in PULL_REQUEST_TEMPLATE.md 2019-04-18 10:58:11 +02:00
Andrej Ocenas 6eb8b29d70 Chore: Add more explicit typing (#16594) 2019-04-15 13:14:52 +02:00
Andrej Ocenas 66f6e16916 Security: Store datasource passwords encrypted in secureJsonData (#16175)
* Store passwords in secureJsonData

* Revert unnecessary refactors

* Fix for nil jsonSecureData value

* Remove copied encryption code from migration

* Fix wrong field reference

* Remove migration and provisioning changes

* Use password getters in datasource proxy

* Refactor password handling in datasource configs

* Add provisioning warnings

* Update documentation

* Remove migration command, moved to separate PR

* Remove unused code

* Set the upgrade version

* Remove unused code

* Remove double reference
2019-04-15 11:11:17 +02:00