Commit Graph
17953 Commits
Author SHA1 Message Date
ryan b888aeec0d Merge remote-tracking branch 'grafana/master'
* grafana/master: (39 commits)
  update package.json to next version
  changelog: add notes about closing #13815
  changelog: add notes about closing #14246
  changelog: add notes about closing #12653
  Hid "Forgot your password" link from login menu when reset is disabled
  Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled
  update changelog
  update latest.json to latest stable version
  new stable docs version
  dataproxy: Override incoming Authorization header
  changelog: add notes about closing #14228
  Explore: Show logging errors from backend
  change obj order when merging so that correct format is being used
  Explore: Fix logging query parser for regex with quantifiers
  Update README.md
  Fixed typo in function name
  Explore: Fix label and history suggestions
  let each sql datasource handle timeFrom and timeTo macros
  Review feedback
  changelog: add notes about closing #14167
  ...
2018-12-03 08:14:13 -08:00
Marcus Efraimsson e9a8185da1 update package.json to next version 2018-12-03 16:49:32 +01:00
Marcus Efraimsson 5641f45349 changelog: add notes about closing #13815 2018-12-03 15:52:16 +01:00
Marcus Efraimsson 95218c13ce Merge pull request #14262 from kornholi/fix/dataproxy-auth
dataproxy: Override incoming Authorization header
2018-12-03 06:49:31 -08:00
Marcus Efraimsson b54061f4bd changelog: add notes about closing #14246 2018-12-03 15:04:48 +01:00
Marcus Efraimsson ffec795fab Merge pull request #14232 from SilverFire/security-password-reset
Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled
2018-12-03 06:02:29 -08:00
Marcus Efraimsson 4de28ef88a changelog: add notes about closing #12653 2018-12-03 14:47:02 +01:00
Marcus Efraimsson acb45867f8 Merge pull request #14179 from mattiarossi/master
Add support for offset in date histogram aggregation
2018-12-03 05:43:42 -08:00
SilverFire - Dmitry Naumenko 257802e750 Hid "Forgot your password" link from login menu when reset is disabled 2018-12-03 15:35:25 +02:00
SilverFire - Dmitry Naumenko 474197269e Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled 2018-12-03 15:32:26 +02:00
Torkel Ödegaard d16b348868 Merge pull request #14257 from grafana/davkal/fix-14250
Explore: Fix logging query parser for regex with quantifiers
2018-12-03 12:25:10 +01:00
Marcus Efraimsson 246c1ca79d update changelog 2018-12-03 12:18:11 +01:00
Marcus Efraimsson 9c1c21eed2 update latest.json to latest stable version 2018-12-03 12:17:02 +01:00
Marcus Efraimsson 5c4b91c65e new stable docs version 2018-12-03 12:16:08 +01:00
David ba18b470a4 Merge pull request #14260 from grafana/davkal/fix-14258
Explore: Show logging errors from backend
2018-12-03 10:00:22 +01:00
Carl Bergquist 3c8515bb77 Merge pull request #14220 from mjtrangoni/fix-misspell-issues
Fix misspelling issues using locale US
2018-12-03 09:18:46 +01:00
Kornelijus Survila 0cafd9a663 dataproxy: Override incoming Authorization header 2018-11-30 12:12:55 -07:00
David fab2597650 Merge pull request #14259 from grafana/14237-prevent-table-crash
change obj order when merging so that correct format is being used
2018-11-30 16:37:50 +01:00
Marcus Efraimsson 314152ebf6 changelog: add notes about closing #14228 2018-11-30 16:24:24 +01:00
Marcus Efraimsson 901ec01992 Merge pull request #14254 from grafana/14228_mysql_time_from_to
Fix mysql $__timeFrom() and $__timeTo() should respect local time zone
2018-11-30 07:22:34 -08:00
Marcus Efraimsson 1abbdaaaae Merge pull request #14241 from yukihiratype2/master
Update README.md
2018-11-30 07:19:46 -08:00
David c441b9eec3 Merge pull request #14256 from grafana/davkal/fix-14245
Explore: Fix label and history suggestions
2018-11-30 16:16:16 +01:00
David Kaltschmidt 47468fca68 Explore: Show logging errors from backend
- Logging datasource sends error string directly in the message body
- allowing response body to be an error when query transaction failed
- added throw in case we ever encounter unhandled errors again (forces us to fix the issue)
2018-11-30 16:09:56 +01:00
Erik Sundell 12ba314e24 change obj order when merging so that correct format is being used 2018-11-30 15:58:01 +01:00
David Kaltschmidt 11a53763e2 Explore: Fix logging query parser for regex with quantifiers
- ensure that selectors have to be preceded by whitespace or line beginning
- glacing over the fact that ` {0,1}` could be a valid regexp, but we're using space as query/regexp separators anyway, so I think it's fine for now
2018-11-30 15:49:54 +01:00
Minamiya_Natsuki ecddf9d408 Update README.md 2018-11-30 22:47:57 +08:00
David 088c2e70d8 Merge pull request #14236 from grafana/davkal/explore-logging-rendeer
Explore: Logging render performance
2018-11-30 15:37:24 +01:00
David Kaltschmidt a513130493 Fixed typo in function name 2018-11-30 15:19:09 +01:00
David Kaltschmidt a61c8d23d4 Explore: Fix label and history suggestions
- fork promql's tokenizer (need to specify that labels context can only follow beginning of line or whitespace)
- remove unneeded syntax features
- only present history items when field is empty
2018-11-30 15:13:53 +01:00
Marcus Efraimsson 624e5e5b3d let each sql datasource handle timeFrom and timeTo macros 2018-11-30 14:30:02 +01:00
David Kaltschmidt 979f3f3e0c Review feedback
- fixed typo
- moved result calculation to explore utils
- use component keys instead of componentWillReceiveProps
- require logs to have and id, to as use as Logs component key
- render delay based on row count
2018-11-30 12:26:57 +01:00
Marcus Efraimsson 1052b17af8 changelog: add notes about closing #14167 2018-11-30 09:53:21 +01:00
Marcus Efraimsson e2e66ae608 Merge pull request #14238 from mmcoltman/14167-cloudwatch_add_codebuild
Add AWS/CodeBuild namespace for CloudWatch datasource
2018-11-30 00:50:27 -08:00
Minamiya_Natsuki 2db3464044 Update README.md
add notice to MacOS Docker user, if docker  memory limit is less than 2GiB, build process may fail when run ./node_modules/.bin/grunt build
2018-11-30 12:59:10 +08:00
Matthew Coltman bbd0ec3a8b Add AWS/CodeBuild namespace for CloudWatch datasource 2018-11-29 21:02:44 +01:00
Mario Trangoni e4771a88dd Fix other misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e node_modules -e devenv -e unknwon -e destory -e yarn -e adn -e Spindel
2018-11-29 18:15:16 +01:00
Mario Trangoni 5d60d323e2 docs/*: Fix misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e node_modules -e devenv -e unknwon | grep docs
2018-11-29 18:14:20 +01:00
Mario Trangoni 9c1b4793a6 CHANGELOG.md: Fix misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -v -e vendor -e node_modules -e devenv | grep CHANGELOG.md
./CHANGELOG.md:163:60: "organisation" is a misspelling of "organization"
./CHANGELOG.md:286:13: "Litre" is a misspelling of "Liter"
./CHANGELOG.md:394:163: "Spindel" is a misspelling of "Spindle"
./CHANGELOG.md:421:51: "metre" is a misspelling of "meter"
./CHANGELOG.md:738:73: "dashboad" is a misspelling of "dashboard"
./CHANGELOG.md:903:18: "organisation" is a misspelling of "organization"
./CHANGELOG.md:1031:48: "organisation" is a misspelling of "organization"
./CHANGELOG.md:1170:51: "cancelled" is a misspelling of "canceled"
./CHANGELOG.md:1874:97: "muliple" is a misspelling of "multiple"
./CHANGELOG.md:1909:60: "fullscren" is a misspelling of "fullscreen"
2018-11-29 18:14:20 +01:00
David Kaltschmidt ae26f7126f Explore: Logging render performance
- moved from grid to flexbox
- calculate Explore results only when query transactions change to prevent expensive re-renders
- split up rendering of graph and log data
- render log results in 2 stages
2018-11-29 17:30:11 +01:00
David 8024a6aa9f Merge pull request #14214 from grafana/davkal/explore-logging-label-filter
Explore: Logging label filtering
2018-11-29 13:19:35 +01:00
Carl Bergquist 9b20c9c3a5 Merge pull request #14225 from zicklam/patch-3
removed extra whitespace
2018-11-29 10:00:09 +01:00
Carl Bergquist 486ece329b Merge pull request #14227 from zicklam/patch-4
added google_tag_manager_id from defaults.ini
2018-11-29 09:59:35 +01:00
Florian Zicklam 3000818ab3 added google_tag_manager_id from defaults.ini 2018-11-29 09:30:03 +01:00
Florian Zicklam d86ba20d10 removed extra whitespace
removed extra whitespace
2018-11-29 09:21:06 +01:00
Carl Bergquist 9785a8aba0 Merge pull request #14219 from orojina/patch-1
Update export_import.md
2018-11-29 08:24:09 +01:00
Omar Alejandro González Rojina 804bd822d0 Update export_import.md
Grafana v5.3.4 shows a new checkbox in the export modal "Export for sharing externally". If the checkbox is not checked then the "__inputs" section wont be included into the exported JSON file, would be great to add that note into the documentation for others to avoid confusions.
2018-11-28 11:17:36 -06:00
David Kaltschmidt c3b67f3a13 Explore: Logging label filtering
- adds a custom label renderer to Logs viewer in Explore
- labels are no longer treated as strings, they are passed as parsed objects to the log row
- label renderer supports onClick handler for an action
- renamed Explore's `onClickTableCell` to `onClickLabel` and wired up log label renderers
- reuse Prometheus `addLabelToSelector` to modify Logging queries via click on label
- added tests to `addLabelToSelector`, changed to include the surrounding `{}`
- use label render also for common labels in the controls panel
- logging meta data section has now a custom renderer that can render numbers, strings, and labels
- style adjustments
2018-11-28 14:20:10 +01:00
David 8830c133d1 Merge pull request #14215 from grafana/davkal/fix-logging-selector-parsing
Logging: fix query parsing for selectors with multiple labels
2018-11-28 14:17:32 +01:00
David Kaltschmidt 9c316b55e9 Logging: fix query parsing for selectors with multiple labels
- simplify selector parsing
- added tests
2018-11-28 14:03:47 +01:00
David 32511533c3 Merge pull request #14178 from grafana/davkal/explore-scan-log-range
Explore: Scan for older logs
2018-11-28 11:00:51 +01:00