Natel v6 #13

ryantxu · 2019-05-10T20:46:21Z

Run:

git checkout natel-V6
git merge --no-edit master

git merge --no-edit v6-circle-no-master 
git merge --no-edit natel-oauth-redirect
git merge --no-edit natel-dynamic-height
git merge --no-edit natel-emitter
git merge --no-edit export-services
git merge --no-edit v6-branding

* grafana/master: (40 commits) TableData: support name (grafana#16983) Changelog: Typo guage -> gauge (grafana#16982) TestData: stream via fetch (grafana#16963) plugins: fix how datemath utils are exposed to plugins (grafana#16976) NewDataSource: Updated page header title fix(prometheus): issue with click label to filter for recording rules in Explore Explore: Removes Promise.All from runQueries thunk (grafana#16957) Chore: Add prometheus basic auth proxy (grafana#16882) Snapshot: use given key and deleteKey (grafana#16876) DataSourcePlugins: more generics improvements (grafana#16965) AddDataSource: Updated page design & categories (grafana#16971) Templating: Support selecting all filtered values of multi-value variable (grafana#16873) Chore: Add Input stories (grafana#16897) FieldDisplay: Don't use group ui elements in field editors (grafana#16953) GettingStarted: Fixes layout issues, fixes grafana#16926 (grafana#16941) PanelModel: Fix crash after window resize, fixes grafana#16933 (grafana#16942) Singlestat: fixed centering issue for very small panels (grafana#16944) Tests: Adds end-to-end tests skeleton and basic smoke test scenario (grafana#16901) Chore: Replaces moment with Grafanas DateTime (grafana#16919) InfluxDB: Fix HTTP method should default to GET (grafana#16949) ...

* master: (53 commits) explore: add some extra time for angular query editors to update query (grafana#16955) Explore: Align Explore with Dashboards and Panels (grafana#16823) Explore: Fix empty result from datasource should render logs container (grafana#16999) Explore: Fixes zoom exception in Loki/Graph (grafana#16991) PanelEditor: Fix queries tab now showing, wrong skipDataQuery logic (grafana#16994) DataSourceApi: convert interface to abstract class (grafana#16979) Panels: Fixed error panel tooltip (grafana#16993) Docker: Prevent a permission denied error when writing files to the default provisioning directory (grafana#16831) Notification: attempt to send notifications to all given email addresses (grafana#16881) GettingStarted: convert to react panel plugin (grafana#16985) Plugins: Remove dataFormats key and add skipDataQuery (grafana#16984) AlertList: removed icon MetricsPanelCtrl: use shared queryRunner to support query execution (grafana#16659) TableData: support name (grafana#16983) Changelog: Typo guage -> gauge (grafana#16982) TestData: stream via fetch (grafana#16963) plugins: fix how datemath utils are exposed to plugins (grafana#16976) NewDataSource: Updated page header title fix(prometheus): issue with click label to filter for recording rules in Explore Explore: Removes Promise.All from runQueries thunk (grafana#16957) ...

* master: explore: add some extra time for angular query editors to update query (grafana#16955) Explore: Align Explore with Dashboards and Panels (grafana#16823) Explore: Fix empty result from datasource should render logs container (grafana#16999) Explore: Fixes zoom exception in Loki/Graph (grafana#16991) PanelEditor: Fix queries tab now showing, wrong skipDataQuery logic (grafana#16994) DataSourceApi: convert interface to abstract class (grafana#16979) Panels: Fixed error panel tooltip (grafana#16993) Docker: Prevent a permission denied error when writing files to the default provisioning directory (grafana#16831) Notification: attempt to send notifications to all given email addresses (grafana#16881) GettingStarted: convert to react panel plugin (grafana#16985) Plugins: Remove dataFormats key and add skipDataQuery (grafana#16984) AlertList: removed icon MetricsPanelCtrl: use shared queryRunner to support query execution (grafana#16659)

…branding * 'v6-branding' of github.com:natelenergy/grafana: update test fix test put back the test merge master natel branding

* grafana/master: (30 commits) chore: remove x character in explore Dashboard: show refresh button in kiosk mode (grafana#17032) Devenv: Updated gauge test dashboard Chore: reintroduce gosec (grafana#17021) Gauge: tweaks to background color and height usage (grafana#17019) Feature: provide multildap server configuration (grafana#16914) (feat/explore): Support for new LogQL filtering syntax (grafana#16674) fix(explore): Prevent double querying for Prometheus and Loki (grafana#17004) Chore: No implict any fixes (grafana#17020) move log package to /infra (grafana#17023) Chore: Lowered implicit anys limit to 5386 Chore: Updated snapshot Select: Fixed isOpen issue Chore: Typescript no-implicit any fixes progress (grafana#17018) GraphPanel: show results for all SeriesData (grafana#16966) Fix: Wrap value of multi variable in array when coming from URL (grafana#16992) GettingStarted: add key and remove ng-class (grafana#17007) explore: add some extra time for angular query editors to update query (grafana#16955) Explore: Align Explore with Dashboards and Panels (grafana#16823) Explore: Fix empty result from datasource should render logs container (grafana#16999) ...

* grafana/master: (25 commits) Chore: Bump jest to 24.8.0 (grafana#17094) Chore: Bump ts-node to 8.1.0 (grafana#17093) Release: Updated changelog backend: replace /pkg/errors with errutil (grafana#17065) Explore: Fixes filtering in Prometheus queries when clicking in Table (grafana#17083) Remotecache: Avoid race condition in Set causing error on insert. (grafana#17082) Build: Support publishing MSI to grafana.com (grafana#17073) InputDataSource: better empty value support (grafana#17075) Panels: Fixed alert icon position in panel header (grafana#17070) GraphPanel: use SeriesData directly (skip legacy transformation) (grafana#17037) Streaming: support streaming in MetricsPanelCtrl (grafana#17034) Gauge: Fix switching orientation issue when switching from BarGauge to Gauge (grafana#17064) serverlock: run tests async should be more linear time wise (grafana#17059) InfoPopover: Fixes transclude undefined error (grafana#17063) Dashboard: Fixes lazy loading & expanding collapsed rows on mobile (grafana#17055) fix: Azure Monitor adds missing closing div tag to query editor (grafana#17057) Chore: Use executable dir instead of pwd in CLI for isDev check (grafana#16974) Search: Set element height to 100% to avoid Chrome 74's overflow (grafana#17054) Docs: adds note about removing session storage (grafana#17003) Chore: remove use of `== false` (grafana#17036) ...

* master: (49 commits) add support for periodically reloading mysql client certs (grafana#14892) Chore: Deduplicate sqlstore transaction code (grafana#17069) Alertmanager: Replace illegal chars with underscore in label names (grafana#17002) Adjusted documentation for gcs to reflect the code (grafana#16947) fix: Initial url update in Explore should replace existing url history grafana#17030 (grafana#17061) Explore: Allow switching between metrics and logs (grafana#16959) Chore: explore possibilities of using makefile (grafana#17039) Chore: Bump jest to 24.8.0 (grafana#17094) Chore: Bump ts-node to 8.1.0 (grafana#17093) Release: Updated changelog backend: replace /pkg/errors with errutil (grafana#17065) Explore: Fixes filtering in Prometheus queries when clicking in Table (grafana#17083) Remotecache: Avoid race condition in Set causing error on insert. (grafana#17082) Build: Support publishing MSI to grafana.com (grafana#17073) InputDataSource: better empty value support (grafana#17075) Panels: Fixed alert icon position in panel header (grafana#17070) GraphPanel: use SeriesData directly (skip legacy transformation) (grafana#17037) Streaming: support streaming in MetricsPanelCtrl (grafana#17034) Gauge: Fix switching orientation issue when switching from BarGauge to Gauge (grafana#17064) serverlock: run tests async should be more linear time wise (grafana#17059) ...

* natel-emitter: expose emitter

* grafana/master: Feature: LDAP refactoring (grafana#16950) explore: fix issues when loading and both graph/table are collapsed (grafana#17113) explore: make sure datasource is added to target (grafana#17116) Fix: tighten revive exit code & make it happy (grafana#17127) GraphPanel: Don't sort series when legend table & sort column is not visible (grafana#17095) Chore: Update grafana-ui version to 6.2.0-alpha.0 (grafana#17109)

…visible (grafana#17095) * Fix: if current sort key is not active column, do not use for sort and select next available active (grafana#16980) * Fix: only sort if sortkey is active column and table is active (grafana#16980) * Fix: sorting stacked series as legend. current descending order test (grafana#16980) * Fix: existing sort tests and added additional to prevent bug from resurfacing (grafana#16980)

* Revive should fail the build * Fix the associated errors

Fixes a regression introduced in grafana#16959 which removed datasource property from changed query for angular query editors having the result of loading explore URL's without datasource loaded the default query in query editor and Explore. Ref grafana#16808

…rafana#17113) Removes the functionality of being able to collapse/expand the logs container. When both graph and table are collapsed and you reload the page then the start page should not be displayed. When both graph and table are collapsed and you reload the page then the graph and table panels should be displayed. Fix so that reducer tests are run. On of the test used fit() instead of it() which had the consequence of only 1 reducer test was executed and the rest skipped. There was some failing tests that now is updated and now passes. Fixes grafana#17098

* incapsulates multipleldap logic under one module * abstracts users upsert and get logic * changes some of the text error messages and import sort sequence * heavily refactors the LDAP module – LDAP module now only deals with LDAP related behaviour * integrates affected auth_proxy module and their tests * refactoring of the auth_proxy logic

* grafana/master: Feature: LDAP refactoring (grafana#16950) explore: fix issues when loading and both graph/table are collapsed (grafana#17113) explore: make sure datasource is added to target (grafana#17116) Fix: tighten revive exit code & make it happy (grafana#17127) GraphPanel: Don't sort series when legend table & sort column is not visible (grafana#17095) Chore: Update grafana-ui version to 6.2.0-alpha.0 (grafana#17109)

* master: Feature: LDAP refactoring (grafana#16950) explore: fix issues when loading and both graph/table are collapsed (grafana#17113) explore: make sure datasource is added to target (grafana#17116) Fix: tighten revive exit code & make it happy (grafana#17127) GraphPanel: Don't sort series when legend table & sort column is not visible (grafana#17095) Chore: Update grafana-ui version to 6.2.0-alpha.0 (grafana#17109)

* natel-oauth-redirect: redirect again to root?

* natel-dynamic-height: y is the trigger Feature: LDAP refactoring (grafana#16950) explore: fix issues when loading and both graph/table are collapsed (grafana#17113) explore: make sure datasource is added to target (grafana#17116) Fix: tighten revive exit code & make it happy (grafana#17127) GraphPanel: Don't sort series when legend table & sort column is not visible (grafana#17095) Chore: Update grafana-ui version to 6.2.0-alpha.0 (grafana#17109) remove the border

* v6-branding: merge master merge master

* master: Chore: fix codespell issue with build (grafana#17144)

* natel-oauth-redirect:

* natel-dynamic-height:

* v6-branding: fix extra quote

ryantxu added 18 commits May 6, 2019 11:37

natel branding

59055ee

expose emitter

0f984bc

never match

f1596e0

copy patch from ryantxu

a95d242

copy patch from ryantxu

f593bf7

build all... not just fast

d83ad08

build all

c986d30

a commit

5d29bd1

new PR

1c739d6

merge master

899728c

put back the test

3242bab

fix test

e5c93e8

update test

272649f

ryantxu force-pushed the natel-V6 branch from f9ac0d9 to b2039b0 Compare May 11, 2019 00:29

ryantxu added 10 commits May 13, 2019 15:27

upstream footer

04c57fe

fix test

a8ed5d2

Merge branch 'v6-branding' of github.com:natelenergy/grafana into v6-…

39c96c2

…branding * 'v6-branding' of github.com:natelenergy/grafana: update test fix test put back the test merge master natel branding

remove snapshots

51bb0ac

remove snapshots

f986df1

add aria

d24a193

merge master

d8d4859

merge master

b63d19d

ryantxu force-pushed the natel-V6 branch from b2039b0 to b63d19d Compare May 15, 2019 16:44

ryantxu and others added 29 commits May 16, 2019 08:04

Merge branch 'natel-emitter' into natel-V6

dac537f

* natel-emitter: expose emitter

merge all

d607460

remove the border

14212fe

merge master

9aeebff

merge master

94f89dd

Chore: Update grafana-ui version to 6.2.0-alpha.0 (grafana#17109)

b547477

Fix: tighten revive exit code & make it happy (grafana#17127)

4a07112

* Revive should fail the build * Fix the associated errors

y is the trigger

5d43f44

redirect again to root?

af677e7

Merge branch 'natel-oauth-redirect' into natel-V6

e8ea390

* natel-oauth-redirect: redirect again to root?

Merge branch 'v6-branding' into natel-V6

d06a4b0

* v6-branding: merge master merge master

Merge branch 'master' into natel-V6

cb5c42a

* master: Chore: fix codespell issue with build (grafana#17144)

Merge branch 'master' into natel-oauth-redirect

30355e3

* master: Chore: fix codespell issue with build (grafana#17144)

Merge branch 'master' into natel-dynamic-height

3e42c2a

* master: Chore: fix codespell issue with build (grafana#17144)

Merge branch 'master' into v6-branding

3c00ded

* master: Chore: fix codespell issue with build (grafana#17144)

fix extra quote

1fb4f1c

Merge branch 'natel-oauth-redirect' into natel-V6

caf6a51

* natel-oauth-redirect:

Merge branch 'natel-dynamic-height' into natel-V6

817055d

* natel-dynamic-height:

Merge branch 'v6-branding' into natel-V6

9706d28

* v6-branding: fix extra quote

ryantxu added the build label May 17, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Natel v6 #13

Natel v6 #13

ryantxu commented May 10, 2019 •

edited

Loading

Natel v6 #13

Are you sure you want to change the base?

Natel v6 #13

Conversation

ryantxu commented May 10, 2019 • edited Loading

ryantxu commented May 10, 2019 •

edited

Loading