- 12 Oct, 2017 2 commits
-
-
bergquist committed
-
https://github.com/mattbostock/grafana…
Merge branch 'verify_datasource_tls' of https://github.com/mattbostock/grafana into mattbostock-verify_datasource_tls
bergquist committed
-
- 11 Oct, 2017 9 commits
-
-
I renamed `tlsAuth` to `tlsClientAuth` to better describe the fact that this variable is used to enable TLS client authentication (as opposed to server authentication) in c04d95f35. However, changing the name breaks backwards compatibility for existing installations using this feature and Grafana does not have a standardised way of migrating changes in the schema: https://github.com/grafana/grafana/pull/9377#issuecomment-333063543 For reasons of expediency given the severity of the bug (not verifying TLS), keep the old name.
Matt Bostock committed -
Matt Bostock committed
-
It's an acronym, so it should be all caps.
Matt Bostock committed -
In c04d95f35 I changed the default for datasource HTTP requests so that TLS is always verified. This commit adds a checkbox to allow an admin to explicitly skip TLS verification, for testing purposes.
Matt Bostock committed -
URL is an acronym, it should be all caps.
Matt Bostock committed -
...to make this file compatible with goimports: https://godoc.org/golang.org/x/tools/cmd/goimports
Matt Bostock committed -
Matt Bostock committed
-
Matt Bostock committed
-
Matt Bostock committed
-
- 09 Oct, 2017 7 commits
-
-
Patrick O'Carroll committed
-
* colorpicker: fix opening error when color is undefined * colorpicker: replace spectrum picker by new color picker * colorpicker: remove old spectrum picker directive * annotations: use tinycolor for working with region colors
Alexander Zobnin committed -
Axel committed
-
Macaron's gzip middleware tries to automatically figure out the content type for a file when gzipped and seems to mostly fail with plugin readmes. This change sets the content type to plain text. Fixes #9344. Ref #5952.
Daniel Lee committed -
bergquist committed
-
Torkel Ödegaard committed
-
Torkel Ödegaard committed
-
- 08 Oct, 2017 2 commits
-
-
At least in my Postgresql 9.6.5, the old syntax of capitalized queries doesn't work (Linux).<br> Running with UTF-8 as standard encoding and the ` notations didn't work either, so removed those.
Anton Hvornum committed -
Torkel Ödegaard committed
-
- 07 Oct, 2017 3 commits
-
-
Torkel Ödegaard committed
-
Torkel Ödegaard committed
-
* annotations: add 25px space for events section * annotations: restored create annotation action * annotations: able to use fa icons as event markers * annotations: initial emoji support from twemoji lib * annotations: adjust fa icon position * annotations: initial emoji picker * annotation: include user info into annotation requests * annotation: add icon info * annotation: display user info in tooltip * annotation: fix region saving * annotation: initial region markers * annotation: fix region clearing (add flot-temp-elem class) * annotation: adjust styles a bit * annotations: minor fixes * annoations: removed userId look in loop, need a sql join or a user cache for this * annotation: fix invisible events * lib: changed twitter emoij lib to be npm dependency * annotation: add icon picker to Add Annotation dialog * annotation: save icon to annotation table * annotation: able to set custom icon for annotation added by user * annotations: fix emoji after library upgrade (switch to 72px) * emoji: temporary remove bad code points * annotations: improve icon picker * annotations: icon show icon picker at the top * annotations: use svg for emoji * annotations: fix region drawing when add annotation editor opened * annotations: use flot lib for drawing region fill * annotations: move regions building into event_manager * annotations: don't draw additional space if no events are got * annotations: deduplicate events * annotations: properly render cut regions * annotations: fix cut region building * annotations: refactor * annotations: adjust event section size * add-annotations: fix undefined default icon * create-annotations: edit event (frontend part) * fixed bug causes error when hover event marker * create-annotations: update event (backend) * ignore grafana-server debug binary in git (created VS Code) * create-annotations: use PUT request for updating annotation. * create-annotations: fixed time format when editing existing event * create-annotations: support for region update * create-annotations: fix bug with limit and event type * create-annotations: delete annotation * create-annotations: show only selected icon in edit mode * create-annotations: show event editor only for users with at least Editor role * create-annotations: handle double-sized emoji codepoints * create-annotations: refactor use CP_SEPARATOR from emojiDef * create-annotations: update emoji list, add categories. * create-annotations: copy SVG emoji into public/vendor/npm and use it as a base path * create-annotations: initial tabs for emoji picker * emoji-picker: adjust styles * emoji-picker: minor refactor * emoji-picker: refactor - rename and move into one directory * emoji-picker: build emoji elements on app load, not on picker open * emoji-picker: fix emoji searching * emoji-picker: refactor * emoji-picker: capitalize category name * emoji-picker: refactor move buildEmojiElem() into emoji_converter.ts for future reuse. * jquery.flot.events: refactor use buildEmojiElem() for making emojis, remove unused code for font awesome based icons. * emoji_converter: handle converting error * tech: updated * merged with master * shore: clean up some stuff * annotation: wip tags * annotation: filtering by tags * tags: parse out spaces etc. from a tags string * annotations: use tagsinput component for tag filtering * annotation: wip work on how we query alert & panel annotations * annotations: support for updating tags in an annotation * linting * annotations: work on unifying how alert history annotations and manual panel annotations are created * tslint: fixes * tags: create tag on blur as well Currently, the tags directive only creates the tag when the user presses enter. This change means the tag is created on blur as well (when the user clicks outside the input field). * annotations: fix update after refactoring * annotations: progress on how alert annotations are fetched * annotations: minor progress * annotations: progress * annotation: minor progress * annotations: move tag parsing from tooltip to ds Instead of parsing a tag string into an array in the annotation_tooltip class, this moves the parsing to the datasources. InfluxDB ds already does that parsing. Graphite now has it. * annotations: more work on querying * annotations: change from tags as string to array when saving in the db and in the api. * annotations: delete tag link if removed on edit * annotation: more work on depricating annotation title * annotations: delete tag links on delete * annotations: fix for find * annotation: added user to annotation tooltip and added alertName to annoation dto * annotations: use id from route instead from cmd for updating * annotations: http api docs * create annotation: last edits * annotations: minor fix for querying annotations before dashboard saved * annotations: fix for popover placement when legend is on the side (and doubel render pass is causing original marker to be removed) * annotations: changing how the built in query gets added * annotation: added time to header in edit mode * tests: fixed jshint built issue
Torkel Ödegaard committed
-
- 06 Oct, 2017 2 commits
-
-
Lucas Costa committed
-
Alexander Zobnin committed
-
- 05 Oct, 2017 15 commits
-
-
This reverts commit 213ba037.
Torkel Ödegaard committed -
This modification aim to allow users to set value via textMapping and these values to be used in background coloring as it text coloring. This pull request closes #8404, but doesn't agree with #9012. The issue #9012 consider that no coloring output should be put when there is no data. I partially agree with this as I explicitely setted a value in the textMapping I obviously want to treat `N/A` as a number. `data.valueFormatted` contain the stringified version of `data.value` If `Number()` cannot convert a string into a number a `NaN` value is returned. So the code is still valid if the inputted value in `data.valueFormatted` is not a number.
Adrien Raffin-Caboisse committed -
Torkel Ödegaard committed
-
Patrick O'Carroll committed
-
Patrick O'Carroll committed
-
* updated the codeboxes in docs * codebox change from json to http
Patrick O'Carroll committed -
* colorpicker: fix spectrum color update on series color picker * colorpicker: minor refactor
Alexander Zobnin committed -
fix typo in readme
Carl Bergquist committed -
Geno committed
-
fixed layout for column options, changed dropdown for date format kep…
Carl Bergquist committed -
Patrick O'Carroll committed
-
Fixed typo
Carl Bergquist committed -
bergquist committed
-
shabscan committed
-
Feature/enhance hipchat card
Carl Bergquist committed
-