grafana

Commit Graph

Author	SHA1	Message	Date
Selene	e47a60f511	Add filter to search users by active (#38637 ) * Add filter to search users by active * Fix query	5 years ago
Tania B	a0108a1e5b	Encryption: Extract encryption into service (#38442 ) * Add encryption service * Add tests for encryption service * Inject encryption service into http server * Replace encryption global function usage in login tests * Apply suggestions from code review Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Migrate to Wire * Undo non-desired changes * Move Encryption bindings to OSS Wire set Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com> Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	5 years ago
Serge Zaitsev	d15cbe4b4e	Macaron cleanup (#37795 ) * simplify some dependency injection in macaron * remove unused internal server error handler from macaron * remove internal server error handler from the router * remove unused combo router api * remove unused parts of the macaron router	5 years ago
idafurjes	7faea40674	API: Add short url validation (#38436 ) * Add short url validation Path should not contain string ../ * Update pkg/api/short_url.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	5 years ago
Arve Knudsen	78596a6756	Migrate to Wire for dependency injection (#32289 ) Fixes #30144 Co-authored-by: dsotirakis <sotirakis.dim@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com> Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> Co-authored-by: Leon Sorokin <leeoniya@gmail.com> Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com> Co-authored-by: spinillos <selenepinillos@gmail.com> Co-authored-by: Karl Persson <kalle.persson@grafana.com> Co-authored-by: Leonard Gram <leo@xlson.com>	5 years ago
Gabriel MABILLE	f9273d0d37	AccessControl: Add a mock (#38515 )	5 years ago
gotjosh	14a0519338	Alerting: Remove Multiorg alertmangaer from the top-level services (#38506 ) Removes the registration of the multi-org alertmanager, it is started as a subservice of ngalerting.	5 years ago
Alex Khomenko	6e639f3c72	Admin: Update stats page UI (#38014 ) * Add StatCard * Style cards * Update types * Add tests * Move stats tab into licencing * Prevent UI jumps when loading stats * Fix merge conflicts * Revert docs format	5 years ago
David Parrott	7fbeefc090	Alerting: create wrapper for Alertmanager to enable org level isolation (#37320 ) Introduces org-level isolation for the Alertmanager and its components. Silences, Alerts and Contact points are not separated by org and are not shared between them. Co-authored with @davidmparrott and @papagian	5 years ago
Karl Persson	7ebf4027a7	Access Control: refactor permission evaluator to be more flexible (#35996 ) * add a more flexible way to create permissions * update interface for accesscontrol to use new eval interface * use new eval interface * update middleware to use new eval interface * remove evaluator function and move metrics to service * add tests for accesscontrol middleware * Remove failed function from interface and update inejct to create a new evaluator * Change name * Support Several sopes for a permission * use evaluator and update fakeAccessControl * Implement String that will return string representation of permissions for an evaluator Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	5 years ago
idafurjes	ccab9611cb	API: Add theme validation (#38432 ) * Add theme validation * Fix lint for const	5 years ago
idafurjes	b9a538aff0	Bug: Add check before delete org (#38056 ) * Add check before delete org * Fix comment * Simpify check if signed in user belongs to the org * Add check on login if user has and existing org change error code to 400, when org can not be deleted * Roll back last commit, regarding an different issue	5 years ago
Nathan Rodman	df791ae2af	Alerting: Add custom grouping for alert groups (#37378 ) * Group alertmangaer alerts by custom grouping * Filter am groups * Style filter components * Style filter bar and add clear functionality * rename components to alert group * use query params for group filters * filter style improvements * add tests for group by * Add grouping banner to better highlight groupings * clean up hook logic	5 years ago
Dimitris Sotirakis	050dc7bc8f	Cloudwatch: Unwrap errors - throw error from upstream (#36334 ) * Unwrap errors - throw error from upstream * Fixes according to reviewer's comments * Fix linting * Remove unused code	5 years ago
Stephanie Hingtgen	db2e0d46b7	Update http error code when datasource health check fails (#37895 ) Since the datasource settings are configured by the user, the health check error could be a client error. A 506 error may be sufficient as well.	5 years ago
Serge Zaitsev	707d3536f0	Macaron: Strip down renderer middleware (#37627 ) * strip down macaron renderer * inline renderHTML * remove IndentJSON parameter * replace renderer with a html/template set * fix failing test * fix renderer paths in tests * make template reloading even simpler * unify ignored gzip path lookup * fix csp middleware usage	5 years ago
Serge Zaitsev	0dfac9c3aa	Macaron: convert CSP middleware (#37672 )	5 years ago
Will Browne	e0315dabe8	Plugins: Use file extension allowlist when serving plugin assets instead of checking for UNIX executable (#37688 ) * explicitly check for plugin binary * remove check completely * resolve conflicts * allow module + logos * add tests * simplify * rework to allowlist * add case * remove old stuff * simplify * add case insensitive test	5 years ago
Ivana Huckova	ba76877d28	Datasource: Pass access type to data source instance settings (#37577 ) * Pass Access info to datasourceInstance * Update packages/grafana-data/src/types/datasource.ts Co-authored-by: Giordano Ricci <me@giordanoricci.com> * Type access as direct \| proxy * Fix tests where mocking datasourceInstance, include access * Pass access to data source instance mocks * Update comment * Pass access to data source instance mocks Co-authored-by: Giordano Ricci <me@giordanoricci.com>	5 years ago
Jeremy Price	e8e1a0b50b	Revert "Revert "AccessControl: Implement a way to register fixed roles (#35641 )" (#37397 )" (#37535 ) This reverts commit `55efeb0c02`.	5 years ago
Jack Westbrook	cdcccfcc53	Plugins: Fix catalog permissions for org and server admins (#37504 ) * simplify toggle + add link to server admin * feat(catalog): org admins can configure plugin apps, cannot install/uninstall plugins * fix(catalog): dont show buttons if user doesn't have install permissions * feat(catalog): cater for accessing catalog via /plugins and /admin/plugins * feat(catalog): use location for list links and match.url to define breadcrumb links * test(catalog): mock isGrafanaAdmin for PluginDetails tests * test(catalog): preserve default bootdata in PluginDetails mock * refactor(catalog): move orgAdmin check out of state and make easier to reason with Co-authored-by: Will Browne <will.browne@grafana.com>	5 years ago
Domas	73d36d5521	put alerting admin page under ngalert flag (#37437 )	5 years ago
Emil Tullstedt	55efeb0c02	Revert "AccessControl: Implement a way to register fixed roles (#35641 )" (#37397 ) This reverts commit `88c11f1cc0`.	5 years ago
Gabriel MABILLE	88c11f1cc0	AccessControl: Implement a way to register fixed roles (#35641 ) * AccessControl: Implement a way to register fixed roles * Add context to register func * Use FixedRoleGrantsMap instead of FixedRoleGrants * Removed FixedRoles map to sync.map * Wrote test for accesscontrol and provisioning * Use mutexes+map instead of sync maps * Create a sync map struct out of a Map and a Mutex * Create a sync map struct for grants as well * Validate builtin roles * Make validation public to access control * Handle errors consistently with what seeder does * Keep errors consistant amongst accesscontrol impl * Handle registration error * Reverse the registration direction thanks to a RoleRegistrant interface * Removed sync map in favor for simple maps since registration now happens during init * Work on the Registrant interface * Remove the Register Role from the interface to have services returning their registrations instead * Adding context to RegisterRegistrantsRoles and update descriptions * little bit of cosmetics * Making sure provisioning is ran after role registration * test for role registration * Change the accesscontrol interface to use a variadic * check if accesscontrol is enabled * Add a new test for RegisterFixedRoles and fix assign which was buggy * Moved RegistrationList def to roles.go * Change provisioning role's description * Better comment on RegisterFixedRoles * Correct comment on ValidateFixedRole * Simplify helper func to removeRoleHelper * Add log to saveFixedRole and assignFixedRole Co-authored-by: Vardan Torosyan <vardants@gmail.com> Co-authored-by: Jeremy Price <Jeremy.price@grafana.com>	5 years ago
Serge Zaitsev	e42a597e87	Remove unused Macaron code and interfaces (#37194 )	5 years ago
Sofia Papagiannaki	b96dd1877c	Folder API: optionally force deleting Grafana 8 alerts when deleting a folder (or error) (#36427 ) * Folder API: Add an optional query parameter for allowing deleting a folder containing rules * Update frontend - Set forceDeleteRules=true when frontend deletes a folder - Improve modal text * Update docs * Apply suggestions from code review Co-authored-by: gotjosh <josue@grafana.com> Co-authored-by: Nathan Rodman <nathanrodman@gmail.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>	5 years ago
Serge Zaitsev	9f36e36c89	Pick changes from PR 33811, use UID in dashboard navlinks (#36899 ) * pick changes from PR 33811, use UID in dashboard navlinks * use proper spelling for UID * add uid to the plugin schema * Update docs/sources/developers/plugins/plugin.schema.json Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>	5 years ago
Sofia Papagiannaki	7815ed511f	Alerting: Refactor API endpoints for fetching alert rules (#37055 ) * Refactor ruler API endpoint for listing rules * Refactor prometheus API endpoint for listing rules * Update HTTP API docs	5 years ago
Domas	1881de8236	Alerting: add button to deactivate current alertmanager configuration (#36951 ) * reset alert manager config button for admins * "alert manager" -> "Alertmanager"	5 years ago
Ryan McKinley	e604e69d93	Geomap: default basemap config cleanup (#37069 )	5 years ago
Eunice Kim	3b0d7fc00b	Geomap: Base layer server configuration (#37041 )	5 years ago
Djairho Geuens	4cadbba686	Email: Allow configuration of content types for email notifications (#34530 ) * Alerting: Allow configuration of content types for email notifications * Fix lint error * Improves email templates * Improve configuration documentation Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve code comments Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve configuration documentation Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve email template * Remove unnecessary predeclaration Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Adds handling for unrecognized content type Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Move utility function outside of util package * Fixes syntax * Remove unused package * Fix lint error * improve email templates * Fix test * Alerting: Allow configuration of content types for email notifications * Fix lint error * Improves email templates * Improve configuration documentation Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve code comments Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve configuration documentation Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve email template * Remove unnecessary predeclaration Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Adds handling for unrecognized content type Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Move utility function outside of util package * Fixes syntax * Remove unused package * Fix lint error * improve email templates * Fix test * Fix comment style Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com> * Fix template formatting * Add test and improve error handling * Fix test * Fix formatting * Fix formatting * Improve documentation and regenerates txt template * Update docs/sources/administration/configuration.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: Djairho Geuens <djairho.geuens@ae.be> Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>	5 years ago
Marcus Efraimsson	11d03f7961	Chore: Use context.Context for the get home dashboard API endpoint (#36735 ) Use context.Context for the get home dashboard API endpoint. Ref #36734	5 years ago
Marcus Efraimsson	b164c90e91	Chore: Fix http: superfluous response.WriteHeader error when deleting an external snapshot (#36780 )	5 years ago
Marcus Efraimsson	a6b2e1865c	Datasource: Improve default timeout settings for HTTP client provider (#36621 ) Make sure that default timeout settings are based on configuration parameters. This now applies for core data sources using old TSDB contracts and new SDK contracts. Before it was only applied for old TSDB contracts. Also moves global setting variables to non-global (setting.Cfg).	5 years ago
Will Browne	e82f8dbef9	switch to json resp for errors (#36743 )	5 years ago
Will Browne	7dbe388d4e	fix gzipped plugin asset response (#36721 )	5 years ago
Will Browne	e06335ffe9	Plugins: Improve grafana-cli UX + API response messaging for plugin install incompatibility scenario (#36556 ) * improve UX for plugin install incompatability * refactor test	5 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>	5 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.	5 years ago
Serge Zaitsev	9b2d7d6d69	Gradually remove Macaron web framework (#36325 ) * add macaron code to the code base * remove unused secure cookies support from macaron * clean up modules * remove com dependency * fix silly typos * little cleanup, remove recovery middleware * remove logger middleware * remove static handler and remove unused context methods * bring inject into macaron codebase * remove unused applicator * add back macaron license * more cleanups in macaron code * remove unused injector Set method * remove unused context methods: param to int conversion, body helper type, cookie helpers * remove action from context * remove complex environment handling, we only use Env variable * restore ReplaceAllParams to fix the tests	5 years ago
Will Browne	2616580bae	allow for appropriate content-type to be set (#36545 )	5 years ago
Nathan Rodman	a0dac9c6d9	Alerting: Add alertmanager notifications tab (#35759 ) * Add alertmanager notifications tab * Link to silences page from am alert * Include summary for alertmanager group * Fix colors for am state * Add horizontal dividing line * PR feedback * Add basic unit test for alert notificaitons * Rename Notificaitons component file * Polling interval to groups * Add alertmanager notifications tab * Link to silences page from am alert * Include summary for alertmanager group * PR feedback * Add basic unit test for alert notificaitons * Rename Notificaitons component file * Alerting: make alertmanager notifications view responsive (#36067) * refac DynamicTableWithGuidelines * more responsiveness fixes * Add more to tests * Add loading and alert state for notifications Co-authored-by: Domas <domas.lapinskas@grafana.com>	5 years ago
Will Browne	333d520528	Plugins: Improve API response for plugin assets (#36352 ) * improve API response for plugin assets 403 * remove unnecessary newline	5 years ago
idafurjes	60ac54d969	Chore: Refactor OAuth/social package to service (#35403 ) * Creating SocialService * Add GetOAuthProviders as socialService method * Add OAuthTokenService * Add GetOAuthHttpClient method to SocialService * Rename services, access socialMap from GetConnector * Fix tests by mocking oauthtoken methods * Move NewAuthService into Init * Move OAuthService to social pkg * Refactor OAuthService to OAuthProvider * Fix nil map error, rename file, simplify tests * Fix bug for Forward OAuth Identify * Remove file after rebase	5 years ago
Dimitris Sotirakis	a18d3007a7	Folders: Return `409 Conflict` status when folder already exists (#36429 ) * Return 409 Conflict when trying to post folder that already exists * Fix tests * Update documentation for new error message in folders api	5 years ago
Sergey Kostrukov	89ba607382	AzureMonitor: strongly-typed AzureCredentials and correct resolution of auth type and cloud (#36284 )	5 years ago
Tharun Rajendran	1ab452e88a	API: Fix 404 status code plugin pages (#36402 )	5 years ago
Karl Persson	2fd7031102	Access Control: Add fine-grained access control to explore (#35883 ) * add fixed role for datasource read operations * Add action for datasource explore * add authorize middleware to explore index route * add fgac support for explore navlink * update hasAccessToExplore to check if accesscontrol is enable and evalute action if it is * add getExploreRoles to evalute roles based onaccesscontrol, viewersCanEdit and default * create function to evaluate permissions or using fallback if accesscontrol is disabled * change hasAccess to prop and derive the value in mapStateToProps * add test case to ensure buttons is not rendered when user does not have access * Only hide return with changes button * remove internal links if user does not have access to explorer Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>	5 years ago
Selene	ef05596e07	Allow white labeling loading logo (#36174 ) * Allow to whitelabeling loading logo * Add loading_logo to documentation * Change loading_logo to loading_logo_url	5 years ago

1 2 3 4 5 ...

2208 Commits (e47a60f511fc2c923f6ef596d8ff780ec6f11cde)