grafana

Commit Graph

Author	SHA1	Message	Date
Marcus Andersson	a6872deeb9	Plugins: automatically search plugins when typing in plugin list search box. (#36643 ) * will automagically search if typing something in the search field. * Decreasing the debounced time to 500ms	4 years ago
Jack Westbrook	e2c64ae228	Plugins: Prevent catalog from listing installed embedded plugins (#36675 )	4 years ago
Jack Westbrook	dcc6663801	Plugins: Don't show uninstall button for core plugins in catalog (#36671 ) * fix(catalog): don't show un/install buttons if core plugin * test(catalog): add PluginDetails test case for core plugins	4 years ago
Torkel Ödegaard	702fd1cad9	Visualizations: Dynamically set any config (min, max, unit, color, thresholds) from query results (#36548 ) * initial steps for config from data * Moving to core and separate transforms * Progress * Rows to fields are starting to work * Config from query transform working * UI progress * More scenarios working * Update public/app/core/components/TransformersUI/rowsToFields/rowsToFields.ts Co-authored-by: Ryan McKinley <ryantxu@gmail.com> * transform all * Refactor * UI starting to work * Add matcher UI to transform * Apply to self * Adding a reducer option * Value mapping via new all values reducer * value mappings workg add -A * Minor changes * Improving UI and adding test dashboards * RowsToFieldsTransformerEditor tests * Added tests for FieldToConfigMapping Editor * Added test for ConfigFromQueryTransformerEditor * Minor UI tweaks * Added missing test * Added label extraction * unified mapping * Progress refactoring * Updates * UI tweaks * Rename * Updates Co-authored-by: Ryan McKinley <ryantxu@gmail.com>	4 years ago
Marcus Andersson	d4e53a9be4	Plugins: adding possibility to install enterprise plugins if you have a valid license. (#36653 )	4 years ago
Torkel Ödegaard	863b412d54	Transformations: State feature (alpha/beta) and more (#36630 ) * Adding plugin state feature to transforms * initial help box * New HelpBox component * More progress * Testing * Removing HelpBox, simple new design, new active state for OperationRowAction * Updated tests * Fixed typing issue * Removed AlphaNotice * Made focus and enter key trigger OnClick and sorted transformations * Fixed e2e tests	4 years ago
Marcus Andersson	2fb385c192	Plugins: display enterprise plugins in the plugins catalog (#36599 ) * displaying enterprise plugins in the list. * added place holder for tests and removed unused code. * added test for the browse page. * added empty test file. * added some more tests.	4 years ago
Ryan McKinley	9ce6e2a664	Geomap: add initial openlayers alpha panel (#36188 )	4 years ago
Dominik Prokop	663a8935f7	User analytics: Add Rudderstack integration (#36567 ) * Replace analytics service with Echo backend * Add Rudderstack integration and general pageview and interaction Echo events * Update conf/defaults.ini Co-authored-by: Dan Cech <dcech@grafana.com> * Update packages/grafana-runtime/src/types/analytics.ts Co-authored-by: Dan Cech <dcech@grafana.com> * Update conf/defaults.ini Co-authored-by: Dan Cech <dcech@grafana.com> * Update tests * Force cla check Co-authored-by: Dan Cech <dcech@grafana.com>	4 years ago
Marcus Andersson	52bd1eb1c5	Plugins: converted the plugins admin app to a core feature in grafana (#36026 ) * moved the plugins admin to core and used the plugins toggle to decide which version to use. * reverted change. * changed so the library tab is the default one. * fixing navigation. # * fixed so we have the proper header. * including the core plugins * fixed so we display logos for local plugins. * fixed so we have a working version of plugin catalog. * removed console logs. * reverted changes. * fixing failed test.	4 years ago
Will Browne	8d51c2ae97	Plugins: Update plugin signing copy + docs (#34716 ) * update plugin signing copy + docs * rewording * remove grafana sig note * update unsigned plugin wording * remove org admin reference in catalog docs * add whitespace to message * apply pr suggestion Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> * apply pr feedback Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>	4 years ago
Jack Westbrook	8c93899b15	PluginsList Panel: Redirect to catalog app for updating plugins (#34893 ) * feat(pluginlistpanel): if catalog app is enabled redirect user if plugin is upgradable * refactor(catalog): update copy if plugin is disabled	4 years ago
Ryan McKinley	4972e0f6a1	Rename: Status grid to history (#34864 )	4 years ago
Ryan McKinley	a91edd7267	Plugin Admin App: make the catalog look like internal component (#34341 ) * Allow Route component usage in app plugins * i tried * fix catalog app * fix catalog app * fix catalog app * cleanup imports * plugin catalog enabled to plugin admin * rename plugin catalog to plugin admin * expose catalog url * update text * import from react-router-dom * fix imports -- add logging * merge changes * avoid onNavUpdate * Fixed onNavChange issues * fix library imports * more links Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com> Co-authored-by: Torkel Ödegaard <torkel@grafana.com>	4 years ago
Domas	f166b22b52	use existing queryparams prop in AppRootPage (#34464 )	4 years ago
Dominik Prokop	4cbffae1b4	AppPlugins: Expose react-router to apps (#33775 ) * Allow Route component usage in app plugins * i tried * fix catalog app * fix catalog app * remove catalog changes from this PR * remove extra files * feat(plugins): expose react-router to plugins rather than export via grafana-ui * Bring back query and pathname to AppRootPage and add deprecation notice Co-authored-by: Ryan McKinley <ryantxu@gmail.com> Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>	4 years ago
Ryan McKinley	de5cd4a7d3	Timeline: split "periodic" mode into its own panel (#34171 )	4 years ago
Jack Westbrook	abdceb18da	Plugins: introduce marketplace app (#33869 ) * add uninstall flow * add install flow * small cleanup * smaller-footprint solution * cleanup + make bp start auto * fix interface contract * improve naming * accept version arg * ensure use of shared logger * make installer a field * add plugin decommissioning * add basic error checking * fix api docs * making initialization idempotent * add mutex * fix comment * fix test * add test for decommission * improve existing test * add more test coverage * more tests * change test func to use read lock * refactoring + adding test asserts * improve purging old install flow * improve dupe checking * change log name * skip over dupe scanned * make test assertion more flexible * remove trailing line * fix pointer receiver name * update comment * add context to API * add config flag * add base http api test + fix update functionality * simplify existing check * clean up test * refactor tests based on feedback * add single quotes to errs * use gcmp in tests + fix logo issue * make plugin list testing more flexible * address feedback * fix API test * fix linter * undo preallocate * Update docs/sources/administration/configuration.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update docs/sources/administration/configuration.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update docs/sources/administration/configuration.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * fix linting issue in test * add docs placeholder * update install notes * Update docs/sources/plugins/marketplace.md Co-authored-by: Marcus Olsson <marcus.olsson@hey.com> * update access wording * add more placeholder docs * add link to more info * PR feedback - improved errors, refactor, lock fix * improve err details * propagate plugin version errors * don't autostart renderer * add H1 * fix imports * feat(bundled-plugins): introduce marketplace-app to the repo * chore(marketplace-app): remove backend * feat(marketplace): nav is only visible to admins * feat(marketplace): use gnet api * refactor(marketplace): move styles to theme2 move card concerns to card component * feat(marketplace): introduce loaders, clean up styles * refactor(marketplace): wip - debugging for api endpoints * feat(grafana-ui): introduce height prop to Layout components * refactor(marketplace): clean up org details component * fix(marketplace): display search results without active filters * refactor(marketplace): use grafana api for install/uninstall * refactor(marketplace): remove pluginDir * feat(marketplace): clean up Library page * fix(plugins): get panel plugins from meta for newly installed plugins * fix(marketplace): fix multiple renders of InstallControls when installing/uninstalling plugins * refactor(marketplace): componentise the loader * chore(marketplace): remove unsigned plugins option * refactor(marketplace): remove includeUnsigned from codebase * refactor(marketplace): prefer useStyles over useTheme * docs(marketplace): remove changelog and update readme * Apply suggestions from code review Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com> * refactor(marketplace): prefer module over class for api * refactor(marketplace): move updatePlugin to api * refactor(marketplace): add PluginMeta to api to please TS * feat(marketplace): always include pre-release in semver check * chore(marketplace): remove redundant arch install code. backend handles it now * feat(marketplace): add a link to browse page if library is empty * refactor(marketplace): replace status with isLoading boolean for hooks * refactor(marketplace): clean up async functions in InstallControls * fix(marketplace): setInstalled false on successful uninstall * include marketplace in bundled plugin test Co-authored-by: Will Browne <will.browne@grafana.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: Marcus Olsson <marcus.olsson@hey.com> Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>	4 years ago
Leon Sorokin	5fd7c34420	New Panel: Histogram (#33752 )	4 years ago
Jack Westbrook	7f63efb941	Routing: refresh plugin module when pluginId changes (#33579 ) * fix(approotpage): load plugin if pluginId changes so ui updates * fix(approotpage): prevent dashboard search breaking for plugins without navmodel	4 years ago
Torkel Ödegaard	7ee994f843	Theme: Renames new theme model from GrafanaThemeV2 to just GrafanaTheme (#33619 )	4 years ago
Jack Westbrook	8f62e42554	Plugins: add level and signature badges to plugin details page (#33553 ) * feat(grafana-ui): badge can accept react node for text, add shield-exclamation to icons * feat(plugins): add PluginSignatureType type * feat(pluginpage): introduce PluginSignatureDetailsBadge. Fix sidebar icon margin * feat(pluginlistpage): update filterinput placeholder, introduce filter by plugin type	4 years ago
Torkel Ödegaard	f6ecded86b	Theme: Page styles move to emotion global styles and design tweaks (#33529 ) * Theme: Page styles move to emotion global styles and design tweaks * More style tweaks * tweaks * Updating snapshots * Another fix * Another fix * minor fix * More style tweaks to page toolbar and alert rule page * minor polish	4 years ago
Marcus Andersson	9de2f1bb8f	Alerting: moving data source uid to query instead of model (#33416 ) * initial commit. * Some more improvements to the expression data source support. * added tests to verify that time range picker and data source picker only is visible when callbacks is passed to row. * fixing issue with filter in alerting list. * minor refactoring. * removed guarding code, should be fixed in backend. * cleaning the data query if we change to a different data source.	4 years ago
Hugo Häggmark	22ac0fc3cd	Chore: Migrates remaining Angular modals to React (#33476 ) * HelpModal: Migrates to new style * Alerting: Migrates how to do alerting modal to React * ApiKeysModal: migrates to new theme * Dashboard: View dasboard json modal migrated to React and new theme * PluginPage: migrates update plugin modal to react and new theme * Chore: deprecates events and functions * Simplify help modal * Updated json modal to use Modal.ButtonRow * Tweak to api key design * Tests: updates snapshot Co-authored-by: Torkel Ödegaard <torkel@grafana.com>	4 years ago
Alex Khomenko	6d95f2f1db	Chore: Update typescript to v4.2.4 (#33297 ) * Update typescript to v4.2.4 * Update @types/slate * Fix QueryVariableEditor.test.tsx * Fix search-related type errors * Fix Plugin pages type errors * Fix missing initializer errors * Update snapshot * Revert tsconfig changes	4 years ago
Uchechukwu Obasi	438b403acc	Migrates old Card sass file to GlobalStyles (#33183 ) * Card: migrates styles from sass to emotion * removed LayoutSelector component since it's not used in the codebase * updates card styles with new color name	4 years ago
kay delaney	bad048b7ba	Performance: Standardize lodash imports to use destructured members (#33040 ) * Performance: Standardize lodash imports to use destructured members Changes lodash imports of the form `import x from 'lodash/x'` to `import { x } from 'lodash'` to reduce bundle size. * Remove unnecessary _ import from Graph component * Enforce lodash import style * Fix remaining lodash imports	4 years ago
Torkel Ödegaard	c46f992bfb	Theme: More theme updates (#33076 ) * Theme: More theme updates * Updated so Switch design * increase limit	4 years ago
Nathan Rodman	345d9f93fe	Alerting: Filter rules list (#32818 )	4 years ago
Domas	282c62d8bf	Alerting: Rule edit form (#32877 )	4 years ago
Jack Westbrook	b0470c84a5	fix(datasource_srv): prevent infinite loop where default datasource is named default (#32949 )	4 years ago
Torkel Ödegaard	b0c6cad637	Theme: Updates Alert design and licence warning hook (#32930 ) * Theme: Updates Alert design and licence warning hook * Updated snapshot * Updated design * Updated	4 years ago
Dominik Prokop	b47fba4b68	v8: remove Singlestat panel and add automatic migration to stat/gauge(#31904 ) * Remove singlestat panel from the codebase * Automatically migrate deprecated panels * Migrate singlestat to stat when initializing panel * Singlestat -> gauge detection * Missing await * Throw error when panel plugin not found and allow new panels to take names of the deprecated ones * Make it pretty Co-authored-by: Ryan McKinley <ryantxu@gmail.com>	4 years ago
Hugo Häggmark	7d07599dc1	LibraryPanels: Adds initial section and Page to Dashboard submenu (#32876 ) * LibraryPanels: Adds initial section and Page to Dashboard submenu * Refactor: adds perPage as prop * Chore: renames OrgActionBar * Chore: updates after PR comments * Chore: updates snapshot	4 years ago
Ryan McKinley	b96e45299d	Live: support streaming results out-of-the-box (#32821 )	4 years ago
Domas	a56293142a	Alerting: unified alerting frontend (#32708 )	4 years ago
Leon Sorokin	6082a9360e	Alpha panel: new Timeline/Discrete panel (#31973 )	4 years ago
Torkel Ödegaard	10badea19e	Emotion: Upgrades emotion from 10 to 11 and updates all import paths (#32541 ) * Babel: Updates babel dependencies to latest version * Emotion: Upgrade form 10 to 11 * Fixing tests * Updated to use emotion/css instead in test	4 years ago
Torkel Ödegaard	f37c8c10c5	Variables: Fixes problem with data source variable when default ds is selected (#32384 )	4 years ago
kay delaney	ab4b980d54	AppRootPage: Fix tests (#32364 )	4 years ago
Ryan McKinley	da987caa60	Debug panel: add a new alpha panel to help debugging (#32187 )	4 years ago
Marcus Andersson	69201bbf8c	Plugins: moving the DataSourcePicker to grafana/runtime so it can be reused in plugins (#31628 ) * moved the datasource picker to grafana-runtime. * fixed imports. * added e2e selectors as an external package. * adding react as external package. * exposing dependent types for DataSourcePicker. * added docs for ui components. * moving component to components.	4 years ago
Dominik Prokop	a55a272276	Routing NG: Replace Angular routing with react-router (#31463 ) * Add router packages * Get react app root work instead of Angular one * Logger util * Patch Angular routing ($routeProvider, $routeParamsProvider) * Use react-router-dom history instead of separate dependency * Add test routes * Sidemenu - use Link instead of anchors * Patch Angular $location service (stub) * WIP: geting rid of $location provider from TimeSrv * Intercept anchor clicks to use history under the hood * Sync Redux location slice with history state * Make login/logout work * Debug routes for testing * Make force login work * Make sure query param change does not recreate page components * Hide side menu in specified locations * Make the dashboar route query parameters work, make panel edit menu work * Enable more routes * Fix side menu * Handle view modes * Disable playlist routes * Make SafeDynamicImport work again * Bring back router-debug * Separate redux location sync from route rendering * Refactor updateLocation to thunk and move force refresh(login) to it * Fixing init dashboard issue * Support switching between dashboards without an unmount of DashboardPage * More fixes for init dashboard and panel edit * More type fixes * Moving angular location wrapper out of main LocationService, and fixing typescript issues * Fixed last typescript errors * LocationService: Move to runtime and remove getLocationService and export singleston const instead (#31523) * Moving location service implementation to runtime and removing get function and making it a package const singleton * Added test that used locationService directly * removed unused import * AngularApp: Moving angular dependencies and the app boot out of the main app into it's own file (#31525) * Fixes angular panels by calling the monkey patch * Moving angular stuff to to it's own files * udpated * Fixing clicking on divs and spans inside anchor * Moving app notifications out of angular app and removing angular directive wrapper * Moving search from angular to react and removing angular search wrapper * Clean up, tried to remove the redux location wrapper but requires a big update for DashboardPage, so adding it back * Moving AppWrapper to root to limit circular dependencies (app/core -> app/routing and back) * Open and close search now works * Hide sidemenu when in kiosk mode * Restoring some keybindings like ESC key * Removed kiosk events and simplified it, just handled through updating URL * Fixing typescript errors * Simplified GrafanaRouteComponentProps and renamed to ContainerProps * renamed back * Changed AlertRuleList to use GrafanaRouteComponentProps and location.search passed to it * Removing the reloadOnSearch property, this is not needed now for react as react by default does not unmount components when only url match or query parmas change * SafeDynamicImport causing unmount un every search update, not sure how to fix yet * Fix signature for SafeDynamicImport so we do not create new route components on every route render * Removing the redux location wrapper as it was causing errors, and making dashboard page work with RouteProps (location, match) etc * Updating DashboardPage and SoloPanelPage to use match params and history location * Fixed DashboardPage tests * Fixing solo route tests * LocationService: Rename getCurrentLocation to just getLocation * do not intercept link clicks with target blank or self * Experimental useUrlParams hook * Update DataSourceSettingsPage to use router match params * fix links with urls that have no starting / to work like before * Fix forceLogin * Add queryParams to GrafanaRouteComponentProps * PanelEditor get rid of updateLocation and location state * Improve grafana route query params typing * Add getSearchObject to LocationService * Use DashboardPAge queryParams instead of location.search parsing * Fix DashboardPage typing * Fix some tests weirdness * Bring back KeyboardSrv * Fixes typescript issues * Team pages now use router match params * Get rid of from GrafanaRouteComponent props * Removed unnessary calls to getSearchObject when calling locationService.partial * Updated DashboardPage tests after queryParams was added * Fixing dashboard settings back * GrafanaRoute: Adding tests and remove use of global locationService * Fixing tests and typescript errors * Bring back kiosk modes and add tests * Fix TimeSrv tests * Fix typecheck errors * Fixing tests * Updated SideMenu test to react-testing and wrapped component in Router, and fixed issue importing createMemoryHistory * Get rid of routeChange event from TimeSrv from * Fixed TopSectionItem test * Trying to make basename work but failing * Update TopSectionItem snapshot * Fix TopSectionItem snapshot test * Fix API keys creation * Remove Angular dependencies from KeybindingSrv (#31617) * Remove Angular dependency from KeybindingsSrv * Fix tests and typecheck issues * basename is starting to work * Make dashboard save work * KeybindingSrv: Remove as angular service and no usage angular scope * So long bridge_srv, we won't miss you * Update snapshots * Dashboard: Refactoring ChangeTracker to use History api and no angular (#31653) * Dashboard: Refactoring ChangeTracker to use History api and no angular * Updated * Removed logging * fixed unit tests * updated snapshots * Mechanism for force reloading routes (#31683) * e2e: Fixes various things in e2e scenarios after router migration (#31685) * Explore: Update reading query params from router props and updating location via locationService (ReactRouter) (#31688) * RoutingNG: Initial explore redux location to router location migration * Updated explore Wrapper tests * Fixing more tests * remove loggin * rename back to make naming consistent * Fixing return to dashboard button * fixing navigation to explore from dashboard * updated routeProps * Updated tests * Make DashboardListPage work * Fixing navigation after add new data source, and fixes explore e2e * Fixing solo panel page * PluginsPage now works * RoutingNG: When parsing and rendering url search/query params preseve old logic of handling booleans and arrays (#31725) * RoutingNG: When parsing and rendering url search/query params preserve old logic of handling booleans and arrays * Fixed test * Make snapshots list work * fixed alert notification channel edit page * Simplify LocationService, did not need special handling for login or forceLogin as target _self on link already handles that * fixed UserAdminPage * fixed edit orgs page * Fixing LdapPage * fixing dashboard import * Fixed new folder page * Fixed data source dashboards page * fixing Folder permissions and folder settings page * fixing snapshot list page nav model * remove unused file * Added placeholder page for playlist * Moved browser compatability to index-template * Restored 404/default page * Fixed reset password page * Fixed SignUpInvited page * Fixing CreateTeam, Create user page, add panel widget * Restore browwser file to make tests happy * Fixed unit tests * Removed unused import * Replacing usage of updateLocation * Fixed test * Updating search filters to use history / location service for filters * remove unused file * AppRootPage fixed * Fixing test and search issue * Changes to support enterprise extensions * remove console.log * Removing more use of redux location * Fixed signup page * removed unused old angular controllers * Fixing bugs * one final bugfix * Removed location from redux state * Fixing ts issues and tests * Fixing test issue * fixing tests * Fixing tests * removed unused stuff * Fixed search test * Adding some doc comments * Routing NG: Angular location provider patch (#31773) * Patch Angulars $location provider * Update public/app/angular/bridgeReactAngularRouting.ts * Remove only test * Update tests, disable loggers in test env * Routing NG: remove $location provider usage (#31816) * Remove dashboard_loaders * Remove $location from Analytics service, track page views form GrafanaRoute * Remove NotificationsEditCtrl * Remove Angular dependencies from uploadDashboardDirective * Update public/app/features/dashboard/containers/DashboardPage.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Update public/app/features/dashboard/containers/DashboardPage.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Remove unused test helpers (#31831) * Playlist react (#31829) * playlist list in react * Playlist start * Things started to work * Updated * Handle empty list * Fix ts * Fixes and kiosk mode stuff * Removed unused events * fixing ts issue * Another ts issue * Fixing tests Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com> * fixed test * Update public/app/AppWrapper.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Update public/app/AppWrapper.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Remove Angular dependency from DashboardLoaderSrv (#31863) Co-authored-by: Torkel Ödegaard <torkel@grafana.com> Co-authored-by: Torkel Ödegaard <torkel@grafana.org> Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>	4 years ago
Torkel Ödegaard	584886fa46	AppPlugins: Options to disable showing config page in nav (#31354 ) * AppPlugins: Options to disable showing config page in nav * rename * Added autoEnabled * updated * Things are working sort of * Simplify	4 years ago
Dominik Prokop	0d6e5298b7	DatasourceSrv: Fix instance retrieval when datasource variable value set to "default" (#31347 ) * Failing tests * Fixed	4 years ago
Torkel Ödegaard	50faeb3078	DataSourceSrv: Filter out non queryable data sources by default (#31144 )	4 years ago
Dominik Prokop	8d339a279b	Eslint: no-duplicate-imports rule (bump grafana-eslint-config) (#30989 ) * Eslint: no-duplicate-imports rule (bump grafana-eslint-config) * Chore: Fix duplicate imports (#31041) * Rebased this branch into eslint-no-duplicate-imports * updated some changes * merged uncaught duplicate imports * fixes frontend test- I hope * fixes e2e test- I hope Co-authored-by: Uchechukwu Obasi <obasiuche62@gmail.com>	4 years ago
Ryan McKinley	26b168f7eb	BarChart: add alpha bar chart panel (#30323 )	4 years ago
Torkel Ödegaard	1d689888b0	Prettier: Upgrade to 2 (#30387 ) * Updated package json but not updated source files * Update eslint plugin * updated files	4 years ago

1 2 3 4 5 ...

709 Commits (349d9973de9472b3deea62b1465e79517f4b114e)