Commit Graph

227 Commits

Author SHA1 Message Date
Marcus Andersson e8bfb21851
Build: changing docs docker image to prevent setting up frontend devenv. (#28670)
* Build: changing docs dev-environment

I have added a new image that will include the auto-generated frontend docs so you don't have to generate those locally prior to running the doc container. This has a dependency on this PR: https://github.com/grafana/website/pull/2744 and that we publish a version of the `grafana/docs-devenv` image.

* will ignore everything (even symbolic links)

* fixed spelling.

* added newline.

* updated image name.
2020-10-30 10:22:01 +01:00
Marcus Andersson 0bb33839f5
Docs: updated cmd to build docs locally to generate docs prior to building site. (#28371)
* added instructions so we generate docs prior to building them.

* replaced ci script.

* improved according to feedback.
2020-10-22 09:57:56 +02:00
Zoltán Bedi ae30482465
Chore: MEGA - Make Eslint Great Again 💅 (#26094)
* Fix lint error in types.ts

* Bump eslint and its deps to latest

* Add eslintignore and remove not needed eslintrcs

* Change webpack configs eslint config

* Update package.jsons and removed unused eslintrc files

* Chore yarn lint --fix 💅

* Add devenv to eslintignore

* Remove eslint disable comments for rules that are not used

* Remaining eslint fixes 💅

* Bump grafana/eslint-config 💥

* Modify package.json

No need for duplicate checks.

* Modify eslintignore to ignore data and dist folders

* Revert removing .eslintrc to make sure not to use certain packages

* Modify package.json to remove not needed command

* Use gitignore for ignoring paths
2020-08-11 17:52:44 +02:00
Marcus Andersson 1abbb477cf
TimeZone: unify the time zone pickers to one that can rule them all. (#24803)
* draft on a unified TimeZonePicker.

* most of the data structures is in place.

* wip.

* wip.

* wip: timezone selector in progress.2

* fixed so we have proper data on all timezones.

* started to add timezone into time picker.

* addeing time zone footer.

* footer is working.

* fixed so we use the timeZone picker in shared preferences.

* Added so we can change timeZone from picker.

* did some styling changes.

* will update timezone on all places that we need to update it.

* removed console.log

* removed magic string.

* fixed border on calendar.

* ignoring eslint cache.

* cleaned up the code a bit.

* made the default selectable.

* corrected so the behaviour about default works as expected.

* excluded timezone from change tracker.

* revert so default will always be the intial value.

* default will always fallback to the one in the config.

* do the country mapping on startup.

* fixed nit.

* updated snapshots for timepicker.

* fixed build errors.

* updating so snapshot tests is in sync.

* removed Date.now from prop since it will change each run in the snapshot tests.

* fixed so e2e tests works as before.

* moved files into separate folders.
2020-06-26 09:08:15 +02:00
Zoltán Bedi c16890c22d
Chore: use fork-ts-checker plugin for eslint check (#25631)
* Use fork-ts-checker for eslint check

* Fix lint issue

* Add packages to lint

* Add comments to webpack configs
2020-06-22 16:15:29 +02:00
Josh Soref ed92b41d47
Chore: spelling - misc (#24438)
* Chore: spelling - misc

* fix master merge
2020-06-04 06:51:30 +02:00
Hugo Häggmark 7d800e7318
e2e: adds verify release (#24568) 2020-05-12 12:48:26 +02:00
Leonard Gram 7a7dca232c
Devenv: ignore enterprise (#24037) 2020-04-29 10:57:29 +02:00
Kyle Brandt 6d500e31b9
Backend: Remove Go vendor folder (#23796) 2020-04-23 13:23:51 -04:00
Carl Bergquist 540d1d9b4e
Support using multiple datasources for testing bulk alerting. (#23258) 2020-04-01 20:55:37 +02:00
Hugo Häggmark a0d9851cb9
Chore: adds report.xxxx.json to gitignore (#23016) 2020-03-24 11:15:04 +01:00
Torkel Ödegaard 75d7f9072c
E2E: Add new run modes for e2e tests (#22795)
* WIP: started e2e tests for bar gauge

* Updated

* Updated

* Updated cypress from 3.7 -> 4.1

* reverted cypress upgrade

* Updated test

* Update e2e docs

* Updated docs
2020-03-16 14:35:55 +01:00
Torkel Ödegaard dfb3272bdb
E2E: Moving files & refactoring (#22787)
* E2E refactoring

* Updated circleci

* Updated lint paths
2020-03-13 18:48:38 +01:00
Torkel Ödegaard 64877baa82
E2E: Run e2e tests on PRs and easy local isolated e2e grafana server setup & conf (#22772)
* e2e: Trying to get end-2-end tests to run on PRs

* Probably need quotes here

* Change back to machine

* CI: only build amd64 docker

* lowercase docker image name

* Fixed docker image name

* added end-to-end-test

* Fixed paths

* Added setup_remote_docker

* Updated

* Minor tweak

* update

* Testing

* UpdateD#

* Making some progress

* Update

* Updated

* update

* Updated

* Updated

* testing

* Updated

* Updated

* Updated

* Updated

* updated

* Changed image

* Updated image

* updated

* Addd logging

* trying one more thing

* Fixed build-fast-frontend

* Updated

* Added devenv to end-to-end server setup

* removed file

* Updated

* Minor change

* Fixes

* Updated workspace, and tried to make naming and paths compatible with master & release jobs

* fixed syntax issue

* Updated truth

* Fixed path
2020-03-13 14:34:25 +01:00
Marcus Andersson e2038e0614
Docs: adding API reference documentation support for the packages libraries. (#21931)
* trying out api-extractor.

* works with our setup of build.

* wip.

* changed the packages so it works better with the api-extractor.

* Changes to make the api-extractor to work.

* cleaned up the api-extractor config files.

* added some more documentation.

* added tsdoc-metadata to gitignore.

* removed the generated docs (will do that in another PR).

* added execute permission to script for generating dosc.

* added so we will push generated docs to branch.

* will clean packages_api on abort.

* Fixed failing tests.

* fixed formatting issue with typedoc comment.

* temporarily disabled tslint rules about namespace until https://github.com/microsoft/rushstack/issues/1029 is resolved

* temporary enabled bable namespaces.

* updated build script.

* updated script.

* updated script with some colors.

* changed to camelCase.

* removed spacing.

* Starting to add documentation guidelines.

* added examples headline.

* added parameters and return values.

* Fixed merge error.

* changed so we use the eslint ignore syntax.

* changed to correct eslint ingnore comment.

* fixed some spelling errors reported by codespell.

* added script to generate docs in current folder.

* lerna bootstrap.

* removed file that should be ignored.

* updated locKFILE.

* referenced the code comments guidelines.

* updated packages.

* updated deps.
2020-02-25 13:59:11 +01:00
Tobias Skarhed 029a6c64b4
Storybook: Add color theme and theme switcher (#22005)
* Add color theme and serve static files for storybook

* Add color theme and serve static files for storybook

* Export dark and light theme

* Add storybook-dark-mode package

* Add theme toggle functionality

* Toggle story theme too

* Remove unused import

* webpack config changes not needed
2020-02-17 10:36:16 +01:00
Emil Tullstedt 23f3ec020a
Build: Ignore content of /pkg/extensions, not directory (#21540) 2020-01-16 14:29:48 +01:00
Marcus Andersson 1ba5ccb159
Build: prevent changes to pkg/extentions/main.go from throwing error on merge 2020-01-08 07:08:59 +01:00
Hugo Häggmark 052d6984aa
Chore: Fixes wrong e2e path in .gitignore (#21186) 2019-12-19 09:12:03 +01:00
Hugo Häggmark 664cb5f8f1
e2e: Adds ScenarioContext and video recordings to e2e (#21110)
* Refactor: Adds ScenarioContext

* Refactor: Removes async

* Refactor: Adds video and reverts CIRCLE_SHA2 to CIRCLE_SHA1

* Refactor: Adds videos to release job as well
2019-12-16 08:49:36 +01:00
Torkel Ödegaard 096b82027c
CI: Added junit test report (#21084)
* CI: Added junit test report

* Removed leftover

* Tesing

* removed reporter

* set max workers 2

* another test

* Fixed unit test

* Restored ci stuff
2019-12-13 14:56:25 +01:00
Hugo Häggmark 58cffde0f2
e2e: Uses Cypress instead of Puppeteer (#20753)
* WIP: intial commit

* Tests: Runs e2e tests

* Refactor: Adds BASE_URL support

* Refactor: Adds namespacing

* Refactor: Cleans up the Page api

* Build: Adds to build-branches-and-prs job for testing

* Build: Hardcoded image for now

* Refactor: Uses Selectors in App

* Refactor: Adds addDataSource flow

* WIP

* Refactor: Adds e2eScenario

* Refactor: Adds add and delete scenarios

* Refactor: Adds logging

* Refactor: Adds ability to for Selectors with variables

* Refactor: Using variable selectors instead

* Refactor: Adds flow until Share Panel

* Refactor: Adds clicking on rendered image link

* Refactor: Deletes log output

* Refactor: Updates snapshots

* Chore: Reverts changes

* Refactor: Removes log plugin because maybe it breaks yarn build

* Refactor: Adds rendered image download

* Refactor: Adds image comparison

* Refactor: Removes uncaught errors override

* Refactor: Changes order of images to compare

* Refactor: Updates truth image

* Build: Updates path to CI artifacts

* Refactor: Cleaning up types and config

* wip

* Refactor: Cleans up external api

* Refactor: More cleanup

* Refactor: More cleanup

* Refactor: Removes usages of Pages and Flows

* Refactor: Removes last traces of Cypress in spec

* Refactor: Adds comments
2019-12-09 00:14:25 -08:00
kay delaney 7985aa1e57
Performance/Webpack: Introduces more aggressive code-splitting and other perf improvements (#18544)
* Performance/Webpack: Introduces more aggressive code-splitting and other perf improvements
- Introduces dynamic imports for built-in plugins
- Uses dynamic imports for various packages (rst2html, brace)
- Introduces route-based dynamic imports
- Splits angular and moment into separate bundles
2019-09-03 09:29:02 +01:00
Oleg Gaidarenko 35b74a99a8
Emails: resurrect template notification (#18686)
* Emails: resurrect template notification

* Phantomjs (oh yeah, there is another dev dep phantom :-) was failing for
  the generation of the html templates so I had to update the dependencies
  in order to fix it. While doing that I update the scripts field and docs
  for it as well. yarn.lock is included

* Move splitting of the emails to separate helper function, since more services
  coming up that would need to use this functionality

* Add support for enterprise specific email letters. Probably could
  be done in the better way, but it's not a priority right now
2019-08-26 17:19:03 +02:00
Oleg Gaidarenko b049b003f2 Build: allow dynamically change docker image (#18112)
* Build: allow dynamically change docker image

Right now, only for couple DBs.
With the 2.1, you can do `${TAG:-5.6}` without needing the `.env` file, but
it seems it would be better for back-compat to support `.env` right now.

Fixes #17891

* Build: add prefix for removal process

* Docs: mention makefile command instead of the bash

Since we are moving to makefile for things and make command
simplifies some of the actions you have to perform to work with
different environments

* Docs: mention dynamic tags in the docs

* Docs: avoid name collision

Fixes #16107
2019-07-16 08:16:10 +02:00
Oleg Gaidarenko be66ed9dab
Chore: explore possibilities of using makefile (#17039)
* Chore: explore possibilities of using makefile

This is an exploratory commit - I wanted to see how
revive/gosec linters could be integrated with makefile and our build scripts.

Looks better then I expected :)

* Chore: make revive happy

Revive execution was not supplied with path, if you restore there is couple
errors that were popping up - so I fixed them

* Chore: make revive happy
2019-05-16 00:29:26 +03:00
Hugo Häggmark a4d287d2e1
Tests: Adds end-to-end tests skeleton and basic smoke test scenario (#16901)
* Chore: Adds neccessary packages

* Wip: Initial dummy test in place

* Feature: Downloads Chromium if needed

* Fix: Adds global config object

* Refactor: Adds basic e2eScenario

* Build: Adds end to end tests to config

* Build: Changes end to end job

* Build: Adds browsers to image

* Build: Adds failing test

* Refactor: Adds first e2e-test scenario

* Fix: Ignores test output in gitignore

* Refactor: Adds compare screenshots ability

* Refactor: Removes unnecessary code

* Build: Removes jest-puppeteer

* Fix: Replaces test snapshots

* Refactor: Creates output dir if missing

* Refactor: Changes aria-labels to be more consistent

* Docs: Adds section about end to end tests

* Fix: Fixes snapshots

* Docs: Adds information about ENV variables
2019-05-08 16:50:21 +02:00
Dominik Prokop 529c1ea53d Implemented scripts for building and releasing grafana/ui 2019-02-21 15:06:29 +01:00
Daniel Lee 13d9acb1ef ldap: adds docker block for freeipa 2019-02-08 08:18:24 +01:00
Peter Holmberg e25b2d0ab6 Merge branch 'master' into data-source-settings-to-react 2018-11-07 09:50:17 +01:00
Peter Holmberg 6dc3e0399d added actions 2018-11-05 16:33:43 +01:00
Tarek Becker 70bb81c6eb Load hash based styles in error.html, too 2018-11-01 23:31:17 +01:00
Torkel Ödegaard 7051a150cf updated gitignore 2018-10-12 21:55:45 -07:00
Torkel Ödegaard c1fd4265a9 renamed extension point in the frontend 2018-10-12 07:19:05 +02:00
Torkel Ödegaard abef94b0da made it possible to have frontend code in symlinked folders that can add routes 2018-10-11 12:36:04 +02:00
bergquist add6cee742 build: automatically publish releases to grafana.com. 2018-10-03 11:17:46 +02:00
bergquist 9774ec0ad7 devenv: adds script for creating many dashboards with alerts 2018-09-24 10:00:47 +02:00
Marcus Efraimsson 978284bc3d
devenv: re-add missing docker-compose files 2018-09-19 14:35:27 +02:00
Pierre GIRAUD cf632c0f11 Fix bulk-dashboards path (#12978) 2018-08-20 19:21:31 +02:00
Leonard Gram 0ff54d257a build: makes it easier to build a local docker container. 2018-08-03 09:40:02 +02:00
Torkel Ödegaard b464a28cca devenv: updated devenv provision scripts 2018-07-07 14:40:17 +02:00
Torkel Ödegaard 37efa934f1 ldap: improved ldap test env with more structured users and groups 2018-07-02 17:27:16 +02:00
Tobias Skarhed 4c31173853 Karma to Jest: history_ctrl. .gitingore: .vs/ 2018-06-21 11:54:47 +02:00
bergquist 6a82098ddf devenv: scripts for generating many unique dashboards 2018-05-29 11:52:00 +02:00
Torkel Ödegaard 80d694d205
Backend image rendering as plugin (#11966)
* rendering: headless chrome progress

* renderer: minor change

* grpc: version hell

* updated grpc libs

* wip: minor progess

* rendering: new image rendering plugin is starting to work

* feat: now phantomjs works as well and updated alerting to use new rendering service

* refactor: renamed renderer package and service to rendering to make renderer name less confusing (rendering is internal service that handles the renderer plugin now)

* rendering: now render key is passed and render auth is working in plugin mode

* removed unneeded lines from gitignore

* rendering: now plugin mode supports waiting for all panels to complete rendering

* fix: LastSeenAt fix for render calls, was not set which causes a lot of updates to Last Seen at during rendering, this should fix sqlite db locked issues in seen in previous releases

* change: changed render tz url parameter to use proper timezone name as chrome does not handle UTC offset TZ values

* fix: another update to tz param generation

* renderer: added http mode to renderer service, new ini setting [rendering] server_url
2018-05-24 15:26:27 +02:00
David Kaltschmidt c3cc60b080 Support for local Docker builds
* add a git-ignored `local/` folder for Makefile/Dockerfile
* import `local/Makefile` to root Makefile
* add `.dockerignore`
2018-05-07 12:32:18 +02:00
Carl Bergquist 28f7b6dad1 Enable Grafana extensions at build time. (#11752)
* extensions: import and build

* bus: use predefined error

* enterprise: build script for enterprise packages

* poc: auto registering services and dependency injection

(cherry picked from commit b5b1ef875f905473af41e49f8071cb9028edc845)

* poc: backend services registry progress

(cherry picked from commit 97be69725881241bfbf1e7adf0e66801d6b0af3d)

* poc: minor update

(cherry picked from commit 03d7a6888b81403f458b94305792e075568f0794)

* ioc: introduce manuel ioc

* enterprise: adds setting for enterprise

* build: test and build specific ee commit

* cleanup: test testing code

* removes example hello service
2018-04-27 13:41:58 +02:00
David Kaltschmidt cc5d7002b0 Add weback-dev-server with hot/hmr support
* adds `npm start` / `yarn start` script
* starts a webpack-dev-server using the dev config, served on :3333
* hot reloading (HMR) for react/styles, not working for angular code
* new entry `dev.ts` for dynamic imports of CSS theme (ExtractText does
not work with HMR)
* TS loader pipeline moved out of common to add HMR for react
* applied `hot()` to some react containers (that's their new default
 export, named exports remains for testing)
* added sections to README
* updated yarn.lock
2018-04-19 11:42:53 +02:00
bergquist 49673c509d fixes broken phantomjs rendering
when migrating from govendor to dep we broke the phantomjs rendering.

ref #10602
2018-01-25 13:27:24 +01:00
Johannes Schill 0b81117ee2 fix: Make sure orig files are not added to git again #10289 2018-01-10 12:04:46 +01:00
Torkel Ödegaard cafed8ce8f Merge branch 'master' into develop 2017-12-12 13:19:07 +01:00
bergquist 80a852b00a make gitignore more generic 2017-12-08 09:35:46 +01:00
bergquist 79d7213e11 fixes issue with datasource/dash as cfg and gitignore 2017-12-08 06:52:47 +01:00
Torkel Ödegaard beb9f8ee74 Merge remote-tracking branch 'origin/master' into develop 2017-12-07 14:14:50 +01:00
bergquist 5e9f0771c5 ignore /conf/**/custom.yaml files 2017-12-01 15:49:54 +01:00
Torkel Ödegaard 0e44fe082b Merge branch 'master' into develop 2017-11-17 15:49:17 +01:00
Alexander Zobnin d4e2f850b8 tech: ignore debug.test file created by VS Code 2017-11-15 13:37:45 +03:00
Torkel Ödegaard 10fcf2f5be Merge branch 'master' into develop 2017-11-02 15:56:09 +01:00
bergquist 8b10fe1abc ignore docker-compose.yaml 2017-11-01 13:43:39 +01:00
Torkel Ödegaard fff0fa2aee Merge branch 'master' into develop 2017-10-22 11:51:14 +02:00
Torkel Ödegaard 4aa227dd84 [Tech]: Start migrating to Jest for tests (#9610)
* tech: investigating karma + jest mix

* tech: migrating tests to jest

* tech: moved anoter test file to jest

* test: migrated two more test files to jest

* test: updated readme and made test fail to verify that it causes CI build failure

* tech: added code coverage for jest tests

* tech: testing codecov coverage

* tech: migrated more tests

* tech: migrated template srv to typescript and the tests to jest

* tech: minor build fix

* tech: build fixes

* build: another attempt at fixing go test with coverage
2017-10-22 07:03:26 +02:00
Torkel Ödegaard 647a3cc5ae Merge branch 'master' into develop 2017-10-09 16:01:54 +02:00
bergquist 5e4bbfb08e ignore pattern for vendored libs 2017-10-09 10:11:36 +02:00
Torkel Ödegaard 25aa9df270 Create annotations (#8197)
* 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
2017-10-07 10:31:39 +02:00
Torkel Ödegaard d38c891fac merge with master 2017-10-02 14:14:45 +02:00
Torkel Ödegaard 0c86241c5b Webpack (#9391)
* webpack poc, this is not going to work for plugins, dam

* tech: webpack and systemjs for plugins starting to work

* tech: webpack and systemjs combo starting to work

* tech: webpack + karma tests progress

* tech: webpack + karma progress

* tech: working on tests

* tech: webpack

* tech: webpack + karma, all tests pass

* tech: webpack + karma, all tests pass

* tech: webpack all tests pass

* webpack: getting closer

* tech: webpack progress

* webpack: further build refinements

* webpack: ng annotate fixes

* webpack: optimized build fix

* tech: minor fix for elasticsearch

* tech: webpack + ace editor

* tech: restored lodash move mixin compatability

* tech: added enzyme react test and upgraded to react v16

* tech: package version fix

* tech: added testdata to built in bundle

* webpack: sass progress

* tech: prod & dev build is working for the sass

* tech: clean up unused grunt stuff and moved to scripts folder

* tech: added vendor and manifest chunks, updated readme and docs

* tech: webpack finishing touches
2017-10-01 20:02:25 +02:00
Torkel Ödegaard 18337f610d Merge branch 'master' into develop 2017-09-22 08:42:07 +02:00
Patrick O'Carroll d6725d4fbe updated error page html+css, added ds_store to ignore (#9285) 2017-09-18 14:04:55 +02:00
Matt f68dc5ca23 Starting to play with new form styles 2017-08-15 09:48:35 +02:00
Torkel Ödegaard ecfe28d7ac packaging: added strech to publish script, closes #8737 2017-08-01 09:49:26 +02:00
Daniel Lee 8973b48f96 setting: add tests for windows 2017-06-28 09:35:33 +02:00
Louis Law 8c8b1dde8a [fix] fix minor issue in gitignore file. (#8694) 2017-06-25 11:34:23 -04:00
Torkel Ödegaard 2b029912aa mysql: query editor fix 2017-04-24 10:58:53 +02:00
bergquist 015423b233 tech(gitignore): ignore vscode folder 2016-09-05 21:35:24 +02:00
bergquist e3e0b72b43 fix(examples): ignore dist folder 2016-03-02 10:45:17 +01:00
Daniel Lee be92c8bde1 chore(docker): rename fig.yml to docker-compose.yml
Support for the old fig.yml file standard has been removed
in newer versions of docker-compose.
2016-02-24 09:56:57 +01:00
bergquist 36f4f1d0f3 fix(cli): add new executables to gitignore 2016-02-16 08:47:26 +01:00
Torkel Ödegaard a00231a1c2 updated gitignore 2016-01-28 14:38:55 -05:00
Torkel Ödegaard a87b5f757d fix(datasources): minor fix to data sources after apps branch merge 2016-01-12 20:05:40 +01:00
carl bergquist d7c7f27207 add npm-debug.log to gitignore 2015-12-03 15:29:28 +01:00
Torkel Ödegaard 0bcda4a2eb minor elasticsearch fix 2015-10-05 11:17:53 +02:00
Torkel Ödegaard 81a660eae4 fix(phantomjs binary): fixed PR #2832 so that it works on linux, now phantomjs based server side rendershould work on mac and linux, maybe even windows 2015-09-29 15:36:13 +02:00
Torkel Ödegaard 4ffa26cf2c feat() started work on more feature rich time picker 2015-09-15 13:23:36 +02:00
Torkel Ödegaard 20407bca89 tech(typescript): converted signup controller to typescript 2015-09-10 16:21:57 +02:00
Torkel Ödegaard abac8bccc6 tech(typescript): its looking good 2015-09-10 11:26:40 +02:00
Torkel Ödegaard 82061c7c3b experiments 2015-09-09 20:37:27 +02:00
Torkel Ödegaard a8197df1c1 more experiments for mixing javascript and typescript 2015-09-09 19:34:24 +02:00
Torkel Ödegaard 99bb9d4fcf feat(signup): added back the welcome on signup completed email 2015-08-31 11:42:12 +02:00
Torkel Ödegaard 4439545428 feat(invite): lots of work completing the new email template system and css inlineing, converted new_user_invite.html to new system, #2353 2015-08-10 21:24:47 +02:00
Torkel Ödegaard 697529d0e8 Worked on golang code coverage via coveralls 2015-05-02 17:24:03 +02:00
Torkel Ödegaard e86bedddb2 Updated gitignore file 2015-04-02 15:37:22 +02:00
Torkel Ödegaard ce99e7b294 Updated gitignore and added config.js 2015-03-29 13:41:01 +02:00
Torkel Ödegaard 6336edbc18 Merge branch 'docs-1.x' into develop 2015-03-11 10:47:09 +01:00
Torkel Ödegaard 5f5bb8541b Updated docs 2015-03-11 10:32:12 +01:00
Torkel Ödegaard f32c34c726 Merge branch 'master' into develop
Conflicts:
	.gitignore
2015-03-10 08:57:14 +01:00
Torkel Ödegaard 15cb1d8980 Added grafana 1.x docs to main repo 2015-03-10 08:56:03 +01:00
Torkel Ödegaard 5ab64987eb Switching to mkdocs for documentation, and docs that are inside the main repo, adding existing docs, #1571 2015-03-09 17:12:59 +01:00
Torkel Ödegaard d043ee9407 Fixed js concat issue 2015-03-04 10:04:59 +01:00
Torkel Ödegaard 563d5e3ad8 All migrations work in sqlite3, mysql and postgres 2015-02-25 07:57:51 +01:00
Ryan Williams c29bf31f2b add intellij files to gitignore 2015-02-20 19:51:21 +00:00
Jason Wilder 9cc0be0fc2 Add grafana binary to .gitignore
Running "go build" defaults to building a binary named
grafana in the root dir.
2015-02-11 14:55:26 -07:00
Torkel Ödegaard 397dfc54cd Fixed bug in png rendering when having changed public url 2015-02-06 14:17:40 +01:00
Torkel Ödegaard 861e45aedf Merge remote-tracking branch 'origin/pro' 2015-02-05 10:37:41 +01:00
Torkel Ödegaard 3ab7b5c3f7 Merge branch 'master' of /home/torkel/dev/go/src/github.com/torkelo/backend
Conflicts:
	.gitignore
	LICENSE.md
	README.md
2015-02-05 10:10:39 +01:00
Torkel Ödegaard 4cc8a9bd18 More work on getting grafana pro to work in sub url 2015-01-05 07:59:18 +01:00
Torkel Ödegaard 318338f967 Updated zip release task 2015-01-01 22:26:57 +01:00
Torkel Ödegaard c4a48b35c0 Updated libs 2014-12-30 11:27:36 +01:00
Torkel Ödegaard 26ec858903 Moved grafana bin file to bin folder 2014-12-15 17:36:42 +01:00
Torkel Ödegaard d7ee4b4573 Added missing files 2014-11-26 09:58:36 +01:00
Torkel Ödegaard f5b1b192a0 Macaron and sqllite 2014-11-14 17:13:33 +01:00
Torkel Ödegaard d7cd2b970e OAuth remake 2014-10-07 17:56:37 -04:00
Torkel Ödegaard 450d242d5f working on oauth 2014-10-07 15:54:38 -04:00
Torkel Ödegaard 4cd53ce119 Merge branch 'cleanup-generated-files' of github.com:clkao/grafana into clkao-cleanup-generated-files 2014-08-10 09:23:44 +02:00
Chia-liang Kao 8819d559b7 move vendor css intor appropriate places and remove generated files from version control 2014-08-10 02:21:05 +08:00
Torkel Ödegaard 380f707285 workin on png rendering 2014-08-09 11:57:54 +02:00
Torkel Ödegaard 8154b4f60d search and save are 'working', barely 2014-08-08 12:35:15 +02:00
Torkel Ödegaard 02fb2baf62 Added code coverage, and sending reports to coveralls 2014-08-07 14:58:57 +02:00
Jordan Rinke f958924b79 added saving and showing temp searches also trailing comman in default.json was causing the default to fail to load for me, #633 2014-07-31 12:37:35 -07:00
Harald Kraemer f70bf61ff6 Added vim swp files to gitignore 2014-05-15 15:07:03 +02:00
Torkel Ödegaard f2f435b4cb Changed name off config.js to config.sample.js to make it easier to upgrade with having to worry about config being overwwritten, if there is no config.js file config.sample.js will be read instead (requirejs fallback). Closes #65 2014-02-06 17:10:25 +01:00
Torkel Odegaard 9d2ce9874a removed histogram panel 2014-01-06 14:50:56 +01:00
Torkel Ödegaard 54eae2e34a addded graphiteUrl to config.js 2013-12-07 14:40:14 +01:00
Torkel Ödegaard 50e42c8bdd started removing kibana stuff I do not need, thinking of doing a custom dashboard based on kibana 2013-12-05 16:45:52 +01:00
Rashid Khan d21e1c35e1 remove execute bit re: @shatlovsky 2013-10-25 07:47:54 -07:00
Spencer Alger 259562136f - Removed the "dist" directory
- Created a grunt task to build, compress, and upload the build to s3
 - Updated the README to point users to downloads.elasticsearch.org
2013-09-16 15:14:20 -07:00
Spencer Alger 5d9cb85ccf Merged Pull Request #484 2013-09-13 13:52:13 -07:00
Spencer Alger d778873ba5 Moved JSHint config into the standard .jshintrc file, so that it can be shared with the command line version as well as version that run within IDEs 2013-08-26 17:44:02 -07:00