IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,089 Commits 1,119 Branches 715 Tags
bc8353ae140b23f177fe15e7b888d0ab21d7195b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Efraimsson bc8353ae14 Merge branch 'master' into dashboard-acl-ux2 2018-04-16 21:19:01 +02:00
Marcus Efraimsson 90ed046ce3 docs: elasticsearch and influxdb docs for group by time interval option (#11609) 2018-04-16 16:03:50 +02:00
Marcus Efraimsson 645658d797 changlelog: notes about closing issues/pr's 
#11053, #11252, #10836, #11185, #11168, #11332, #11391, #11073, #9342, #11001, #11183, #11211, #11384, #11095, #10792, #11138, 
#11516
[skip ci]
 2018-04-16 13:08:00 +02:00
Marcus Efraimsson 511b34eb5c docs: improves provisoning example for postgres 
[skip ci]
 2018-04-13 16:37:49 +02:00
Marcus Efraimsson f5363227ff Merge pull request #11423 from bergquist/provisioning_datasources_examples 
docs: adds provisioning examples for all datasources
 2018-04-13 15:36:28 +02:00
Marcus Efraimsson a6a45afc2b Merge branch 'master' into provisioning_datasources_examples 2018-04-13 15:25:28 +02:00
Marcus Efraimsson 14bf067263 docs: improves provisoning example for each datasource 2018-04-13 15:25:13 +02:00
Marcus Efraimsson 55d262655a changelog: adds note for #11569 
[skip ci]
 2018-04-13 11:06:57 +02:00
Marcus Efraimsson 167d5aebe6 Merge pull request #11576 from flopp999/patch-3 
change default annotation limit from 10 to 100 when querying api
 2018-04-13 10:55:01 +02:00
Marcus Efraimsson 224a0eb0d3 Merge branch 'master' into sql-uint64 2018-04-12 19:12:45 +02:00
Marcus Efraimsson a86ee304ff tsdb: remove unnecessary type casts in sql data sources macro engines 2018-04-12 19:08:35 +02:00
Marcus Efraimsson f5586b1270 tsdb: sql data sources should handle time ranges before epoch start correctly 2018-04-12 18:53:12 +02:00
Marcus Efraimsson a3874ce2c7 Merge branch 'master' into sql-uint64 2018-04-12 18:49:27 +02:00
Marcus Efraimsson cdcaaa5d03 minor scrollbar fixes 
Hide page scrollbar when rendering using phantomjs.
Hide baron scrollbar when rendering using phantomjs.
 2018-04-11 20:12:32 +02:00
Marcus Efraimsson a1b53674a9 dashboard: show baron scrollbar in dashboard panel when mouse is over 
This should make the scrolling user experience much better since it
will highlight and show that content actually can be scrolled when
hovering over a panel.
 2018-04-11 18:12:48 +02:00
Marcus Efraimsson 9549aadd26 fix so that page scrollbars can be scrolled by keyboard on page load 
The page scrollbars are custom, not rendered on the body element and
with css property overflow set for scroll to be enabled.
For being able to scroll the page using the keyboard when a
page loads, some custom code was needed.
This fix should both work when doing a full reload of a url and when
navigating to other pages/dashboards.
For those pages having an input field that are focused on load,
scrolling by keyboard (arrow up/down) will obviously not work.
 2018-04-11 17:49:40 +02:00
Marcus Efraimsson 2956011b60 fix so that dash list panel are rendered correctly 
This resolves issue with dash list panel getting scrollbars
    attached to incorrect elements. Now the panel content are
    rendered correctly and all content are displayed as
    expected.
 2018-04-11 17:44:51 +02:00
Marcus Efraimsson 8c04eb272d panel: add baron scroller to correct element 
This resolves issue with alert list panel getting scrollbars
attached to incorrect element. Now the panel content are
rendered correctly and all content are displayed as
expected.
 2018-04-11 17:41:20 +02:00
Marcus Efraimsson be4b715aad docker: change mysql container so that it uses utc 2018-04-10 16:59:48 +02:00
Marcus Efraimsson 6cb891dca8 mysql: use a datetime column with microsecond precision in test 2018-04-10 16:37:39 +02:00
Marcus Efraimsson 97f67ddcb8 tsdb: improved floating point support when converting sql time column to epoch (ms) 2018-04-10 16:36:00 +02:00
Marcus Efraimsson 9d84e6f31f mssql: fix precision for time columns in time series query mode 2018-04-10 11:10:56 +02:00
Marcus Efraimsson 0317ecbf0d postgres: support running multiple postgres integration tests 
Makes it possible to run mysql integration tests for both
grafana config db and tsdb at the same time using
GRAFANA_TEST_DB=postgres go test ./pkg/...
 2018-04-10 11:08:30 +02:00
Marcus Efraimsson 1783c534fd postgres: fix precision for time columns in time series query mode 2018-04-10 11:07:01 +02:00
Marcus Efraimsson af62646624 mysql: fix precision for time columns in time series query mode 2018-04-10 11:01:43 +02:00
Marcus Efraimsson 5c120c2c11 mysql: mysql tests should use a db server with UTC 
To get rid of issues involving date/time when testing.
Also, makes it possible to run mysql integration tests for both
grafana config db and tsdb at the same time using
GRAFANA_TEST_DB=mysql go test ./pkg/...
 2018-04-10 10:58:45 +02:00
Marcus Efraimsson a314890f89 tsdb: add support for more data types when converting sql time column to epoch (ms) 2018-04-10 10:33:23 +02:00
Marcus Efraimsson 95132165f8 data source: rename direct/proxy access mode in data source settings 
Changes access drop down options names:
- proxy -> Server (Default)
- direct -> Browser
Replace access drop down info icon/tooltip with expandable/collapsable
help section.
 2018-04-09 12:47:19 +02:00
Marcus Efraimsson 166778b32a Merge pull request #11439 from grafana/ldap-block 
docker: add users and groups to ldap block
 2018-04-05 15:30:11 +02:00
Marcus Efraimsson 94d1a9fd83 Merge pull request #11430 from grafana/11332_esc_timepicker 
Enable closing timepicker using escape key
 2018-04-05 15:11:34 +02:00
Marcus Efraimsson 8f94cecf0f permissions: return user and team avatar in folder permissions api 2018-04-04 15:51:19 +02:00
Marcus Efraimsson ebad863f95 permission: generate team avatar url with default 2018-04-04 15:50:45 +02:00
Marcus Efraimsson 9841c81952 Notes for closing #7119 
[skip ci]
 2018-04-04 13:40:08 +02:00
Marcus Efraimsson b41370ca49 Merge pull request #11421 from this-is-angus/patch-1 
Fixed typo in upgrading.md
 2018-03-28 16:37:50 +02:00
Marcus Efraimsson 95a4d61d10 Merge pull request #11094 from infernix:value-to-text-upstream 2018-03-27 19:06:40 +02:00
Marcus Efraimsson f673ec16d1 table panel: additional fixes for value to text mapping 
Make the value to text mapping more similar to singlestat solution.
Adds more tests.
Also, allows string to be mapped to other string besides numeric values.
 2018-03-27 19:04:45 +02:00
Marcus Efraimsson 52164b0685 notes about closing #9210 
[skip ci]
 2018-03-27 14:13:49 +02:00
Marcus Efraimsson da83964a7e notes about closing #11306 
[skip ci]
 2018-03-23 16:41:08 +01:00
Marcus Efraimsson 63465fd556 changelog: notes for #1271 and #2740 
[skip ci]
 2018-03-22 19:19:56 +01:00
Marcus Efraimsson 1ee0d1c296 Merge pull request #10994 from ilgizar/1271_share_zero 2018-03-22 18:34:38 +01:00
Marcus Efraimsson f04a5d7329 Merge branch 'master' into 1271_share_zero 2018-03-22 18:31:37 +01:00
Marcus Efraimsson c672e44d35 graph: minor fixes to y-axes alignment feature 2018-03-22 18:30:23 +01:00
Marcus Efraimsson 4af3a7875a Merge pull request #11349 from grafana/save_trash 
Fix save icon in folder settings
 2018-03-22 18:21:28 +01:00
Marcus Efraimsson 2e8aeffc13 Merge branch 'master' into 1271_share_zero 2018-03-22 16:59:36 +01:00
Marcus Efraimsson b818e9f619 Merge branch 'master' into 11306-sql-table-time 2018-03-22 16:45:33 +01:00
Marcus Efraimsson f0f41c2a8e mysql: skip tests by default 2018-03-22 16:44:55 +01:00
Marcus Efraimsson bd4ecaeac6 mssql: update query editor help 2018-03-22 15:46:40 +01:00
Marcus Efraimsson f5654f88e2 mysql: fix precision for the time column in table/annotation query mode 
Use the ConvertSqlTimeColumnToEpochMs function to convert any native
datetime data type or epoch time (millisecond precision).
Refactored mysql implementation to make it more similar to postgres
and mssql implementations.
Added $__timeEpoch macro function with same implementation as $__time.
Added possibility to use a time column named time in addition to
the currectly supported time_sec.
Additional tests and update of existing.
Added test dashboard.
 2018-03-22 15:40:46 +01:00
Marcus Efraimsson 66c03f84f5 postgres: fix precision for the time column in table/annotation query mode 
Use the ConvertSqlTimeColumnToEpochMs function to convert any native
datetime data type or epoch time (millisecond precision).
Additional tests and update of existing due to timezone issues
running postgres on UTC and dev environment on non-utc.
Added test dashboard.
 2018-03-22 15:32:33 +01:00
Marcus Efraimsson b69ebee066 mssql: fix precision for the time column in table/annotation query mode 
Use the ConvertSqlTimeColumnToEpochMs function to convert any native
datetime data type or epoch time (millisecond precision).
Additional tests and update of existing due to timezone issues
running MSSQL on UTC and dev environment on non-utc.
Update stored procedures test to handle more parameters.
Update test dashboard.
 2018-03-22 15:23:12 +01:00
Marcus Efraimsson b0076d4f65 mssql: remove UTC conversion in macro functions 
Removes the macro function . Macro functions should not do UTC/timezone conversion - they should
work in the same way as postgres and mysql datasource implementations.
Grafana and Microsft SQL Server should be run on servers with UTC timezones.
 2018-03-22 14:55:44 +01:00
Marcus Efraimsson 3ccadff800 mssql: fix timeGroup macro so that it properly creates correct groups 
Earlier the division of interval was done using whole numbers resulting in that important information
was lost/too many time series merged to the same group. Now using division of floating point and rounding
up to solve the problem
 2018-03-22 14:49:40 +01:00
Marcus Efraimsson 42299eb328 Merge branch 'master' into 11306-sql-table-time 2018-03-21 12:08:48 +01:00
Marcus Efraimsson 3cb0bc3da1 sql datasource: extract common logic for converting time column to epoch time in ms 2018-03-21 11:20:15 +01:00
Marcus Efraimsson 9df5476fe3 Merge pull request #11312 from grafana/func_editor_js_to_ts 
convert func_editor.js to typescript
 2018-03-20 20:51:58 +01:00
Marcus Efraimsson de396b277e Merge pull request #11309 from grafana/add_graphite_func_js_to_ts 
convert add_graphite_func.js to typescript
 2018-03-20 20:51:21 +01:00
Marcus Efraimsson 51cbf23c4a changelog: notes about #10093 and #11298 
[ci skip]
 2018-03-20 12:26:37 +01:00
Marcus Efraimsson 720711d1fe fix: only run gofmt on pkg directory omitting vendor directory 2018-03-20 09:24:04 +01:00
Marcus Efraimsson b816f18b3d fix: dep ensure. now without gofmt on ventor directory 2018-03-20 09:23:18 +01:00
Marcus Efraimsson 192e913b7b mssql: add integration test to verify stored procedure usage 2018-03-19 19:56:34 +01:00
Marcus Efraimsson 8f6626e805 mssql: encrypt password in database 2018-03-19 17:32:51 +01:00
Marcus Efraimsson 6044b3aeeb Merge branch 'master' into mssql_datasource 2018-03-19 17:14:33 +01:00
Marcus Efraimsson 449a307575 mssql: remove dynamic construction of metric column and other columns 
This seems like a niche feature which can be solved by defining multiple queries. In the future
we'll probably add support for defining series name by alias field similar to how other datasources
have solved that, e.g. prometheus.
 2018-03-19 17:14:01 +01:00
Marcus Efraimsson b8e2414e46 docker: pin microsoft/mssql-server-linux to 2017-CU4 tag 2018-03-19 16:39:50 +01:00
Marcus Efraimsson 4eb4ba67bd fix: dep ensure. now without gofmt on ventor directory 2018-03-19 14:15:36 +01:00
Marcus Efraimsson f5e02d6508 fix: only run gofmt on pkg directory omitting vendor directory 2018-03-19 14:14:38 +01:00
Marcus Efraimsson a2eaf3954a test 2018-03-19 14:06:05 +01:00
Marcus Efraimsson d14946a135 mssql: cleanup and minor refactor 2018-03-19 13:32:04 +01:00
Marcus Efraimsson 24c0f28f41 mssql: allow host without port and fallback to default port 1433 2018-03-19 13:24:31 +01:00
Marcus Efraimsson 2802fe3f3e docker: update test dashboard for mssql tests 2018-03-19 13:07:26 +01:00
Marcus Efraimsson 62174c81c8 mssql: cleanup and minor changes 2018-03-19 13:06:46 +01:00
Marcus Efraimsson 8c2f3f761b mssql: update readme 2018-03-19 11:20:17 +01:00
Marcus Efraimsson 03d15f7955 mssql: update test dashboard 2018-03-19 11:08:53 +01:00
Marcus Efraimsson 294ee5a610 Merge branch 'master' into mssql_datasource 2018-03-19 11:03:13 +01:00
Marcus Efraimsson 74a98d46eb mssql: remove logos for now 2018-03-19 11:02:55 +01:00
Marcus Efraimsson e1c4a27d1d docs: mssql documentation will go into another branch targeting next minor version 2018-03-19 11:02:01 +01:00
Marcus Efraimsson d26d8c713e Merge branch 'master' into mssql_datasource 2018-03-16 15:19:19 +01:00
Marcus Efraimsson 06afd24a10 mssql: add alternative logo without text 2018-03-16 15:18:05 +01:00
Marcus Efraimsson 1c7aff7810 mssql: strip inkscape from logo 2018-03-16 15:17:25 +01:00
Marcus Efraimsson 69b9fb6d15 mssql: minor improvements of query editor help 2018-03-16 15:11:15 +01:00
Marcus Efraimsson ccd57fbfa3 mssql: skip rendering of mssql logos until we have a valid logo 2018-03-16 14:47:43 +01:00
Marcus Efraimsson 673c8290fb docker: add test dashboard for mssql tests based on test data generated by integration test 2018-03-16 14:44:26 +01:00
Marcus Efraimsson e97b03e930 mssql: additional integration tests 
Metric query of table having multiple value columns
Annotation query
 2018-03-16 14:42:54 +01:00
Marcus Efraimsson f0f8006d8d mssql: support money, smallmoney and decimal data types 2018-03-16 14:37:16 +01:00
Marcus Efraimsson a6e4ac5484 mssql: update plugin.json, added description and name MSSQL -> Microsft SQL Server 2018-03-16 14:26:05 +01:00
Marcus Efraimsson 7dfa159ba1 docs: update mssql documentation 2018-03-15 17:19:07 +01:00
Marcus Efraimsson 9144701fcc mssql: disable mssql integration tests per default 2018-03-15 15:27:31 +01:00
Marcus Efraimsson faf9e3f722 mssql: add timeGroup integration test 2018-03-15 14:26:53 +01:00
Marcus Efraimsson d2267643ed Merge branch 'master' into mssql_datasource 2018-03-15 09:53:19 +01:00
Marcus Efraimsson eef01e3703 docker: change port for prom random data scrape target 2018-03-15 09:52:53 +01:00
Marcus Efraimsson 3d0f97aab9 mssql datasource: wip 2018-03-15 09:51:29 +01:00
Marcus Efraimsson ef3588c1f8 docker: mssql and mssql tests blocks with common build context 2018-03-15 09:49:53 +01:00
Marcus Efraimsson 61e1c12fee docker: fake-data-gen:latest updates 
fake-data-gen for elastic 2.4 and 5 blocks, new graphite 1.1+ block.
added big dashboard for graphite 1 and 1.1+ that can be imported to grafana
 2018-03-14 20:47:52 +01:00
Marcus Efraimsson 87284d284e dashboard: fix import dashboard with alert rule 
Importing a dashboard with alert rule(s) should be possible without receiving invalid
alert data error. This fix reverts the import logic to how it worked before Grafana v5.0,
that is import will allow dashboard with alert rule(s) but no alerts will be created.
After an import the user will need to update the dashboard for the alerts to be created.
Fixes #11227
 2018-03-14 14:24:56 +01:00
Marcus Efraimsson 6503e482e3 docker: add test dashboard for mssql for visualizing data generated by fake-data-gen 2018-03-13 23:07:40 +01:00
Marcus Efraimsson c87752102a mssql datasource: support for timeGroup macro function 2018-03-13 22:49:49 +01:00
Marcus Efraimsson 91fa076fb3 folders: should be possible to browse folder using only uid 
That is, the slug part of url should be optional.
 2018-03-13 21:32:37 +01:00
Marcus Efraimsson 5fbfd67b94 dashboards: should be possible to browse dashboard using only uid 
That is, the slug part of url should be optional.
Closes #11231
 2018-03-13 21:06:25 +01:00
Marcus Efraimsson 57d46a706c mssql datasource: additional data type tests 2018-03-13 19:54:29 +01:00
Marcus Efraimsson e7b790316e docker: add mssql block 2018-03-13 17:03:10 +01:00