grafana

Commit Graph

Author	SHA1	Message	Date
Matias Chomicki	b3596e8c72	New Logs Panel: Render new panel using the current visualization (#105968 ) * LogsPanel: integrate new panel via feature flag * Log Line: move sampled/errors/deduplication count outside of log line body * LogList: increase overscan count * Logs Panel: enable deduplication for infinite scrolling * Logs Panel: remove margin overflowing drilldown * Logs Panel: add missing dependency to effect * Logs Panel: pass missing callback * Remove console log * LogLine: show cursor pointer only when interactable * LogLineDetails: make resize handler more obvious * LogsPanel: add missing props to from panel * LogLineMenu: add support for custom items * LogsPanel: pass custom menu items to LogList * Fix imports * Chore: comments and missing argument * LogLineMenu: pass log to event listener * LogListContext: filter log details when no longer present in the new response * chore: log * LogsPanel: conditionally show options per feature flag status * LogLine: align logs when some of them are sampled or with errors * Chore: update tests * LogLineMenu: test custom options * LogsSamplePanel: show controls * LogsPanel: move return after hooks to prevent bugs	2 months ago
Aleksandar Petrov	0b8252fd7c	Pyroscope: Annotation support for series queries (#104130 ) * Pyroscope: Add annotations frame to series response * Adapt to API change, add tests * Run make lint-go * Fix conflicts after rebase * Add annotation via a separate data frame * Process annotations fully at the datasource * Add mod owner for go-humanize * Pyroscope: Annotations in Query Response can be optional --------- Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>	2 months ago
Oscar Kilhed	4f18ad30c9	SchemaV2: Remove legacy rows from schema v2. (#105238 ) * save transparent setting * make sure we test both transparent and non transparent * no more legacy rows * schema changes * Add testing, fix first row offset * Remove legacy row from transform test * Remove panel that's not present in layout * Remove expects after removing the row, fix lint issues * Remove unused commit * update codegen * update openapi snapshot * Fix snapshot * add missing default prop * Fix repeating, fix first row, fix not flushing last row * Use correct repeater * fix lint, remove unused empty check * update codegen * update openapi test snapshot	2 months ago
Victor Marin	5cee301e75	GroupByVariable: Add support for default values in schema (#105518 ) * update schema * update schema * refactor property to singular naming * bump scenes * leave scenes to caret version * add defaultValue to groupBy model * typo	2 months ago
Matias Chomicki	9308f86d63	New Logs Panel: Add Log Details support (#105609 ) * Log list: add onclick listener * LogListContext: add basic details support * LogLineDetails: create component * Address lint issues * Log Details: make resizable and store size * LogListModel: add sampled and error support * LogDetails: pass more required props * LogLineContext: add interactive callbacks support * LogLineDetails: pass interactive callbacks * LogList: pass displayedFields callbacks * LogLine: move click listener * LogLineMenu: support showing details * LogLine: move onclick listener * LogListContext: remove displayedFields intermediation * i18n * LogListContext: abstract details shown function * LogLine: visually show expanded lines * LogDetails: remove min width for labels * LogLineDetails: add close button * LogList: add extra wrapper to get width * LogLineDetails: update logs size on resize * virtualization: update to new width reference * LogLine: check overflow on every re-render * LogList: debug virtualization when resizing * LogLineDetails: make it scrollable * LogListContext: make detailsWidth not undefined * Update tests with new attributes * LogLine: update collapsed state with container changes * LogLine: move cursor property to clickable styles * LogList: fix height recalculation when display options change * Logs: fix feature toggles support * Logs: more feature toggles adjustments * Lint * LogLine: support duplicates, hasError, and isSampled * Logs: debug feature flag combinations * i18n * Prettier * New Logs Panel: generate storage key for dashboards * Explore Logs: fix filtered levels * Logs Sample: integrate new panel * LogLine: fix unwrapped logs * Fix test * Update test * Logs panel: update test * Prettier * LogLine: update tests * LogLineMenu: update test * LogList: update unit test * processing: update test * virtualization: update unit test	2 months ago
Alexa V	b1a6860f52	Dashboards: Schema V2 - Rename Annotations 'options' to 'legacyOptions' and Fix stale props (#105266 ) * Rename Annotations 'Options' to 'legacyOptions' * use new legacyOptions in StandardAnnotationQueryEditor * use new legacyOptions in transformSaveModelSchemaToScene * use legacyOptions in transformSceneToSaveModelSchemaV2 * Fix bug with ds query editors not taking the latest state * update snapshot	2 months ago
Sergej-Vlasov	03f1bb950b	DashboardSchemaV2: add missing allowCustomValue property in variables (#105416 ) * add missing allowCustomValue property to variables in schema V2 * fix K8s Codegen Check * updade snapshots for backend tests	2 months ago
Andreas Christou	b886093fe6	Azure Monitor: Support request timeout configuration (#105487 ) Support request timeout configuration	2 months ago
Matheus Macabu	afc0fd39ac	Dependencies: Unpin and bump github.com/getkin/kin-openapi from v0.126.0 to v0.132.0 (#105185 )	2 months ago
Kevin Minehart	f7216db6bc	Chore: bump version to 12.1.0-pre (#104468 ) bump version to 12.1.0-pre	3 months ago
Victor Marin	faa33e30a9	Schema: Add origin property to AdHocFilterWithLabels (#104320 ) * add origin to AdHocFilterWithLabels * typo * fix * use singular for FilterOrigin * run ./hack/update-codegen.sh * add canary scenes to verify typechecks * update dashboard schema json snapshot * fix * fix * update canaries * fix * bump scenes version	3 months ago
Ryan McKinley	b09d79b21c	K8s/Dashboard: Promote from alpha1 to beta1 (#104009 )	3 months ago
Matias Chomicki	592c7a0b3c	Log Controls: Allow plugins to use Log Controls (#104237 ) * Logs Panel: add showControls option * Make showControls optional * Logs Panel: expose storage option * Controlled log rows: allow table props to be possibly undefined * Logs panel: expose controlled options change callback * Logs panel: pass new callback * Logs Panel: pass the correct field callbacks * LogListControls: disallow unique labels in apps * LogListControls: allow to filter by unknown level * LogListControls: fix wrong aria-pressed state * LogListControls: hide overflow * ControlledLogRows: make scroll auto * Controlled Logs Panel: forward scroll ref * chore: generalize isCoreApp * Formatting * LogListControls: update test * Logs Panel: make sure tests pass with and without controls * formatting * Losg Panel: add comments for the new options * Log list controls: Add comment	3 months ago
Marco de Abreu	c47ab101d1	Dashboards: Add Dashboard Schema validation (2) (#103844 ) * Activate schema validation and align underlying systems * update to save as v0 if not the right schema version * Resolve merge conflicts * Move RequireApiErrorStatus to tests package * Add mutation tests * Fix lint * Only do min version check if dashboard is v1 * Fix lint and disable provisioning test * Revert provisioning changes * Revert more tests and add schema test * Reran gen * SQL Dashboard save * Adjust APIVERSION * Fixed mutation test * Add logging on downgrade --------- Co-authored-by: Marco de Abreu <18629099+marcoabreu@users.noreply.github.com> Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>	3 months ago
Haris Rozajac	6933829ce2	Dashboard Schema V2: Import Dashboard (#102375 ) * WIP: Working import * wip * remove model * wip * working * remove console.logs * fix * remove * remove uid field as v2 spec doesn't have uid * clean up reducer * revert arrow func * support upload	3 months ago
Bogdan Matei	35e78feffa	Dynamic Dashboards: Add repeats for tabs (#103348 )	3 months ago
Alexa V	2f60d54648	Dashboard: Schema V2 - Fix annotations losing queries (#102951 ) * Fix annotations losing queries when saving v1 with dynamic dashboards enabled * Add extra options property to the DashboardAnnotationQuerySpec to catch all field datasource-specific properties * Add options to the v2Alpha1 schema and run make gen-apps * Add unit test and clean up console.logs Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>	3 months ago
Matias Chomicki	06c83f7d4d	New Logs Panel: Add LogListControl component (#102359 ) * LogListNavigation: create component * LogListNavigation: make it optional * Refactor Navigation into Controls * Explore Logs: hide old panel options * LogListControls: add more controls and apply new styles * LogListControls: update width * Remove console log * LogList: wrap component in context * LogListContext: make it stateful * LogListControls: connect with context * LogListContext: sync displayed fields * LogListContext: add syntax highlighting control * LogLine: improve color with highlighting off * LogListControls: improve button styles * LogListControls: add sort order option * LogListControls: add dedup strategy * LogListContext: sync prop changes with state * LogList: add option change callback * LogListContext: sync external changes only when showControls is disabled * LogListContext: unify sync effect * LogListControls: improve buttons active css * LogListContext: add optional storage support * LogList: make syntaxHighlighting and read from store or default to true * LogsPanel: add support for new options * Generated file * Update tests * New Logs Panel: add showControls option * LogList: make eventBus optional * LogsPanel: expose syntaxHighlighting * LogsPanel: expose grammar to plugins * Remove incorrect legacy file * LogListControls: allow options change with controls enabled in panel editor * LogLine: apply no-highlighting class to ansi wrapper * LogListControls: add frontend level filtering * LogList: filter by filterLevels * LogListControls: allow filterLevels in dashboards * LogLine: update unit tests * LogLineMenu: update unit test * LogListControls: add unit test * Revert * LogList: add unit test * LogList: add onLogRowHover support * LogList: test hover events * LogsPanel: add unit test * LogLine: use theme color for errors * LogLine: minor tweak to hover state * Chore: fix test case name * LogListControls: add border * LogListControls: prevent default on wrap toggle click * LogLine: switch info and debug colors * ContentOutline + LogControls: sync displayed levels and minor outline improvements * LogListContext: sync with external filterLevel changes * Logs: work with arrays of LogLevel and not plain strings * Fix type * LogListControl: increase controls size	4 months ago
Bogdan Matei	0e1cb44ad9	Dynamic Dashboard: Redesign conditional rendering [2] (#103112 )	4 months ago
Joey	15330c3e66	NodeGraph: Add node graph algorithm layout option (#102760 ) * Add layout buttons * Add config for node graph panel * Tests * Update test * Updates * Move grid button and cache nodes * Remove limit and add warning * Update default	4 months ago
Dominik Prokop	17d089d38a	Schema V2: Use App SDK generated types (#103100 ) * Use App SDK generated types * Move examples * Merge fix * PAth updates	4 months ago
Alyssa (Bull) Joyner	3b73ebb210	Azure Monitor: Add logs query builder (#99055 )	4 months ago
Laura Fernández	4ad0492d3d	i18n: Add `locale` to backend (#102233 )	4 months ago
Oscar Kilhed	9094c73e33	Chore: Rename responsive grid -> AutoGrid (#102959 ) * Rename ResponsiveGrid -> AutoGrid in schema * Rename responsive grid in code * fix accidental removal of generation * fix i18n * fix backend conversion * run ./hack/update-codegen.sh	4 months ago
Oscar Kilhed	e95cd04b25	Dynamic dashboards: Add missing row props to schema (#102859 ) * Add missing row props to schema * Fix test, add tests * Fix renaming that was done by auto refactoring	4 months ago
Igor Suleymanov	c68234f7e7	Add Makefile targets for generating dashboard app code and update it to SDK v0.35.0 (#102796 ) * Update dashboard app to use app SDK v0.35.0 What This change updates dashboard app to use app SDK v0.35.0 and adds new Makefile target for running codegen for all apps, in opt-in manner. Currently only dashboards app is opted in. Additionally, this changes dashboard app Makefile to properly install and update app SDK versions when generating code, with app SDK version pinned in the Makefile itself. Why The upgrade addresses issues with `DeepCopy` methods, while the Makefile targets ensure that codegen is easy to run and uses reproducible environments. Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Run make update-workspace Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Fix deepcopy methods Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Re-run CUE codegen to satisfy the CI Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Run make update-workspace Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Update to v0.35.1 Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> --------- Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com>	4 months ago
Torkel Ödegaard	dc922717dc	Dashboard: Auto grid options (#102374 ) * Dashboard: Auto grid options * Update * Fix * update trans * Update cue * Fix persisting auto grid options (#102744) * Fix persisting auto grid options * Update i18n * fix serializer test * update schema * reset dashboard_object_gen.go files, run update-codegen.sh * rename in code * rename height fill in schema * rename heightFill fillScreen in code * fix test --------- Co-authored-by: oscarkilhed <oscar.kilhed@grafana.com>	4 months ago
Joey	dfe2af9559	Tempo: Remove aggregate by (#98474 ) * Remove aggregate by * Update betterer * Run toggles test * Add back group by in schema so it can be checked for * Show error if group by * Update error message * Allow user to remove the group by from the query * Fix assertion --------- Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>	4 months ago
Yuri Tseretyan	674d81d7ee	Chore: Bump version of front-end modules to 12.0.0-pre (#102615 ) --------- Co-authored-by: jev forsberg <jev.forsberg@grafana.com>	4 months ago
Torkel Ödegaard	8a8b1a0743	DashboardScene: Take selected object into account when adding objects (#102423 ) * Dashboard: Add object to selected object * Try not to nest rows * Update * Update * rows in rows, tabs in tabs * Update schema to allow nested rows and nested tabs * fix lint issue * reset v2alpha1 types from main * reset dashboard_object_gen.go to main --------- Co-authored-by: oscarkilhed <oscar.kilhed@grafana.com>	4 months ago
Igor Suleymanov	3f270d1de0	K8s/Dashboards: Fix panics in Dashboards v2alpha1 API (#102123 ) * K8s/Dashboards: Fix panics in Dashboards v2alpha1 API Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Update generated code to use the `MappingType` properly Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> --------- Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com>	4 months ago
Oscar Kilhed	d07b1851c7	Dynamic dashboards: Persist conditional rendering (#102022 ) * Dashboards: Add conditional rendering * Updates * Fixes * Code improvements * Code improvements * limit condition choices, add delete and clean up ui * add basic variable condition * add conditional rendering based on time range interval * adjust failing test * remove deprecated pseudo locale file * extract conditional rendering from behaviour to state property * clean up behaviour initialisation * clean up ts errors * adjust data condition to account for RowItem * persist-conditional-rendering * fix group value name and kind type * Fix types in base * minor style fix * Fix subscribes * notify change when deleting condition * fix hidden row item error * Remove option to have groups in groups * fix merge issue * address comments * subscribe to panel data change in data condition * Remove loop labels * only persist conditional rendering if root group has items * update backend types * Serialize variable conditional rendering operator as equals notEquals --------- Co-authored-by: Bogdan Matei <bogdan.matei@grafana.com> Co-authored-by: Sergej-Vlasov <sergej.s.vlasov@gmail.com>	4 months ago
Igor Suleymanov	ea89a68028	K8s/Dashboards: Generate Dashboards k8s APIs using Grafana App SDK (#99966 ) * Generate Dashboard kinds with `grafana-app-sdk` Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Hack together a fix for invalid TS codegen for v0 & v1 Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Address Go linter issues Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Address TS linter issues Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Add new app to CODEOWNERS Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Fix a couple of issues detected by tests Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Update OpenAPI definitions and test files Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Remove title from Dashboard v1alpha1 spec Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Remove unused CUE schemas Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * remove unrelated files * allow any in the generated betterer * Add a comment explaining why we don't use deepcopy-gen Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> * Default to v2alpha1 if dashboards v2 FF is enabled Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> --------- Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com> Co-authored-by: Ryan McKinley <ryantxu@gmail.com>	4 months ago
Jack Westbrook	d8da2061fc	Grafana/schema: trigger new canary release (#101672 ) docs(schema): add installation instructions to trigger release	5 months ago
Sergej-Vlasov	bf9a34f2ca	TimePicker: Ability to manually specify quick ranges (#101465 ) * add quickRanges to scene model transforms * add test for quickRanges transformations * fix lint	5 months ago
Jack Westbrook	859c12bbb4	Grafana UI: Expose unstable entrypoint (#97080 ) * feat(grafana-ui): build unstable entrypoint for experimental components * feat(plugins): expose grafana/ui/unstable * build(grafana-ui): add rollup plugin to create alias package.json for unstable entrypoint * build(packages): rewrite prepare npm script to generate alias packagejson files * chore(packages): use relative paths in publishConfig for exports generation * chore(frontend): move npmcli/package-json package to root package.json * revert(grafana-ui): remove rollup plugin for generating alias package.json files * chore(grafana-ui): clean up unstable directory postpack to prevent yarn lock issues * build(packages): fix scope for pkgName usage * feat(packages): create separate cjs and esm builds that validate with arethetypeswrong cli * chore(yarn): refresh lock file * fix(packages): make sure alias package.jsons point to existing files	5 months ago
Oscar Kilhed	21be5e3f45	Dynamic dashboards: Repeat responsive grid items (#101291 ) * repeat responsive grid items * fix stuff from feedback * Simplify repeat dependency, fix locale stuff	5 months ago
Jack Westbrook	eca045bc11	Build: Reduce repetition in rollup configs (#93916 ) * build(packages): add extendable pieces of rollup config * build(packages): rewrite rollup configs to make use of extendable parts	5 months ago
Oscar Kilhed	855eadcabd	Dashboards: Tabs layout persistence (#100485 ) * Tabs layout persistence * fix lint issue * Add tests, add tabs serializer to registry * Fix deserialize tabs * more tests * tab item title optional * change TabItemKind -> TabLayoutTabKind * add tests for tabs serializer * fix name in test * Fix test after renaming tabs	5 months ago
Matias Chomicki	b814f1628f	New Logs Panel: Add infinite scrolling support (#99773 ) * Create Infinite Scroll wrapper component * Logs list: refactor event subscriber * Infinitely load logs * Move renderer to Infinite Scroll component * Implement infinite scroll state * Switch internal implementation to use the existing infinite scrolling component logic * Integrate with logs panel * Move scrolling management to infinite scrolling component * LogList: change subscription dependency to prevent unnecessary runs * Infinite scroll: remove autoscrolling * Logs Panel: fix dependencies to prevent re-renders on refresh * Infinite scroll: introduce pre-scroll state * LogList: expose initial log position prop * Infinite scroll: less work on scroll and autoscroll behavior * Remove console * Fix imports * Add infinite scroll translations * Fix imports * Add visual delimiter for new pages and increase gap * Remove log * Chore: rename interface to LogListModel * Hover: decrease opacity * Fix no-logs state * Prettier * Infinite scroll: move scroll delimiter * Load more message: make it clickable	5 months ago
Haris Rozajac	9ad6653871	Dashboard Schema V2: Improve diffing (#100022 ) * improve diffing * define dash spec props a-z * Fix * sort deep initialSaveModel * update tests * Fix test, description, and query ds issues * Fix seralizer test * response transformers * skip panelMerge tests	5 months ago
Sergej-Vlasov	d1dee968c3	Schema V2: Adjust quick_ranges in time settings and remove time_options (#100135 ) * adjut quickRanges type in v2 * clean up unused time_options property * remove deprecated time_options property on time picker * add schema migration for time_options * adjust test	5 months ago
renovate[bot]	79bd3ffd8c	Update dependency rollup-plugin-esbuild to v6.2.0 (#100421 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	5 months ago
renovate[bot]	8c0e087ce2	Update dependency esbuild to v0.25.0 [SECURITY] (#100426 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	5 months ago
Sergej-Vlasov	bbe21bb1d2	Bump Scenes to 5.42.0 (#100205 ) * update scenes and weekStart prop type * update test * adjust weekStart type in schemaV2 * clean up weekStart error message * clean up weekStart in test data	5 months ago
Ryan McKinley	e3cb73301e	Authz/Schema: Remove unused stub cue definitions (#100387 )	5 months ago
Oscar Kilhed	a412394a14	Dashboards: Save rows and responsive grid layouts in v2 (#100035 ) * save rows and responsive grid layouts in v2 * Add back accidentally removed assert * adress feedback * use getGridItemKeyForPanel * Fix import * fix another import * Remove RowGridLayout	5 months ago
Haris Rozajac	4c52abb6b4	Dashboard Schema V2: Introduce __legacyStringValue and deprecate string type for query prop in QueryVariableSpec (#99716 ) * Introduce __legacyStringValue and deprecate string type for query * Fix tests * Fix tests * remove default * kind should default to default ds if variable doesn't have ds field * lint * getDefaultDataSourceRef should not return undefined	5 months ago
Matias Chomicki	ff926c5ac5	Logs Panel: Base elements for the new visualization (#99084 ) * Create base components * Create measurement service * Add container for list * Use measurement to render virtualized log lines * Match rendered styles in 2d context for measuring * Improve virtualization initialization and handle resize * Introduce log line processing * Virtualization: fix measurement of lines with line endings * Virtualization: include scrollbar width in calculation * Remove logs * Virtualization: optimize text measurement * Add support for forceEscape * Log line: properly style wrapped/unwrapped lines * Virtualization: handle possible overflows * Improve overflow handling * LogList: remove scroll position ref * Remove logs * Remove log * Add top/bottom navigation buttons * Add timestamp to pre-processing * Add showtime support * Fix imports * Chore: simplify dedup * Show level * Refactor measurement and measure level and timestamp * Virtualization: skip unnecessary measurements * Improve measurements to minimize overflow chance * Introduce logline colors * Update palette * Remove pretiffying * Add comment * Remove unused variable * Add color for info level * Fix dependencies * Refactor overflow to account for smaller estimations * Debounce resizing * Fix imports * Further optimize height calculation * Remove outline * Unused import * Use less under/overflow method * Respond to height changes * Refactor size adjustment to account for layout changes * Add Logs Panel support * Add margin bottom to log lines * Remove unused option * LogList: container div should never be null Bad API design * Log List: make app not undefined and update containerElement usages * New Logs Panel: Create as new visualization (#99427) * Logs Panel: clean up old panel * Logs Panel New: create as new visualization * Plugin: mark as alpha * Logs panel new: hold container in a state variable * Logs panel: fix no data state * Create newLogsPanel feature flag * Logs: use new feature flag * Prettier * Add new panel to code owners * Logs Navigation: add translations * Address betterer issues * Fix import * Extract translations * Update virtualization.ts * Virtualization: add DOM fallback for text measurement * Run gen-cue * plugins_integration_test: add logs-new to expected plugins	6 months ago
Sergey Naumov	eb2f8182c0	Dashboards: Allow custom quick time ranges specified in dashboard model (#93724 ) * TimeRangePicker: allow to customize quick ranges per dashboard * TimeRangePicker: show selected custom time range using its name * rangeutil: add tests for describeTextRange + quickRanges * Fix up tests, and add an extra case for hidden time ranges * Don't construct an object to find options, add findRangeInOptions util * fix type errors detected by TypeScript --------- Co-authored-by: joshhunt <josh@trtr.co>	6 months ago

1 2 3 4 5 ...

451 Commits (5fda907c6779158b5d1d630233740371ccfbcf9f)