grafana

Commit Graph

Author	SHA1	Message	Date
Kristina	5305316f5a	Explore: Move Query History to be screen wide (#84321 ) * WIP * Use splitpanewrapper for drawer * Get rich history pulling from multiple datasources * highlight pane * Fix datasource data handling * create ds/explore map, move around ds lookup * Handle no filters * Fix tests and some errors * Fix context menu issue * (Poorly) enable scrolling, fix onClose to function * Remove highlighting, use legacy key, fix casing * fix filtering to handle non-simple data * Fix linter, add translations * Fixing tests~~ * Move to explore drawer and fix some more tests * Kinda fix drawer stuff? * Fix remaining card tests * Fix test * Fix tests * Partially fix starred tab tests * Fix integration tests * Fix remaining tests 🤞 * Add a test and a clarifying comment behind a couple hooks * Remove unused code * Fix button styling and fix animation (but break width) * Make Drawer using parent width (100%) * Fix tests and some small catches * Add tests for selectExploreDSMaps selector --------- Co-authored-by: Piotr Jamroz <pm.jamroz@gmail.com>	1 year ago
Torkel Ödegaard	862305d5ce	DashboardScene: Only update/replace location for normal dashboard route (#84747 )	1 year ago
William Wernert	10dc6c6d75	Alerting: Add "Keep Last State" backend functionality (#83940 ) * Implement keep last state for state transitions * Respect For duration when keeping state * Only keep transition from recording an annotation * Add keep last state option for nodata/error in UI	1 year ago
Joey	92f53d3670	Tracing: Add node graph panel suggestion (#83311 ) * Add node graph panel suggestion * Update logic * Add comment * Check for correct fields * Simplify logic * Also check for viz type * Remove extra logic on boolean	1 year ago
Josh Hunt	030b83d8f2	NestedFolderPicker: Seperate state from Browse Dashboards (#82672 ) * initial very very early stab at isolated state for nested folder picker * more * complete state rework. still need to do search * tidy up some comments * split api hook into seperate file, start to try and get search results back (its not working) * Fix loading status * Reset files * cleanup * fix tests * return object * restore hiding items * restore * restore * remove those comments * rename hooks * rename hooks * simplify selectors - thanks ash!!! * more ci please?	1 year ago
Joey	2258e6bd16	Traces: Add traces panel suggestion (#83089 ) * Add traces panel suggestion * Render suggestion * Update styling * Update styling	1 year ago
Gilles De Mey	791ead7806	Alerting: Detail view part 3 (#81286 )	1 year ago
Sonia Aguilar	f59e76d54b	Alerting: Use mute_time_intervals as field name in dto ,for simplified routing (#82045 ) Use mute_time_intervals as field name in dto ,for simplified routing	1 year ago
Ashley Harrison	e2c2704296	Browse Dashboards: Imported dashboards now display immediately in the dashboard list (#81819 ) * create importDashboard method in rtk query * fix unit tests * Revert "fix unit tests" This reverts commit `72cd81c803`. * fix unit test	1 year ago
Ryan McKinley	ed925c81d4	Chore: deprecate/remove folderId from more typescript (#81194 )	1 year ago
Torkel Ödegaard	3b2352f066	DashboardScene: Initial work to support "new" dashboard route and creation logic (#81549 ) * DashboardScene: Initial work to get new route to work * Update * remove caching of new dashboard * remove old new dashboard func * Update * Update public/app/features/dashboard-scene/scene/DashboardScene.tsx Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com> * Fixing test * dam messy tests --------- Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>	1 year ago
Torkel Ödegaard	e08700c1b5	Dashboard: New EmbeddedDashboard runtime component (#78916 ) * Embedding dashboards exploratino * Update * Update * Added e2e test * Update * initial state, and onStateChange, only explore panel menu action and other fixes and tests * fix e2e spec * Fix url * fixing test	1 year ago
Haris Rozajac	f285eb6717	Time Range: Copy-paste Time Range (#80107 ) * Working copy-paste functionality with validation * WIP; uses 't c' shortcut to copy time range * shortcuts working for explore and dashboards * cleanup * Don't update url when pasting in explore * Error handling, sync pane functionality, add to help modal * cleanup * add tests * fix i18n * Diferrentiate between explore and dashboard paste events; make on error prop generic * Fix * extract getting the copied time range logic into a function * Remove comments * Make error handling generic; markup for translations * Additional translation markup * markup for aria-label * Fix test * Replace fireEvent with userEvent * fix translations to match the standard pattern * Refactor keybindingSrv and TimeSrv to remove PasteTimeContext * Fix test * Remove unneccessary aria labels; update icons; buttons inline	1 year ago
Sofia Papagiannaki	d1dab5828d	Alerting: Update rule API to address folders by UID (#74600 ) * Change ruler API to expect the folder UID as namespace * Update example requests * Fix tests * Update swagger * Modify FIle field in /api/prometheus/grafana/api/v1/rules * Fix ruler export * Modify folder in responses to be formatted as <parent UID>/<title> * Add alerting test with nested folders * Apply suggestion from code review * Alerting: use folder UID instead of title in rule API (#77166) Co-authored-by: Sonia Aguilar <soniaaguilarpeiron@gmail.com> * Drop a few more latent uses of namespace_id * move getNamespaceKey to models package * switch GetAlertRulesForScheduling to use folder table * update GetAlertRulesForScheduling to return folder titles in format `parent_uid/title`. * fi tests * add tests for GetAlertRulesForScheduling when parent uid * fix integration tests after merge * fix test after merge * change format of the namespace to JSON array this is needed for forward compatibility, when we migrate to full paths * update EF code to decode nested folder --------- Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com> Co-authored-by: Virginia Cepeda <virginia.cepeda@grafana.com> Co-authored-by: Sonia Aguilar <soniaaguilarpeiron@gmail.com> Co-authored-by: Alex Weaver <weaver.alex.d@gmail.com> Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>	1 year ago
Timur Olzhabayev	c02d57c6a9	Chore: removing folderId from plugindashboard service (#80570 ) * removing folderId from plugindashboard service * fixing linting	1 year ago
Eric Leijonmarck	3979ea0c47	Anonymous Access: Pagination for devices (#80028 ) * first commit * add: pagination to anondevices * fmt * swagger and tests * swagger * testing out test * fixing tests * made it possible to query for from and to time * refactor: change to query for ip adress instead * fix: tests	1 year ago
Sonia Aguilar	6f8ddac4eb	Alerting: Simplified routing part3 (#79941 ) * Update alert rule model in FE following BE design doc * Remove unnecessary conditional rendering * Update styles for optional route settings: add indentation * Update test * Add validation for grouBy to include grafana_folder and alertname * Split conversions between FEdataModel/ DTO, in separate functions * Update texts following Brenda's suggestions * Update text	1 year ago
Sonia Aguilar	f6f259f0b5	Alerting: Simplified routing part2 (#78671 ) * wip * WIP: Added some actions, timings and grouping * WIP: remove reducer and use form fields instead * Show defaults when using override in route settings * Update alert rule model for simplified routing * Use defaults in placeholders when overriding timings * Add validation for contact point * Add selected contact point details * Refactor: extract components to separate files and reorg in subfolders * Fix test * Update revalidate mode in form * Extract RuleEditorSectionBody outside NotificationStep component to avoid unmounting any time this one renders * Remove reValidateMode option in form * Fix after merging * Address PR review comments part1 * Address PR review comments part2 * Create routeTimingsFields constant to reuse labels, descriptions and arial labels for the mute timing fields * Move conditional rendering to the parent in AutomaticRooting and ManualAndAutomaticRouting * Simplify AlertManagerManualRouting properties	1 year ago
Alexander Weaver	cf8e8852c3	Alerting: Drop NamespaceID from responses on unstable ngalert API endpoints in favor of NamespaceUID (#79359 ) * Drop from API response * Drop from swagger docs * Drop from integration tests * regenerate public swagger docs * Drop from frontend * Drop asserts for namespaceID field	1 year ago
Eric Leijonmarck	59bdff0280	Auth: Add anonymous users view and stats (#78685 ) * Add anonymous stats and user table - anonymous users users page - add feature toggle `anonymousAccess` - remove check for enterprise for `Device-Id` header in request - add anonusers/device count to stats * promise all, review comments * make use of promise all settled * refactoring: devices instead of users * review comments, moved countdevices to httpserver * fakeAnonService for tests and generate openapi spec * do not commit openapi3 and api-merged * add openapi * Apply suggestions from code review Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * formatin * precise anon devices to avoid confusion --------- Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> Co-authored-by: jguer <me@jguer.space>	2 years ago
linoman	408dab8c57	IAM: Protect managed service account frontend details page (#77839 ) * Add `isManaged` property to frontend model * Remove enabled and token buttons for managed SA * Replace trash icon for lock icon for managed SA * Block the role picker for managed SA * Filter SA list usiong the managed filter * Rename external for managed * Add only managed filter * Toggle the enable buttons for managed sa * Disable add token and delete token buttons * Remove the edit name button * Disable the Role picker for managed sa * Hide the permissions section * Add managed by row --------- Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>	2 years ago
Josh Hunt	4a3c148298	Chore: Stricter typing in type guards (#77809 ) * Stricter typing in type guards * create utility isObject fn * better isAlertStateWithReason * better name * restore "data !== undefined"	2 years ago
linoman	5bc4f56c79	IAM: Protect external service accounts frontend list page (#77834 ) * Add `isExternal` property to frontend model * Remove enabled and token buttons for external SA * Replace trash icon for lock icon for external SA * Block the role picker for external SA * Filter SA list using the external filter * Add only external filter at backend --------- Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	2 years ago
Ashley Harrison	d1e52d4788	Chore: type fixes (#77618 ) * type fixes * couple more * just a couple more * small fixes to prometheus typings * improve some more datasource types	2 years ago
Kristina	9e0ca0d113	Correlations: Add transformations to Explore Editor (#75930 ) * Add transformation add modal and use it * Hook up saving * Add transformation vars to var list, show added transformations * Form validation * Remove type assertion, start building out transformation data in helper (WIP) * Style expression better, add delete logic * Add ability to edit, additional styling on transformation card in helper * simplify styling, conditionally run edit set up logic * Keep more field information in function, integrate it with new editor * Show default label on collapsed section, use deleteButton for confirmation of deleting transformations * Change transformation add calculations from function to hook, add label to collapsed header, add transformation tooltip * Make correlation and editor dirty state distinctive and integrate, WIP * Track action pane for more detailed messaging/actions * Better cancel modal logic * Remove changes to adminsitration transformation editor * Remove debugging line * Remove unneeded comment * Add in logic for closing editor mode * Add tests for modal logic * Use state to build vars list for helper * WIP * Fix labels and dirty state * Fix bad message and stop exiting mode if discard action is performed * Fix tests * Update to not use unstable component and tweak default label	2 years ago
Alexander Zobnin	cf7a2ea733	RolePicker: Optimise rendering inside lists of items (#77297 ) * Role picker: Load users roles in batch * Use orgId in request * Add roles to OrgUser type * Improve loading logic * Improve loading indicator * Fix org page * Update service accounts page * Use bulk roles query for teams * Use POST requests for search * Use post request for teams * Update betterer results * Review suggestions * AdminEditOrgPage: move API calls to separate file	2 years ago
Ieva	ed88289984	Chore: remove legacy dashboard and folder permission pages (#77143 ) remove legacy dashboard and folder permission pages	2 years ago
Alexander Weaver	0592fe7edb	Alerting: Add support for msteams contact point in external Alertmanagers (#76392 ) * Add support for msteams contact point in external AMs * Update docs	2 years ago
Ieva	5e14d93530	Chore: remove hasAccess and hasAcessInMetadata (#76237 ) * remove hasAccess and hasAcessInMetadata in favour of hasPermission and hasPermissionInMetadata * test fixes * more test fixes	2 years ago
Jo	4474f19836	Service Accounts: Enable adding folder, dashboard and data source permissions to service accounts (#76133 ) * Add SAs to Datasource permissions Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * add SAs to dashboards/folders managed permissions * Update public/app/core/components/AccessControl/Permissions.tsx Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> * regenerate i18n * add doc --------- Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>	2 years ago
Torkel Ödegaard	5bba89fc86	Scenes: Backward compatability with new template variable system for functions that don't pass scopedVars (#75937 ) * Use __grafanaScene in templateSrv * Update * fix	2 years ago
Kristina	4b3d63dcdc	Correlations: Add an editor in Explore (#73315 ) * Start adding correlations editor mode * Add selector for merge conflict resolution * Enable saving * Build out new corelation helper component * flesh out save with label/description, change color * Have breadcrumb exit correlation editor mode * Add extension property to show/hide, use it for correlations * Bring in feature toggle * Remove unnecessary param * Cleanup * Parse logs json * Work on correlation edit mode bar * Tinker with a top element for the editor mode * Handle various explore state changes with correlations editor mode * WIP - add unsaved changes modal * Have correlation bar always rendered, sometimes hidden * Add various prompt modals * Clear correlations data on mode bar unmount, only use not left pane changes to count as dirty * Move special logic to explore * Remove all shouldShow logic from plugin extensions * remove grafana data changes * WIP - clean up correlations state * Interpolate data before sending to onclick * Override outline button coloring to account for dark background * More cleanup, more color tweaking * Prettier formatting, change state to refer to editor * Fix tests * More state change tweaks * ensure correlation save ability, change correlation editor state vars * fix import * Remove independent selector for editorMode, work close pane into editor exit flow * Add change datasource post action * Clean up based on PR feedback, handle closing left panel with helper better * Remove breadcrumb additions, add section and better ID to cmd palette action * Interpolate query results if it is ran with a helper with vars * Pass the datasource query along with the correlate link to ensure the datasource unique ID requirement passes * Use different onmount function to capture state of panes at time of close instead of time of mount * Fix node graph’s datalink not working * Actually commit the fix to saving * Fix saving correlations with mixed datasource to use the first query correlation UID * Add tracking * Use query datasources in mixed scenario, move exit tracking to click handler * Add correlations to a place where both can be used in the correlations editor * Be more selective on when we await the datasource get * Fix CSS to use objects * Update betterer * Add test around new decorator functionality * Add tests for decorate with correlations * Some reorganization and a few tweaks based on feedback * Move dirty state change to state function and out of component * Change the verbiage around a little * Various suggestions from Gio Co-authored-by: Giordano Ricci <me@giordanoricci.com> * More small Gio-related tweaks * Tie helper data to datasource - clear it out when the datasource changes * Missed another Gio tweak * Fix linter error * Only clear helper data on left pane changes * Add height offset for correlation editor bar so it doesn’t scroll off page --------- Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com> Co-authored-by: Giordano Ricci <me@giordanoricci.com>	2 years ago
Dominik Prokop	fccd262417	TimeSrv: Add Scenes compatibility patch (#75728 ) * TimeSrv: Add scenes compatibility patch * Get that lint out of my way	2 years ago
Alex Khomenko	4a692fc82e	Admin: Use backend sort (#75228 ) * Admin: Use InteractiveTable * Admin: Fix pagination * Admin: Use CellWrapper * Admin: Split components * Admin: Separate OrgUsersTable * Admin: Remove UsersTable * Admin: Use the new table for TeamList * Admin: Cleanup TeamList page * Admin: Add edit team action * Admin: Use explicit edit action instead of a link wrapper * Admin: Fix responsive styles * Cleanup * Remove redundant sort * Add item key * Fix icon styles * Set loading by default * Use separate pagination component * Use default sorting functionality * Fix merge conflicts * Update betterer * Add controlled sort * Revert pagination changes * Move pagination inside OrgUsersTable.tsx * Add missing prop * Sort users table * Fix tests * Remove loader * Add sort to Teams * Cleanup * Update loadTeams action * Remove sort condition	2 years ago
Alex Khomenko	87ced17060	Admin: Use InteractiveTable for user and team tables (#74821 ) * Admin: Use InteractiveTable * Admin: Fix pagination * Admin: Use CellWrapper * Admin: Split components * Admin: Separate OrgUsersTable * Admin: Remove UsersTable * Admin: Use the new table for TeamList * Admin: Cleanup TeamList page * Admin: Add edit team action * Admin: Use explicit edit action instead of a link wrapper * Admin: Fix responsive styles * Cleanup * Remove redundant sort * Add item key * Fix icon styles * Set loading by default * Use separate pagination component * Use default sorting functionality * Fix merge conflicts * Update betterer * Move pagination inside OrgUsersTable.tsx * Disable sort if results have more than 1 page * Update betterer results * Use CSS objects * More style fixes * Update betterer	2 years ago
William Wernert	925f12d0ea	Alerting: Add support for `keep_firing_for` field from external rulers (#75163 ) * Add support for `keep_firing_for` in ruler proxy * Don't delete `keep_firing_for` when editing a rule with the field set Co-Authored-By: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com> --------- Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>	2 years ago
Ashley Harrison	ebe13a53f7	Browse Dashboards: Split new browse UI from nested folders backend (#74435 ) * create new feature toggle + start to put stuff behind it * block move, tidy up interfaces * fix new/folder actions buttons * show warning when deleting library panels/alert rules + run i18n:extract * pseudo * update unit tests * pass alert in description	2 years ago
Konrad Lalik	7baf9cc033	Alerting: Custom contact point for OnCall in Grafana AM (#72021 )	2 years ago
Jack Westbrook	62821c69b3	Plugins: Bump SystemJS to 6.14.2 (#70068 ) * chore(plugins): bump systemjs to latest version * refactor(plugins): switch runtime over to use latest systemjs, add typings * refactor(plugins): use latest systemjs APIs for runtime dependency resolution * refactor(plugins): return valid urls from backend for latest systemjs import to work * revert(plugins): remove cfg from assetpath in favour of relative paths * fix(plugins): useDefault for systemjs deps to solve undefined errors * feat(plugins): add basic support for loading plugins via CDN * fix(plugins): load nested plugins with latest systemjs * feat(plugins): add back ability to transform plugin src for cdns * feat(plugins): get caching for module.js working, clean up * refactor(plugin_loader): create buildImportMap fn and more clean up * refactor(angularapp): use buildImportMap for dependencies and clean up * test(plugin_loader): fix failing test due to systemjs update * test(jest): mock systemjs amd extra in tests to prevent it breaking tests * chore(plugins): remove systemjs module-types extra, already included with system * fix(plugins): update key for invalidating cached plugins * fix: move systemjs amd define to another global so monaco can load * refactor(plugins): clean up cache buster and tests * chore(plugins): remove debug * refactor(plugins): move systemjs define to keep global cleaner * fix(plugins): set useDefault so system modules lodash references dont fail * feat(plugins): hook systemjs onload so stylesheets are applied to the dom * refactor(plugins): wrap amd formatted plugins in iife to prevent define collision * feat(plugins): support system module format for legacy plugins * test(plugincachebuster): update tests to match latest implementation * test(plugins-loader): fix up tests post module property change * fix test * Update pkg/plugins/manager/loader/assetpath/assetpath.go Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> * chore(plugin_loader): remove stray import from merge conflict * Revert "Update pkg/plugins/manager/loader/assetpath/assetpath.go" This reverts commit 0df57d1cf20f49c22c93369001c70aae46a97c42. * fix(plugin_loader): set use default for shared plugin dependencies * refactor(plugins): use leading slash for Module and BaseUrl * fix(plugins): fix resolve appending extension to cache query param * refactor(plugins): align baseurl and module paths * refactor(plugins): update builtInPlugins keys to match naming convention * refactor(plugins): minor loader clean up, fix up types * test(plugins): fix failing tests * refactor(plugins): rename cache buster systemjs plugin to cache * refactor(plugins): separate plugin_loader into smaller files * chore(plugins): clean up plugin_loader types * chore(plugin_sandbox): fix typescript error * chore(npm): remove unplug debug and pin systemjs to 6.14.1 * refactor(plugins-cdn): update loaders to use absolute module url from backend * fix(plugins): escape period in systemjs module regex * chore(plugins): delete redundant systemjs plugins * refactor(plugin_loader): move hooks into own file, add types * test(plugins): add tests for systemjs loader hooks * chore(plugins): rename systemjshooks file * chore(plugins): remove redundant systemjs cdn backend code * fix(plugins): handle loading with config.appSubUrl * chore(plugins): delete redundant plugin-cdn angular code * test(plugins): fix failing systemjs test missing pluginsCDNBaseUrl * refactor(plugins): backend provides base and module properties with AppSubUrl * fix(plugins): consider AppSubUrl for plugin logos * fix(plugins): use isHostedOnCDN util when checking for cdn hosted plugins * add new appSubURL field to config * refactor relative URL func * fix path for core app * refactor asset path input * fix(plugins): catch errors in loadPluginCss * feat(plugins-cdn): selectively transform sourceMapURL * re-add deleted test case * chore(plugins): bump to latest systemjs@6.14.2 * feat(plugins): add systemjs-cjs-extra for loading commonjs plugins --------- Co-authored-by: Will Browne <will.browne@grafana.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>	2 years ago
Torkel Ödegaard	3ee26df41e	PublicDashboards: Variables refactor (#73476 ) Co-authored-by: Juan Cabanas <juan.cabanas@grafana.com> Co-authored-by: Ezequiel Victorero <ezequiel.victorero@grafana.com> Co-authored-by: Ryan McKinley <ryantxu@gmail.com>	2 years ago
Konrad Lalik	7631b0cf3f	Alerting: Improve tests setup (#73316 )	2 years ago
Konrad Lalik	df3d10606d	Alerting: Optimize rule details page data fetching (#72977 )	2 years ago
Yuri Tseretyan	6b4a9d73d7	Alerting: Export contact points to check access control action instead legacy role (#71990 ) * introduce a new action "alert.provisioning.secrets:read" and role "fixed:alerting.provisioning.secrets:reader" * update alerting API authorization layer to let the user read provisioning with the new action * let new action use decrypt flag * add action and role to docs	2 years ago
Ieva	d3b481dac8	Auth: Lock down Grafana admin role updates if the role is externally synced (#72677 ) * lock down server admin role updates on the frontend if the user is externally synced * add tests * lock Grafana Server admin role updates from the backend * rename variables * check that the user has auth info * add LDAP to providers for which Grafana Server admin role can be synced * linting	2 years ago
Eric Leijonmarck	b4c4b512d7	SAML: Move type definitions to auth config to change ownership to authnz team (#72463 ) * refactor: move file for ownership * deleted the file	2 years ago
Piotr Jamróz	89618e0c0f	Explore: Do not update URL when time range changes to absolute (#72436 ) Allow passing updateURL flag to absolute time range event	2 years ago
Gabriel MABILLE	4c7b97cdb0	ClientTokenRotation: Don't rotate session cookie for authproxy (#72496 ) * ClientTokenRotation: Don't rotate session cookie for authproxy * Account for config option auth.proxy enable_login_token * Limit amount of changes on devenv * Fix tests by moving authenticatedBy up * Uncomment nginx conf	2 years ago
Eric Leijonmarck	649cd08a19	SAML: Remove mention of config found in inifile (#71837 ) * remove config found in inifile * remove the text from the provider card * remove description that contained the notion of inifile	2 years ago
Alexander Zobnin	a2442ef620	Auth: Don't show LDAP CTA card (#72121 )	2 years ago
renovate[bot]	1cacc78eda	Update dependency lru-cache to v10 (#71585 ) * Update dependency lru-cache to v10 * use named import * remove outdated type definitions and actually use named import --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>	2 years ago

1 2 3 4 5 ...

734 Commits (bc97d11220ad3efde9784034cf4f90156f0e82c6)