537 Commits (0aee7338adac7349dcfe87a6325957f15efd6d38)

Author	SHA1	Message	Date
ismail simsek	0aee7338ad	InfluxDB: Fix sending retention policy with InfluxQL queries (#63820) ... * Send retention policy if that is specified * Define the type * Update default retention policy name * Update unit tests * fix unit tests * fix unit tests again * Load retention policies at first * Fix tests * Fix Editor tests * Remove unused code * A simpler approach * Even simpler * Even simpler	2 years ago
Ivana Huckova	9ba38b760a	Elasticsearch: Unify adhoc variables processing (#65274)	2 years ago
Torkel Ödegaard	647f693e59	Scenes: Update to latest scenes package and remove editing stuff (#65222) ... * Update to latest scenes and remove editing stuff * fixing test	2 years ago
Ryan McKinley	f96637b5fc	Live: Remove (alpha) ability to configure live pipelines (#65138)	2 years ago
Torkel Ödegaard	cd490ba0be	DataLinks: Fixes interpolation (formatting) of __all_variables and __url_time_range (#65162) ... * DataLinks: Fixes interpolation (formatting) of __all_variables and __url_time_range * simplify if statement	2 years ago
Torkel Ödegaard	a3de3c9dde	Table: Fixes table panel gauge alignment (#64994) ... * Table: Fixes tables guage alignment issues * Removed console.log * Fixing	2 years ago
Ryan McKinley	91a4b8b529	Chore: remove dashboardsFromStorage (#65058)	2 years ago
Artur Wierzbicki	4274b9414f	Chore: remove `querylibrary` feature toggle (#65021) ... * chore: remove querylibrary * chore: remove querylibrary * chore: remove querylibrary	2 years ago
Ludovic Viaud	07be0643f0	Instrument transformations (#64960) ... * Instrument transformations * Fix any * Fix any * Fix unit test	2 years ago
Alexa V	5bbdc62044	Storybook: Add MDX PanelChrome documentation (#64916)	2 years ago
ismail simsek	0823672fce	Influxdb: Re-introduce backend migration feature toggle (#64829) ... * Revert "Influxdb: Remove backend migration feature toggle (#61308)" This reverts commit 67c02f66 * Put feature toggle back	2 years ago
Ryan McKinley	4f13e78d11	Chore: Avoid explicit React.FC<Props> when possible (round 2) (#64749)	2 years ago
Ashley Harrison	e0e6165f70	Chore: adjust more unit tests to work with react 18 (#64759) ... adjust unit tests to work with react 18	2 years ago
Ryan McKinley	6751a93d49	FeatureToggles: remove open type declaration (#64645)	2 years ago
Ashley Harrison	53186c14a4	Chore: Improve some types (#64675) ... * some type fixes * few more * more type fixes * fix the majority of (window as any) calls * don't make new variable for event * few more * MOAR	2 years ago
Ryan McKinley	fa740a8bcf	Chore: Remove panel inspect Actions hack (#64643) ... remove actions tab hook	2 years ago
Ashley Harrison	3a1862f37f	TimeSeries: fix time comparer not comparing date strings properly (#64622) ... * fix time comparer not comparing times properly * move isDateTime last as it's probably the most expensive check	2 years ago
Leon Sorokin	18e3e0ca8d	FieldMatchers: Add match by value (reducer) (#64477) ... Co-authored-by: Ryan McKinley <ryantxu@gmail.com>	2 years ago
Konrad Lalik	5179a830ef	Alerting: Add fuzzy search to alert list view (#63931) ... * Add basic fuzzy search * Add fuzzy search to rule name, group and namespace filters * Add tests * Apply sort order when filtering * Filter rules on Enter instead of onChange * Add minor rule stats performance improvements * Fix tests * Remove unused code, add ufuzzy inline docs * Use form submit to set query string, add debounce docs	2 years ago
Artur Wierzbicki	f23c8e5cd1	Chore: move `sessionId` from Live service (#64465) ... * remove sessionid from live * remove sessionid from live * use uuid rather than math.random	2 years ago
Marcus Andersson	b63c56903d	Plugins: Extend panel menu with commands from plugins (#63802) ... * feat(plugins): introduce dashboard panel menu placement for adding menu items * test: add test for getPanelMenu() * added an unique identifier for each extension. * added context to getPluginExtensions. * wip * Wip * wiwip * Wip * feat: WWWIIIIPPPP 🧨 * Wip * Renamed some of the types to align a bit better. * added limit to how many extensions a plugin can register per placement. * decreased number of items to 2 * will trim the lenght of titles to max 25 chars. * wrapping configure function with error handling. * added error handling for all scenarios. * moved extension menu items to the bottom of the more sub menu. * added tests for configuring the title. * minor refactorings. * changed so you need to specify the full path in package.json. * wip * removed unused type. * big refactor to make things simpler and to centralize all configure error/validation handling. * added missing import. * fixed failing tests. * fixed tests. * revert(extensions): remove static extensions config in favour of registering via AppPlugin APIs * removed the compose that didn't work for some reason. * added tests just to verify that validation and error handling is tied together in configuration function. * adding some more values to the context. * draft validation. * added missing tests for getPanelMenu. * added more tests. * refactor(extensions): move logic for validating extension link config to function * Fixed ts errors. * Started to add structure for supporting commands. * fixed tests. * adding commands to the registry * tests: group test cases in describe blocks * tests: add a little bit more refactoring to the tests * tests: add a test case for checking correct placements * feat: first version of the command handler * feat: register panel menu items with commands * refactor: make the 'configure' function not optional on `PluginExtensionRegistryItem` * Wip * Wip * Wip * added test to verify the default configure function. * added some more tests to verify that commands have the proper error handling for its configure function. * tests: fix TS errors in tests * tests: add auxiliary functions * refactor: small refactoring in tests * refactor: refactoring tests for registryFactory * refactor: refactoring tests for registryFactory * refactor: refactoring tests for registryFactory * refactor: refactoring tests for registryFactory * refactor: refactoring tests for registryFactory * refactor: refactoring tests for registryFactory * refactor: refactoring tests for registryFactory * refactor: refactoring tests for registryFactory * draft of wrapping command handler with error handling. * refactor: refactoring tests for registryFactory * added test for edge case. * replaced the registry item with a configure function. * renamed the configure function type. * refactoring of the registryfactory. * added tests for handler error handling. * fixed issue with assert function. * added comment about the limited type. * Update public/app/features/plugins/extensions/errorHandling.test.ts Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com> * Update public/app/features/plugins/extensions/errorHandling.test.ts Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com> * Update public/app/features/plugins/extensions/errorHandling.test.ts Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com> * added missing tests. --------- Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com> Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>	2 years ago
Piotr Jamróz	a7238ba933	Explore: Support mixed data sources for supplementary query (#63036) ... * Consolidate logs volume logic (full range and limited) * Fix showing limited histogram message * Test passing meta data to logs volume provider * Improve readability * Clean up types * Add basic support for multiple log volumes * Move the comment back to the right place * Improve readability * Clean up the logic to support Logs Samples * Update docs * Sort log volumes * Provide title to logs volume panel * Move logs volume cache to the provider factory * Add helper functions * Reuse only if queries are the same * Fix alphabetical sorting * Move caching out of the provider * Support errors and loading state * Remove unused code * Consolidate supplementary query utils * Add tests for supplementaryQueries * Update tests * Simplify logs volume extra info * Update tests * Remove comment * Update tests * Fix hiding the histogram for hidden queries * Simplify loading message * Update tests * Wait for full fallback histogram to load before showing it * Fix a typo * Add feedback comments * Move feedback comments to github * Do not filter out hidden queries as they may be used as references in other queries * Group log volume by refId * Support showing fallback histograms per query to avoid duplicates * Improve type-checking * Fix supplementaryQueries.test.ts * Fix logsModel.test.ts * Fix loading fallback results * Fix unit tests * WIP * Update deprecated styles * Simplify test * Simplify rendering zoom info * Update deprecated styles * Simplify getLogsVolumeDataSourceInfo * Simplify isLogsVolumeLimited() * Simplify rendering zoom info	2 years ago
Gilles De Mey	282d021c53	Revert "Alerting: Fix alert form broken coming from panel (#64148)" (#64240)	2 years ago
Sonia Aguilar	a669b72641	Alerting: Fix alert form broken coming from panel (#64148) ... Fix alert form broken coming from panel	2 years ago
Jack Westbrook	8c8f584b41	Plugins: Extend panel menu with links from plugins (#63089) ... * feat(plugins): introduce dashboard panel menu placement for adding menu items * test: add test for getPanelMenu() * added an unique identifier for each extension. * added context to getPluginExtensions. * wip * Wip * wiwip * Wip * feat: WWWIIIIPPPP 🧨 * Wip * Renamed some of the types to align a bit better. * added limit to how many extensions a plugin can register per placement. * decreased number of items to 2 * will trim the lenght of titles to max 25 chars. * wrapping configure function with error handling. * added error handling for all scenarios. * moved extension menu items to the bottom of the more sub menu. * added tests for configuring the title. * minor refactorings. * changed so you need to specify the full path in package.json. * wip * removed unused type. * big refactor to make things simpler and to centralize all configure error/validation handling. * added missing import. * fixed failing tests. * fixed tests. * revert(extensions): remove static extensions config in favour of registering via AppPlugin APIs * removed the compose that didn't work for some reason. * added tests just to verify that validation and error handling is tied together in configuration function. * adding some more values to the context. * draft validation. * added missing tests for getPanelMenu. * added more tests. * refactor(extensions): move logic for validating extension link config to function * Fixed ts errors. * Update packages/grafana-data/src/types/app.ts Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com> * Update packages/grafana-runtime/src/services/pluginExtensions/extensions.test.ts Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com> * refactor(extensions): rename limiter -> pluginPlacementCount * refactor(getpanelmenu): remove redundant continue statement --------- Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com> Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>	2 years ago
Gilles De Mey	5412f8d414	Alerting: New notification policies view (#61952)	2 years ago
Ryan McKinley	fcffedbbf9	Search: Include panel_type in query (#63229)	2 years ago
Victor Marin	e1bc3fad83	Heatmap: Migrate to CUE (#62173) ... * IP migrate heatmap to cue * WIP * refactor * change usages and refactor panelcfg * CR modifications and docs * refactor, enable heatmap cue generation, overwrite enum values in types.ts * small refactor * refactor types.ts * cr modifications * docs	2 years ago
Eric Leijonmarck	9d6ab92e39	Service accounts: Remove Add API keys buttons and remove one state of migrating for API keys tab (#63411) ... * add: hide apikeys tab on start * make use of store method * added hiding of apikeys tab for new org creation * missing err check * removed unused files * implemennted fake to make tests run * move check for globalHideApikeys from org to admin * refactor to remove the fake * removed unused method calls for interface * Update pkg/services/serviceaccounts/manager/service.go Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> * Update pkg/services/serviceaccounts/manager/service.go Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> * remove the checkglobal method * removed duplicate global set const * add count of apikeys for performance * remove apikeys adding in UI * added back deleted file * added comment on component * changed wording and copy for hiding and migrating service accounts * refactor: remove migrationstatus in front/backend This removes the migrationstatus state from the UI in favor of only looking at the number of API keys to determine what to show to the user. This simplifies the logic and makes less calls to the backend with each page load. This was called both on the API keys page and the Service accounts page. - removes the state of migrationstatus from the UI - removes the backend call - removes the backend endpoint for migrationstatus * Update pkg/services/apikey/apikeyimpl/xorm_store.go Co-authored-by: Karl Persson <kalle.persson@grafana.com> * changes the contet to also be primary * change id of version for footer component --------- Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> Co-authored-by: Karl Persson <kalle.persson@grafana.com>	2 years ago
Brendan O'Handley	2372b7c626	Prometheus: Improve prometheus query variable editor (#63529) ... * add prom query var editor with tests and migrations * fix migration, now query not expr * fix label_values migration * remove comments * fix label_values() variables order * update UI and use more clear language * fix tests * use null coalescing operators * allow users to query label values with label and metric if they have not set there flavor and version * use enums instead of numbers for readability * fix label&metrics switch * update type in qv editor * reuse datasource function to get all label names, getLabelNames(), prev named getTagKeys() * use getLabelNames in the query var editor * make label_values() variables label and metric more readable in the migration * fix tooltip for label_values to remove API reference * clean up tooltips and allow newlines in query_result function * change function wording and exprType to query type/qryType for readability * update prometheus query variable docs * Update public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com> * handle jsonnet grafana as code variables --------- Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>	2 years ago
Josh Hunt	0c36b247af	Chore: Refactor Search/Folder view types into DashboardViewItem (#63162) ... * Chore: Refactor Search/Folder view types into DashboardViewItem * uid is not optional in api * rename queryResultToNestedFolderItem function * Fix error from locationInfo being empty * change queryResultToViewItem to take view instead * Fix sortMeta fields not showing on search cards * Show correct parent for panel search results	2 years ago
Josh Hunt	54aaaf169f	Internationalization: Mark up more of Dashboard Variables and Browse/Search Dashboards (#63518) ... * Extract dirty translations from main * Translate some variable phrases * Translate nav bar * Translate search/browse * Fix header returning null * Translate search results type * fix test	2 years ago
Ashley Harrison	4a2695349d	Chore: more ts test fixes (#63438) ... * replace anys in tests * more test fixes * clean up any's in tests	2 years ago
Kristina	06dfe2156f	Explore: Add transformations to correlation data links (#61799) ... * bring in source from database * bring in transformations from database * add regex transformations to scopevar * Consolidate types, add better example, cleanup * Add var only if match * Change ScopedVar to not require text, do not leak transformation-made variables between links * Add mappings and start implementing logfmt * Add mappings and start implementing logfmt * Remove mappings, turn off global regex * Add example yaml and omit transformations if empty * Fix the yaml * Add logfmt transformation * Cleanup transformations and yaml * add transformation field to FE types and use it, safeStringify logfmt values * Add tests, only safe stringify if non-string, fix bug with safe stringify where it would return empty string with false value * Add test for transformation field * Do not add null transformations object * Break out transformation logic, add tests to backend code * Fix lint errors I understand 😅 * Fix the backend lint error * Remove unnecessary code and mark new Transformations object as internal * Add support for named capture groups * Remove type assertion * Remove variable name from transformation * Add test for overriding regexes * Add back variable name field, but change to mapValue * fix go api test * Change transformation types to enum, add better provisioning checks for bad type name and format * Check for expression with regex transformations	2 years ago
Ashley Harrison	f8d89eff56	Chore: fix type errors in tests (#63270) ... * fix any's in tests * fix more any's in tests * more test type fixes * fixing any's in tests part 3 * more test type fixes * fixing test any's p5 * some tidy up * fix template_srv	2 years ago
Brendan O'Handley	879f980084	Revert "Prometheus Datasource: Improve Prom query variable editor" (#63278) ... Revert "Prometheus Datasource: Improve Prom query variable editor (#58292)" This reverts commit eedcd7d5b1.	2 years ago
Sven Grossmann	00edc1c6b1	Loki Context UI: Do not disable last label (#62866) ... * improved text * prevent all labels removed * use `structuredClone` instead of lodash * update test * get `structuredClone` in test? * fix using structuredClone	2 years ago
Brendan O'Handley	eedcd7d5b1	Prometheus Datasource: Improve Prom query variable editor (#58292) ... * add prom query var editor with tests and migrations * fix migration, now query not expr * fix label_values migration * remove comments * fix label_values() variables order * update UI and use more clear language * fix tests * use null coalescing operators * allow users to query label values with label and metric if they have not set there flavor and version * use enums instead of numbers for readability * fix label&metrics switch * update type in qv editor * reuse datasource function to get all label names, getLabelNames(), prev named getTagKeys() * use getLabelNames in the query var editor * make label_values() variables label and metric more readable in the migration * fix tooltip for label_values to remove API reference * clean up tooltips and allow newlines in query_result function * change function wording and exprType to query type/qryType for readability * update prometheus query variable docs * Update public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com> --------- Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>	2 years ago
Matias Chomicki	94241f6676	Loki Query Splitting: Split queries into sub-queries with smaller time interval (#62767) ... * Range splitting: range splitting function * Range splitting: experiment with 1 hour splits * Range splitting: reorganize code * Range splitting: improve code readability and meaning * Range splitting: add partition limit to prevent infinite loops * Range splitting: add error handling * Range splitting: disable for logs queries * Range splitting: support any arbitrary time splitting + respect original from/to in the partition * Chore: remove console logs * Chore: delete unused import * Range splitting: actually send requests in sequence * Range splitting: do not split when > 1 query * Range splitting: combine frames * Chore: rename function * split in reverse * polished reversing * keep reference to the right frame in the result * Range splitting: change request state to Streaming * Range splitting: fix moving only 1 unit of time instead of the provided one * Chore: change default parameter to timeShift = 1 * Range splitting: do not split for range queqries * Range splitting: add initial support for log queries * Range splitting: do not use MutableDataFrame It has bad performance and it's not required * Chore: remove unused export * Query Splitting: move to module * loki: split: fix off-by-one error (#62966) loki: split: fix off-by-one loop * Range splitting: disable for logs volume queries * Range splitting: combine any number of fields, not just hardcoded 2 * Range splitting: optimize frame-combining function * Range splitting: further optimize * Range splitting: combine frame length * Range splitting: combine stats * Range splitting: combine stats without assuming the same order * Query splitting: catch and raise errors * Range splitting: create feature flag * Range splitting: implement feature flag * Range splitting: add unit test for datasource query * Range splitting: add basic test for runPartitionedQuery * Range splitting: add unit test for resultLimitReached * Range splitting: test frame merging * Chore: fix unit test --------- Co-authored-by: Sven Grossmann <svennergr@gmail.com> Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>	2 years ago
Ashley Harrison	2a34293689	Chore: more type fixes (#62952) ... * fix some more any/type assertions * more any/type assertion fixes * implement review comments	2 years ago
Josh Hunt	09637caade	Chore: Remove search_srv (#62964) ... * Chore: Remove Search Service * use getSortOptions from grafana searcher * wip * fix library panels search tests	2 years ago
Ryan McKinley	5343255de8	Chore: Timeseries cleanup avoid React.FC (#62984) ... timeseries FC	2 years ago
Matias Chomicki	57369915f5	Loki Query Editor: Make Monaco the default editor (#62247) ... * feat(loki-editor): remove slate and make Monaco the default editor * feat(loki-editor): remove unsupported usages of onBlur * feat(loki-editor): remove monaco feature flag * Chore: remove unused import	2 years ago
Andreas Christou	d7f7cd1e61	Schema: Initial Azure Monitor query schema (#62018) ... * Initial schema - Add types based off of current frontend * Rename and field-level comments * Update report and regenerate files * Rename frontend Azure folder - Doing this for consistency and to ensure code-generation works - Update betterer results due to file renames * Remove default and add back enum vals that I deleted * Set workspace prop as optional * Replace template variable types * Connect frontend query types - Keep properties optional for now to avoid major changes - Rename AzureMetricResource - Correctly use ResultFormat * Add TSVeneer decorator * Update schema * Update type * Update CODEOWNERS * Fix gen-cue issue * Fix backend test * Fix e2e test * Update code coverage * Remove references to old Azure Monitor path * Review * Regen files	2 years ago
Jev Forsberg	2e98f5063b	Table: Add row number column option (#62256) ... * baldm0mma/addRowNumbers/ add showRowNums to panel cue * baldm0mma/addRowNumbers/ add panel option for sowing row numbers * baldm0mma/addRowNumbers/ update typing for showRowNums * baldm0mma/addRowNumbers/ add buildFieldsForOptionalRowNums * baldm0mma/addRowNumbers/ update addOptionalNumbersRowToTable * baldm0mma/addRowNumbers/ adjust display method to return numeric and text values * baldm0mma/ chaneg prop name to match * baldm0mma/addRowNumbers/ update boolean swicth path * baldm0mma/addRowNumbers/ move function * baldm0mma/addRowNumbers/ add getToggleHiddenProps * baldm0mma/addRowNumbers/ remove addNumbersRowToTable second arg * baldm0mma/addRowNumbers/ add updateInitialState * baldm0mma/addRowNumbers/ update getInitialState reducer with initialShowRowNumbers arg * baldm0mma/addRowNumbers/ add useEffect for RowNumberColumn toggling * baldm0mma/addRowNums/ bootleg fix * baldm0mma/addRowNumbers/ export OPTIONAL_ROW_NUMBER_COLUMN_WIDTH * baldm0mma/addRowNumbers/ add annos for readability * baldm0mma/addRowNumbers/ remove superfluous annos * baldm0mma/addRowNumbers/ add a few logs * baldm0mma/addRowNumbers/ update annos * baldm0mma/addRowNumbers/ update which footer row displays reducer type * baldm0mma/addRowNumbers/ abstract away defaultRowNumberColumnFieldData * baldm0mma/addRowNumbers/ update annos in utils.tsx * baldm0mma/addRowNumbers/ update annos for defaultRowNumberColumnFieldData * baldm0mma/addRowNumbers/ mark unused args with underscore * baldm0mma/addRowNumbers/ add annos to addRowNumbersFieldToData * baldm0mma/addRowNumbers/ update utils file type * baldm0mma/addRowNumbers/ remove console.logs * baldm0mma/addRowNumbers/ update file type * baldm0mma/addRowNumbers/ update annos in utils * baldm0mma/addRowNumbers/ remove superfluous footerGroups object * baldm0mma/addRowNumbers/ add annos for tests * baldm0mma/addRowNumbers/ add annos for self * baldm0mma/addRowNumbers/ add tests to table.test.tsx * baldm0mma/addRowNumbers/ update tests in utils.test * baldm0mma/addRowNumbers/ update annos and tests * baldm0mma/addRowNumbers/ remove console.logs * baldm0mma/addRowNumbers/ update utils file ext * baldm0mma/addRowNumbers/ update anno in table.tsx * baldm0mma/addRowNumbers/ update annos in table.tsx * baldm0mma/addRowNumbers/ rem error annos * baldm0mma/addRowNumbers/ revert footerCell * baldm0mma/addRowNumbers/ revert tests * baldm0mma/addRowNumbers/ skip tests * baldm0mma/addRowNumbers/ revert table isCountRowSet * baldm0mma/addRowNumbers/ remove cloneDeep * baldm0mma/addRowNumbers/ update filterFields * baldm0mma/addRowNumbers/ skip tests * Refactor count rows * baldm0mma/addRowNumbers/ rem test skips * baldm0mma/addRowNumbers/ update with annos * baldm0mma/addRowNumbers/ skip timeing out test * baldm0mma/addRowNumbers/ static row numbering and test updates * baldm0mma/addRowNumbers/ remove dupe --------- Co-authored-by: Victor Marin <victor.marin@grafana.com>	2 years ago
Ashley Harrison	b6aedaa57d	Chore: improve some types (#62363) ... * improve some types * more tidy up * better error message handling + update tests * undo store changes	2 years ago
Ryan McKinley	4186871390	Transforms: Fix schema definition (#62619)	2 years ago
Ashley Harrison	fd2641a542	Navigation: Sign in button now works correctly when served under a sub path (#62504) ... make sure getUrlForPartial always includes the basePath + unit tests	2 years ago
Ryan McKinley	0d2a786816	Schema: Add schema for library panels (#62169)	2 years ago
Andre Pereira	afd39c18ba	Explore: Refactor trace view and move to core (#61938) ... * Move TraceView to core grafana * Remove unused code * yarn install * Remove jaeger-ui-components from CODEOWNERS and other tools * Type fixes * yarn install * Remove mock that we no longer need * Fix merge conflicts * Re-add Apache license for trace view components * Use an exclamation-circle instead of triangle to denote errors * Remove eslint disables and update betterer results instead	2 years ago