diff --git a/.circleci/config.yml b/.circleci/config.yml index 23414436bf8f4..4c49d051178ea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -198,6 +198,117 @@ jobs: paths: - dist/* + build-fast-backend: + docker: + - image: grafana/build-container:1.2.6 + working_directory: /go/src/github.com/grafana/grafana + steps: + - checkout + - run: + name: prepare build tools + command: '/tmp/bootstrap.sh' + - run: + name: build grafana backend + command: './scripts/build/build.sh --fast --backend-only' + - persist_to_workspace: + root: . + paths: + - bin/* + + build-fast-frontend: + docker: + - image: grafana/build-container:1.2.6 + working_directory: /go/src/github.com/grafana/grafana + steps: + - checkout + - run: + name: prepare build tools + command: '/tmp/bootstrap.sh' + - restore_cache: + key: frontend-dependency-cache-{{ checksum "yarn.lock" }} + - run: + name: build grafana frontend + command: './scripts/build/build.sh --fast --frontend-only' + - save_cache: + key: frontend-dependency-cache-{{ checksum "yarn.lock" }} + paths: + - node_modules + - persist_to_workspace: + root: . + paths: + - public/build/* + - tools/phantomjs/* + + build-fast-package: + docker: + - image: grafana/build-container:1.2.6 + working_directory: /go/src/github.com/grafana/grafana + steps: + - checkout + - attach_workspace: + at: . + - restore_cache: + key: frontend-dependency-cache-{{ checksum "yarn.lock" }} + - run: + name: prepare build tools + command: '/tmp/bootstrap.sh' + - run: + name: package grafana + command: './scripts/build/build.sh --fast --package-only' + - run: + name: sha-sum packages + command: 'go run build.go sha-dist' + - run: + name: Test Grafana.com release publisher + command: 'cd scripts/build/release_publisher && go test .' + - persist_to_workspace: + root: /go/src/github.com/grafana/grafana + paths: + - dist/* + + build-fast-save: + docker: + - image: grafana/build-container:1.2.6 + working_directory: /go/src/github.com/grafana/grafana + steps: + - checkout + - attach_workspace: + at: . + - restore_cache: + key: dependency-cache-{{ checksum "yarn.lock" }} + - run: + name: debug cache + command: 'ls -al /go/src/github.com/grafana/grafana/node_modules' + - run: + name: prepare build tools + command: '/tmp/bootstrap.sh' + - run: + name: build grafana backend + command: './scripts/build/build.sh --fast --backend-only' + - run: + name: build grafana frontend + command: './scripts/build/build.sh --fast --frontend-only' + - save_cache: + key: dependency-cache-{{ checksum "yarn.lock" }} + paths: + - /go/src/github.com/grafana/grafana/node_modules + - run: + name: package grafana + command: './scripts/build/build.sh --fast --package-only' + - run: + name: sign packages + command: './scripts/build/sign_packages.sh' + - run: + name: sha-sum packages + command: 'go run build.go sha-dist' + - run: + name: Test Grafana.com release publisher + command: 'cd scripts/build/release_publisher && go test .' + - persist_to_workspace: + root: . + paths: + - dist/* + grafana-docker-master: machine: image: circleci/classic:201808-01 @@ -224,7 +335,7 @@ jobs: - run: docker info - run: docker run --privileged linuxkit/binfmt:v0.6 - run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker - - run: cd packaging/docker && ./build.sh "${CIRCLE_SHA1}" + - run: cd packaging/docker && ./build.sh --fast "${CIRCLE_SHA1}" grafana-docker-release: machine: @@ -556,8 +667,15 @@ workflows: build-branches-and-prs: jobs: - - build: + - build-fast-backend: + filters: *filter-not-release-or-master + - build-fast-frontend: filters: *filter-not-release-or-master + - build-fast-package: + filters: *filter-not-release-or-master + requires: + - build-fast-backend + - build-fast-frontend - codespell: filters: *filter-not-release-or-master - backend-lint: @@ -574,7 +692,7 @@ workflows: filters: *filter-not-release-or-master - grafana-docker-pr: requires: - - build + - build-fast-package - test-backend - test-frontend - codespell @@ -585,7 +703,7 @@ workflows: filters: *filter-not-release-or-master - store-build-artifacts: requires: - - build + - build-fast-package - test-backend - test-frontend - codespell diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e8fec5ac833d..752c8f8caf959 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # 6.2.0 (unreleased) +# 6.1.6 (2019-04-29) +### Features / Enhancements +* **Security**: Bump jQuery to 3.4.0 . [#16761](https://github.com/grafana/grafana/pull/16761), [@dprokop](https://github.com/dprokop) + +### Bug Fixes +* **Playlist**: Fix loading dashboards by tag. [#16727](https://github.com/grafana/grafana/pull/16727), [@marefr](https://github.com/marefr) + +# 6.1.5 (2019-04-29) + +* **Security**: Urgent security patch release. Please read more in our [blog](https://grafana.com/blog/2019/04/29/grafana-5.4.4-and-6.1.6-released-with-important-security-fix/) + # 6.1.4 (2019-04-16) ### Bug Fixes diff --git a/Dockerfile b/Dockerfile index e1ae6a7508f3d..9e5551bd4a4a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,14 +3,10 @@ FROM golang:1.12.4 WORKDIR $GOPATH/src/github.com/grafana/grafana -COPY Gopkg.toml Gopkg.lock ./ +COPY go.mod go.sum ./ COPY vendor vendor -ARG DEP_ENSURE="" -RUN if [ ! -z "${DEP_ENSURE}" ]; then \ - go get -u github.com/golang/dep/cmd/dep && \ - dep ensure --vendor-only; \ - fi +RUN go mod verify COPY pkg pkg COPY build.go build.go diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index fe3d682b59a40..0000000000000 --- a/Gopkg.lock +++ /dev/null @@ -1,937 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:f8ad8a53fa865a70efbe215b0ca34735523f50ea39e0efde319ab6fc80089b44" - name = "cloud.google.com/go" - packages = ["compute/metadata"] - pruneopts = "NUT" - revision = "056a55f54a6cc77b440b31a56a5e7c3982d32811" - version = "v0.22.0" - -[[projects]] - digest = "1:167b6f65a6656de568092189ae791253939f076df60231fdd64588ac703892a1" - name = "github.com/BurntSushi/toml" - packages = ["."] - pruneopts = "NUT" - revision = "b26d9c308763d68093482582cea63d69be07a0f0" - version = "v0.3.0" - -[[projects]] - branch = "master" - digest = "1:7d23e6e1889b8bb4bbb37a564708fdab4497ce232c3a99d66406c975b642a6ff" - name = "github.com/Unknwon/com" - packages = ["."] - pruneopts = "NUT" - revision = "7677a1d7c1137cd3dd5ba7a076d0c898a1ef4520" - -[[projects]] - branch = "master" - digest = "1:1610787cd9726e29d8fecc2a80e43e4fced008a1f560fec6688fc4d946f17835" - name = "github.com/VividCortex/mysqlerr" - packages = ["."] - pruneopts = "NUT" - revision = "6c6b55f8796f578c870b7e19bafb16103bc40095" - -[[projects]] - digest = "1:ebe102b61c1615d2954734e3cfe1b6b06a5088c25a41055b38661d41ad7b8f27" - name = "github.com/aws/aws-sdk-go" - packages = [ - "aws", - "aws/awserr", - "aws/awsutil", - "aws/client", - "aws/client/metadata", - "aws/corehandlers", - "aws/credentials", - "aws/credentials/ec2rolecreds", - "aws/credentials/endpointcreds", - "aws/credentials/processcreds", - "aws/credentials/stscreds", - "aws/csm", - "aws/defaults", - "aws/ec2metadata", - "aws/endpoints", - "aws/request", - "aws/session", - "aws/signer/v4", - "internal/ini", - "internal/s3err", - "internal/sdkio", - "internal/sdkrand", - "internal/sdkuri", - "internal/shareddefaults", - "private/protocol", - "private/protocol/ec2query", - "private/protocol/eventstream", - "private/protocol/eventstream/eventstreamapi", - "private/protocol/json/jsonutil", - "private/protocol/jsonrpc", - "private/protocol/query", - "private/protocol/query/queryutil", - "private/protocol/rest", - "private/protocol/restxml", - "private/protocol/xml/xmlutil", - "service/cloudwatch", - "service/ec2", - "service/ec2/ec2iface", - "service/resourcegroupstaggingapi", - "service/resourcegroupstaggingapi/resourcegroupstaggingapiiface", - "service/s3", - "service/sts", - ] - pruneopts = "NUT" - revision = "62936e15518acb527a1a9cb4a39d96d94d0fd9a2" - version = "v1.16.15" - -[[projects]] - branch = "master" - digest = "1:79cad073c7be02632d3fa52f62486848b089f560db1e94536de83a408c0f4726" - name = "github.com/benbjohnson/clock" - packages = ["."] - pruneopts = "NUT" - revision = "7dc76406b6d3c05b5f71a86293cbcf3c4ea03b19" - -[[projects]] - branch = "master" - digest = "1:707ebe952a8b3d00b343c01536c79c73771d100f63ec6babeaed5c79e2b8a8dd" - name = "github.com/beorn7/perks" - packages = ["quantile"] - pruneopts = "NUT" - revision = "3a771d992973f24aa725d07868b467d1ddfceafb" - -[[projects]] - branch = "master" - digest = "1:433a2ff0ef4e2f8634614aab3174783c5ff80120b487712db96cc3712f409583" - name = "github.com/bmizerany/assert" - packages = ["."] - pruneopts = "NUT" - revision = "b7ed37b82869576c289d7d97fb2bbd8b64a0cb28" - -[[projects]] - branch = "master" - digest = "1:d8f9145c361920507a4f85ffb7f70b96beaedacba2ce8c00aa663adb08689d3e" - name = "github.com/bradfitz/gomemcache" - packages = ["memcache"] - pruneopts = "NUT" - revision = "1952afaa557dc08e8e0d89eafab110fb501c1a2b" - -[[projects]] - branch = "master" - digest = "1:8ecb89af7dfe3ac401bdb0c9390b134ef96a97e85f732d2b0604fb7b3977839f" - name = "github.com/codahale/hdrhistogram" - packages = ["."] - pruneopts = "NUT" - revision = "3a0bb77429bd3a61596f5e8a3172445844342120" - -[[projects]] - digest = "1:5dba68a1600a235630e208cb7196b24e58fcbb77bb7a6bec08fcd23f081b0a58" - name = "github.com/codegangsta/cli" - packages = ["."] - pruneopts = "NUT" - revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1" - version = "v1.20.0" - -[[projects]] - digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39" - name = "github.com/davecgh/go-spew" - packages = ["spew"] - pruneopts = "NUT" - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" - -[[projects]] - digest = "1:1b318d2dd6cea8a1a8d8ec70348852303bd3e491df74e8bca6e32eb5a4d06970" - name = "github.com/denisenkom/go-mssqldb" - packages = [ - ".", - "internal/cp", - ] - pruneopts = "NUT" - revision = "270bc3860bb94dd3a3ffd047377d746c5e276726" - -[[projects]] - branch = "master" - digest = "1:2da5f11ad66ff01a27a5c3dba4620b7eee2327be75b32c9ee9f87c9a8001ecbf" - name = "github.com/facebookgo/inject" - packages = ["."] - pruneopts = "NUT" - revision = "cc1aa653e50f6a9893bcaef89e673e5b24e1e97b" - -[[projects]] - branch = "master" - digest = "1:1108df7f658c90db041e0d6174d55be689aaeb0585913b9c3c7aab51a3a6b2b1" - name = "github.com/facebookgo/structtag" - packages = ["."] - pruneopts = "NUT" - revision = "217e25fb96916cc60332e399c9aa63f5c422ceed" - -[[projects]] - digest = "1:ade392a843b2035effb4b4a2efa2c3bab3eb29b992e98bacf9c898b0ecb54e45" - name = "github.com/fatih/color" - packages = ["."] - pruneopts = "NUT" - revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" - version = "v1.7.0" - -[[projects]] - branch = "master" - digest = "1:682a0aca743a1a4a36697f3d7f86c0ed403c4e3a780db9935f633242855eac9c" - name = "github.com/go-macaron/binding" - packages = ["."] - pruneopts = "NUT" - revision = "ac54ee249c27dca7e76fad851a4a04b73bd1b183" - -[[projects]] - branch = "master" - digest = "1:6326b27f8e0c8e135c8674ddbc619fae879664ac832e8e6fa6a23ce0d279ed4d" - name = "github.com/go-macaron/gzip" - packages = ["."] - pruneopts = "NUT" - revision = "cad1c6580a07c56f5f6bc52d66002a05985c5854" - -[[projects]] - branch = "master" - digest = "1:fb8711b648d1ff03104fc1d9593a13cb1d5120be7ba2b01641c14ccae286a9e3" - name = "github.com/go-macaron/inject" - packages = ["."] - pruneopts = "NUT" - revision = "d8a0b8677191f4380287cfebd08e462217bac7ad" - -[[projects]] - branch = "master" - digest = "1:f43e840e8efb7b5047c1f60057702550fcdefd2b29e3a73ccea25e27d2e83fda" - name = "github.com/go-macaron/session" - packages = ["."] - pruneopts = "NUT" - revision = "068d408f9c54c7fa7fcc5e2bdd3241ab21280c9e" - -[[projects]] - digest = "1:fddd4bada6100d6fc49a9f32f18ba5718db45a58e4b00aa6377e1cfbf06af34f" - name = "github.com/go-sql-driver/mysql" - packages = ["."] - pruneopts = "NUT" - revision = "2cc627ac8defc45d65066ae98f898166f580f9a4" - -[[projects]] - digest = "1:a1efdbc2762667c8a41cbf02b19a0549c846bf2c1d08cad4f445e3344089f1f0" - name = "github.com/go-stack/stack" - packages = ["."] - pruneopts = "NUT" - revision = "259ab82a6cad3992b4e21ff5cac294ccb06474bc" - version = "v1.7.0" - -[[projects]] - digest = "1:06d21295033f211588d0ad7ff391cc1b27e72b60cb6d4b7db0d70cffae4cf228" - name = "github.com/go-xorm/builder" - packages = ["."] - pruneopts = "NUT" - revision = "1d658d7596c25394aab557ef5b50ef35bf706384" - version = "v0.3.4" - -[[projects]] - digest = "1:b26928aab0fff92592e8728c5bc9d6e404fa2017d6a8e841ae5e60a42237f6fc" - name = "github.com/go-xorm/core" - packages = ["."] - pruneopts = "NUT" - revision = "ccc80c1adf1f6172bbc548877f50a1163041a40a" - version = "v0.6.2" - -[[projects]] - digest = "1:407316703b32d68ccf5d39bdae57d411b6954e253e07d0fff0988a3f39861f2f" - name = "github.com/go-xorm/xorm" - packages = ["."] - pruneopts = "NUT" - revision = "1f39c590c64924f358c0d89016ac9b2bb84e9125" - version = "v0.7.1" - -[[projects]] - branch = "master" - digest = "1:ffbb19fb66f140b5ea059428d1f84246a055d1bc3d9456c1e5c3d143611f03d0" - name = "github.com/golang/protobuf" - packages = [ - "proto", - "ptypes", - "ptypes/any", - "ptypes/duration", - "ptypes/timestamp", - ] - pruneopts = "NUT" - revision = "927b65914520a8b7d44f5c9057611cfec6b2e2d0" - -[[projects]] - branch = "master" - digest = "1:f14d1b50e0075fb00177f12a96dd7addf93d1e2883c25befd17285b779549795" - name = "github.com/gopherjs/gopherjs" - packages = ["js"] - pruneopts = "NUT" - revision = "8dffc02ea1cb8398bb73f30424697c60fcf8d4c5" - -[[projects]] - digest = "1:3b708ebf63bfa9ba3313bedb8526bc0bb284e51474e65e958481476a9d4a12aa" - name = "github.com/gorilla/websocket" - packages = ["."] - pruneopts = "NUT" - revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b" - version = "v1.2.0" - -[[projects]] - digest = "1:4e771d1c6e15ca4516ad971c34205c822b5cff2747179679d7b321e4e1bfe431" - name = "github.com/gosimple/slug" - packages = ["."] - pruneopts = "NUT" - revision = "e9f42fa127660e552d0ad2b589868d403a9be7c6" - version = "v1.1.1" - -[[projects]] - branch = "master" - digest = "1:08e53c69cd267ef7d71eeae5d953153d0d2bc1b8e0b498731fe9acaead7001b6" - name = "github.com/grafana/grafana-plugin-model" - packages = [ - "go/datasource", - "go/renderer", - ] - pruneopts = "NUT" - revision = "84176c64269d8060f99e750ee8aba6f062753336" - -[[projects]] - branch = "master" - digest = "1:58ba5285227b0f635652cd4aa82c4cfd00b590191eadd823462f0c9f64e3ae07" - name = "github.com/hashicorp/go-hclog" - packages = ["."] - pruneopts = "NUT" - revision = "69ff559dc25f3b435631604f573a5fa1efdb6433" - -[[projects]] - digest = "1:532090ffc3b05a7e4c0229dd2698d79149f2e0683df993224a8b202f607fb605" - name = "github.com/hashicorp/go-plugin" - packages = ["."] - pruneopts = "NUT" - revision = "e8d22c780116115ae5624720c9af0c97afe4f551" - -[[projects]] - branch = "master" - digest = "1:8925116d1edcd85fc0c014e1aa69ce12892489b48ee633a605c46d893b8c151f" - name = "github.com/hashicorp/go-version" - packages = ["."] - pruneopts = "NUT" - revision = "23480c0665776210b5fbbac6eaaee40e3e6a96b7" - -[[projects]] - branch = "master" - digest = "1:8deb0c5545c824dfeb0ac77ab8eb67a3d541eab76df5c85ce93064ef02d44cd0" - name = "github.com/hashicorp/yamux" - packages = ["."] - pruneopts = "NUT" - revision = "7221087c3d281fda5f794e28c2ea4c6e4d5c4558" - -[[projects]] - digest = "1:efbe016b6d198cf44f1db0ed2fbdf1b36ebf1f6956cc9b76d6affa96f022d368" - name = "github.com/inconshreveable/log15" - packages = ["."] - pruneopts = "NUT" - revision = "0decfc6c20d9ca0ad143b0e89dcaa20f810b4fb3" - version = "v2.13" - -[[projects]] - digest = "1:1f2aebae7e7c856562355ec0198d8ca2fa222fb05e5b1b66632a1fce39631885" - name = "github.com/jmespath/go-jmespath" - packages = ["."] - pruneopts = "NUT" - revision = "c2b33e84" - -[[projects]] - digest = "1:395b1480ae42c3fec6fff19823e66e173819f85826811387f9045c88515a7f0f" - name = "github.com/jtolds/gls" - packages = ["."] - pruneopts = "NUT" - revision = "b4936e06046bbecbb94cae9c18127ebe510a2cb9" - -[[projects]] - digest = "1:1da1796a71eb70f1e3e085984d044f67840bb0326816ec8276231aa87b1b9fc3" - name = "github.com/klauspost/compress" - packages = [ - "flate", - "gzip", - ] - pruneopts = "NUT" - revision = "6c8db69c4b49dd4df1fff66996cf556176d0b9bf" - version = "v1.2.1" - -[[projects]] - digest = "1:5e55a8699c9ff7aba1e4c8952aeda209685d88d4cb63a8766c338e333b8e65d6" - name = "github.com/klauspost/cpuid" - packages = ["."] - pruneopts = "NUT" - revision = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da" - version = "v1.1" - -[[projects]] - digest = "1:b95da1293525625ef6f07be79d537b9bf2ecd7901efcf9a92193edafbd55b9ef" - name = "github.com/klauspost/crc32" - packages = ["."] - pruneopts = "NUT" - revision = "cb6bfca970f6908083f26f39a79009d608efd5cd" - version = "v1.1" - -[[projects]] - digest = "1:7b21c7fc5551b46d1308b4ffa9e9e49b66c7a8b0ba88c0130474b0e7a20d859f" - name = "github.com/kr/pretty" - packages = ["."] - pruneopts = "NUT" - revision = "73f6ac0b30a98e433b289500d779f50c1a6f0712" - version = "v0.1.0" - -[[projects]] - digest = "1:c3a7836b5904db0f8b609595b619916a6831cb35b8b714aec39f96d00c6155d8" - name = "github.com/kr/text" - packages = ["."] - pruneopts = "NUT" - revision = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f" - version = "v0.1.0" - -[[projects]] - branch = "master" - digest = "1:7a1e592f0349d56fac8ce47f28469e4e7f4ce637cb26f40c88da9dff25db1c98" - name = "github.com/lib/pq" - packages = [ - ".", - "oid", - ] - pruneopts = "NUT" - revision = "d34b9ff171c21ad295489235aec8b6626023cd04" - -[[projects]] - digest = "1:08c231ec84231a7e23d67e4b58f975e1423695a32467a362ee55a803f9de8061" - name = "github.com/mattn/go-colorable" - packages = ["."] - pruneopts = "NUT" - revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072" - version = "v0.0.9" - -[[projects]] - digest = "1:bc4f7eec3b7be8c6cb1f0af6c1e3333d5bb71072951aaaae2f05067b0803f287" - name = "github.com/mattn/go-isatty" - packages = ["."] - pruneopts = "NUT" - revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39" - version = "v0.0.3" - -[[projects]] - digest = "1:536979f1c56397dbf91c2785159b37dec37e35d3bffa3cd1cfe66d25f51f8088" - name = "github.com/mattn/go-sqlite3" - packages = ["."] - pruneopts = "NUT" - revision = "323a32be5a2421b8c7087225079c6c900ec397cd" - version = "v1.7.0" - -[[projects]] - digest = "1:5985ef4caf91ece5d54817c11ea25f182697534f8ae6521eadcd628c142ac4b6" - name = "github.com/matttproud/golang_protobuf_extensions" - packages = ["pbutil"] - pruneopts = "NUT" - revision = "3247c84500bff8d9fb6d579d800f20b3e091582c" - version = "v1.0.0" - -[[projects]] - branch = "master" - digest = "1:18b773b92ac82a451c1276bd2776c1e55ce057ee202691ab33c8d6690efcc048" - name = "github.com/mitchellh/go-testing-interface" - packages = ["."] - pruneopts = "NUT" - revision = "a61a99592b77c9ba629d254a693acffaeb4b7e28" - -[[projects]] - digest = "1:3b517122f3aad1ecce45a630ea912b3092b4729f25532a911d0cb2935a1f9352" - name = "github.com/oklog/run" - packages = ["."] - pruneopts = "NUT" - revision = "4dadeb3030eda0273a12382bb2348ffc7c9d1a39" - version = "v1.0.0" - -[[projects]] - digest = "1:7da29c22bcc5c2ffb308324377dc00b5084650348c2799e573ed226d8cc9faf0" - name = "github.com/opentracing/opentracing-go" - packages = [ - ".", - "ext", - "log", - ] - pruneopts = "NUT" - revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38" - version = "v1.0.2" - -[[projects]] - digest = "1:748946761cf99c8b73cef5a3c0ee3e040859dd713a20cece0d0e0dc04e6ceca7" - name = "github.com/patrickmn/go-cache" - packages = ["."] - pruneopts = "NUT" - revision = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0" - version = "v2.1.0" - -[[projects]] - digest = "1:5cf3f025cbee5951a4ee961de067c8a89fc95a5adabead774f82822efabab121" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "NUT" - revision = "645ef00459ed84a119197bfb8d8205042c6df63d" - version = "v0.8.0" - -[[projects]] - digest = "1:4759bed95e3a52febc18c071db28790a5c6e9e106ee201a37add6f6a056f8f9c" - name = "github.com/prometheus/client_golang" - packages = [ - "api", - "api/prometheus/v1", - "prometheus", - "prometheus/promhttp", - ] - pruneopts = "NUT" - revision = "967789050ba94deca04a5e84cce8ad472ce313c1" - version = "v0.9.0-pre1" - -[[projects]] - branch = "master" - digest = "1:32d10bdfa8f09ecf13598324dba86ab891f11db3c538b6a34d1c3b5b99d7c36b" - name = "github.com/prometheus/client_model" - packages = ["go"] - pruneopts = "NUT" - revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c" - -[[projects]] - branch = "master" - digest = "1:768b555b86742de2f28beb37f1dedce9a75f91f871d75b5717c96399c1a78c08" - name = "github.com/prometheus/common" - packages = [ - "expfmt", - "internal/bitbucket.org/ww/goautoneg", - "model", - ] - pruneopts = "NUT" - revision = "d811d2e9bf898806ecfb6ef6296774b13ffc314c" - -[[projects]] - branch = "master" - digest = "1:c4a213a8d73fbb0b13f717ba7996116602ef18ecb42b91d77405877914cb0349" - name = "github.com/prometheus/procfs" - packages = [ - ".", - "internal/util", - "nfs", - "xfs", - ] - pruneopts = "NUT" - revision = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e" - -[[projects]] - branch = "master" - digest = "1:16e2136a67ec44aa2d1d6b0fd65394b3c4a8b2a1b6730c77967f7b7b06b179b2" - name = "github.com/rainycape/unidecode" - packages = ["."] - pruneopts = "NUT" - revision = "cb7f23ec59bec0d61b19c56cd88cee3d0cc1870c" - -[[projects]] - digest = "1:d917313f309bda80d27274d53985bc65651f81a5b66b820749ac7f8ef061fd04" - name = "github.com/sergi/go-diff" - packages = ["diffmatchpatch"] - pruneopts = "NUT" - revision = "1744e2970ca51c86172c8190fadad617561ed6e7" - version = "v1.0.0" - -[[projects]] - digest = "1:a0509115762ee481fd95b60521b4dcc5ad226c54b741a4924f4f28c0cc6aabc8" - name = "github.com/smartystreets/assertions" - packages = [ - ".", - "internal/go-diff/diffmatchpatch", - "internal/go-render/render", - "internal/oglematchers", - ] - pruneopts = "NUT" - revision = "f487f9de1cd36ebab28235b9373028812fb47cbd" - -[[projects]] - digest = "1:4dccd132a83155851c5e9faaa134ee3a931965c666b6b3c076e238fe9b3577a4" - name = "github.com/smartystreets/goconvey" - packages = [ - "convey", - "convey/gotest", - "convey/reporting", - ] - pruneopts = "NUT" - revision = "68dc04aab96ae4326137d6b77330c224063a927e" - -[[projects]] - branch = "master" - digest = "1:a66add8dd963bfc72649017c1b321198f596cb4958cb1a11ff91a1be8691020b" - name = "github.com/teris-io/shortid" - packages = ["."] - pruneopts = "NUT" - revision = "771a37caa5cf0c81f585d7b6df4dfc77e0615b5c" - -[[projects]] - digest = "1:3d48c38e0eca8c66df62379c5ae7a83fb5cd839b94f241354c07ba077da7bc45" - name = "github.com/uber/jaeger-client-go" - packages = [ - ".", - "config", - "internal/baggage", - "internal/baggage/remote", - "internal/spanlog", - "internal/throttler", - "internal/throttler/remote", - "log", - "rpcmetrics", - "thrift", - "thrift-gen/agent", - "thrift-gen/baggage", - "thrift-gen/jaeger", - "thrift-gen/sampling", - "thrift-gen/zipkincore", - "utils", - ] - pruneopts = "NUT" - revision = "b043381d944715b469fd6b37addfd30145ca1758" - version = "v2.14.0" - -[[projects]] - digest = "1:0f09db8429e19d57c8346ad76fbbc679341fa86073d3b8fb5ac919f0357d8f4c" - name = "github.com/uber/jaeger-lib" - packages = ["metrics"] - pruneopts = "NUT" - revision = "ed3a127ec5fef7ae9ea95b01b542c47fbd999ce5" - version = "v1.5.0" - -[[projects]] - digest = "1:4c7d12ad3ef47bb03892a52e2609dc9a9cff93136ca9c7d31c00b79fcbc23c7b" - name = "github.com/yudai/gojsondiff" - packages = [ - ".", - "formatter", - ] - pruneopts = "NUT" - revision = "7b1b7adf999dab73a6eb02669c3d82dbb27a3dd6" - version = "1.0.0" - -[[projects]] - branch = "master" - digest = "1:e50cbf8eba568d59b71e08c22c2a77809ed4646ae06ef4abb32b3d3d3fdb1a77" - name = "github.com/yudai/golcs" - packages = ["."] - pruneopts = "NUT" - revision = "ecda9a501e8220fae3b4b600c3db4b0ba22cfc68" - -[[projects]] - branch = "master" - digest = "1:758f363e0dff33cf00b234be2efb12f919d79b42d5ae3909ff9eb69ef2c3cca5" - name = "golang.org/x/crypto" - packages = [ - "ed25519", - "ed25519/internal/edwards25519", - "md4", - "pbkdf2", - ] - pruneopts = "NUT" - revision = "1a580b3eff7814fc9b40602fd35256c63b50f491" - -[[projects]] - branch = "master" - digest = "1:0b3fee9c4472022a0982ee0d81e08b3cc3e595f50befd7a4b358b48540d9d8c5" - name = "golang.org/x/net" - packages = [ - "context", - "context/ctxhttp", - "http/httpguts", - "http2", - "http2/hpack", - "idna", - "internal/timeseries", - "trace", - ] - pruneopts = "NUT" - revision = "2491c5de3490fced2f6cff376127c667efeed857" - -[[projects]] - branch = "master" - digest = "1:46bd4e66bfce5e77f08fc2e8dcacc3676e679241ce83d9c150ff0397d686dd44" - name = "golang.org/x/oauth2" - packages = [ - ".", - "google", - "internal", - "jws", - "jwt", - ] - pruneopts = "NUT" - revision = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269" - -[[projects]] - branch = "master" - digest = "1:39ebcc2b11457b703ae9ee2e8cca0f68df21969c6102cb3b705f76cca0ea0239" - name = "golang.org/x/sync" - packages = ["errgroup"] - pruneopts = "NUT" - revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca" - -[[projects]] - branch = "master" - digest = "1:ec21c5bf0572488865b93e30ffd9132afbf85bec0b20c2d6cbcf349cf2031ed5" - name = "golang.org/x/sys" - packages = ["unix"] - pruneopts = "NUT" - revision = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b" - -[[projects]] - digest = "1:e7071ed636b5422cc51c0e3a6cebc229d6c9fffc528814b519a980641422d619" - name = "golang.org/x/text" - packages = [ - "collate", - "collate/build", - "internal/colltab", - "internal/gen", - "internal/tag", - "internal/triegen", - "internal/ucd", - "language", - "secure/bidirule", - "transform", - "unicode/bidi", - "unicode/cldr", - "unicode/norm", - "unicode/rangetable", - ] - pruneopts = "NUT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" - -[[projects]] - digest = "1:dbd5568923513ee74aa626d027e2a8a352cf8f35df41d19f4e34491d1858c38b" - name = "google.golang.org/appengine" - packages = [ - ".", - "cloudsql", - "internal", - "internal/app_identity", - "internal/base", - "internal/datastore", - "internal/log", - "internal/modules", - "internal/remote_api", - "internal/urlfetch", - "urlfetch", - ] - pruneopts = "NUT" - revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a" - version = "v1.0.0" - -[[projects]] - branch = "master" - digest = "1:3c24554c312721e98fa6b76403e7100cf974eb46b1255ea7fc6471db9a9ce498" - name = "google.golang.org/genproto" - packages = ["googleapis/rpc/status"] - pruneopts = "NUT" - revision = "7bb2a897381c9c5ab2aeb8614f758d7766af68ff" - -[[projects]] - digest = "1:840b77b6eb539b830bb760b6e30b688ed2ff484bd83466fce2395835ed9367fe" - name = "google.golang.org/grpc" - packages = [ - ".", - "balancer", - "balancer/base", - "balancer/roundrobin", - "codes", - "connectivity", - "credentials", - "encoding", - "encoding/proto", - "grpclb/grpc_lb_v1/messages", - "grpclog", - "health", - "health/grpc_health_v1", - "internal", - "keepalive", - "metadata", - "naming", - "peer", - "resolver", - "resolver/dns", - "resolver/passthrough", - "stats", - "status", - "tap", - "transport", - ] - pruneopts = "NUT" - revision = "1e2570b1b19ade82d8dbb31bba4e65e9f9ef5b34" - version = "v1.11.1" - -[[projects]] - branch = "v3" - digest = "1:1244a9b3856f70d5ffb74bbfd780fc9d47f93f2049fa265c6fb602878f507bf8" - name = "gopkg.in/alexcesaro/quotedprintable.v3" - packages = ["."] - pruneopts = "NUT" - revision = "2caba252f4dc53eaf6b553000885530023f54623" - -[[projects]] - digest = "1:aea6e9483c167cc6fdf1274c442558c5dda8fd3373372be04d98c79100868da1" - name = "gopkg.in/asn1-ber.v1" - packages = ["."] - pruneopts = "NUT" - revision = "379148ca0225df7a432012b8df0355c2a2063ac0" - version = "v1.2" - -[[projects]] - digest = "1:24bfc2e8bf971485cb5ba0f0e5b08a1b806cca5828134df76b32d1ea50f2ab49" - name = "gopkg.in/bufio.v1" - packages = ["."] - pruneopts = "NUT" - revision = "567b2bfa514e796916c4747494d6ff5132a1dfce" - version = "v1" - -[[projects]] - digest = "1:e05711632e1515319b014e8fe4cbe1d30ab024c473403f60cf0fdeb4c586a474" - name = "gopkg.in/ini.v1" - packages = ["."] - pruneopts = "NUT" - revision = "6529cf7c58879c08d927016dde4477f18a0634cb" - version = "v1.36.0" - -[[projects]] - digest = "1:c847b7fea4c7e6db5281a37dffc4620cb78c1227403a79e5aa290db517657ac1" - name = "gopkg.in/ldap.v3" - packages = ["."] - pruneopts = "NUT" - revision = "5c2c0f997205c29de14cb6c35996370c2c5dfab1" - version = "v3" - -[[projects]] - digest = "1:3b0cf3a465fd07f76e5fc1a9d0783c662dac0de9fc73d713ebe162768fd87b5f" - name = "gopkg.in/macaron.v1" - packages = ["."] - pruneopts = "NUT" - revision = "c1be95e6d21e769e44e1ec33cec9da5837861c10" - version = "v1.3.1" - -[[projects]] - branch = "v2" - digest = "1:d52332f9e9f2c6343652e13aa3fd40cfd03353520c9a48d90f21215d3012d50f" - name = "gopkg.in/mail.v2" - packages = ["."] - pruneopts = "NUT" - revision = "5bc5c8bb07bd8d2803831fbaf8cbd630fcde2c68" - -[[projects]] - digest = "1:00126f697efdcab42f07c89ac8bf0095fb2328aef6464e070055154088cea859" - name = "gopkg.in/redis.v2" - packages = ["."] - pruneopts = "NUT" - revision = "e6179049628164864e6e84e973cfb56335748dea" - version = "v2.3.2" - -[[projects]] - digest = "1:a50fabe7a46692dc7c656310add3d517abe7914df02afd151ef84da884605dc8" - name = "gopkg.in/square/go-jose.v2" - packages = [ - ".", - "cipher", - "json", - ] - pruneopts = "NUT" - revision = "ef984e69dd356202fd4e4910d4d9c24468bdf0b8" - version = "v2.1.9" - -[[projects]] - branch = "v2" - digest = "1:7c95b35057a0ff2e19f707173cc1a947fa43a6eb5c4d300d196ece0334046082" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "NUT" - revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/BurntSushi/toml", - "github.com/Unknwon/com", - "github.com/VividCortex/mysqlerr", - "github.com/aws/aws-sdk-go/aws", - "github.com/aws/aws-sdk-go/aws/awserr", - "github.com/aws/aws-sdk-go/aws/awsutil", - "github.com/aws/aws-sdk-go/aws/credentials", - "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds", - "github.com/aws/aws-sdk-go/aws/credentials/endpointcreds", - "github.com/aws/aws-sdk-go/aws/defaults", - "github.com/aws/aws-sdk-go/aws/ec2metadata", - "github.com/aws/aws-sdk-go/aws/endpoints", - "github.com/aws/aws-sdk-go/aws/request", - "github.com/aws/aws-sdk-go/aws/session", - "github.com/aws/aws-sdk-go/service/cloudwatch", - "github.com/aws/aws-sdk-go/service/ec2", - "github.com/aws/aws-sdk-go/service/ec2/ec2iface", - "github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi", - "github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface", - "github.com/aws/aws-sdk-go/service/s3", - "github.com/aws/aws-sdk-go/service/sts", - "github.com/benbjohnson/clock", - "github.com/bmizerany/assert", - "github.com/bradfitz/gomemcache/memcache", - "github.com/codegangsta/cli", - "github.com/davecgh/go-spew/spew", - "github.com/denisenkom/go-mssqldb", - "github.com/facebookgo/inject", - "github.com/fatih/color", - "github.com/go-macaron/binding", - "github.com/go-macaron/gzip", - "github.com/go-macaron/session", - "github.com/go-sql-driver/mysql", - "github.com/go-stack/stack", - "github.com/go-xorm/core", - "github.com/go-xorm/xorm", - "github.com/gorilla/websocket", - "github.com/gosimple/slug", - "github.com/grafana/grafana-plugin-model/go/datasource", - "github.com/grafana/grafana-plugin-model/go/renderer", - "github.com/hashicorp/go-hclog", - "github.com/hashicorp/go-plugin", - "github.com/hashicorp/go-version", - "github.com/inconshreveable/log15", - "github.com/jtolds/gls", - "github.com/lib/pq", - "github.com/mattn/go-isatty", - "github.com/mattn/go-sqlite3", - "github.com/opentracing/opentracing-go", - "github.com/opentracing/opentracing-go/ext", - "github.com/opentracing/opentracing-go/log", - "github.com/patrickmn/go-cache", - "github.com/prometheus/client_golang/api", - "github.com/prometheus/client_golang/api/prometheus/v1", - "github.com/prometheus/client_golang/prometheus", - "github.com/prometheus/client_golang/prometheus/promhttp", - "github.com/prometheus/client_model/go", - "github.com/prometheus/common/expfmt", - "github.com/prometheus/common/model", - "github.com/smartystreets/assertions", - "github.com/smartystreets/goconvey/convey", - "github.com/teris-io/shortid", - "github.com/uber/jaeger-client-go/config", - "github.com/yudai/gojsondiff", - "github.com/yudai/gojsondiff/formatter", - "golang.org/x/net/context/ctxhttp", - "golang.org/x/oauth2", - "golang.org/x/oauth2/google", - "golang.org/x/oauth2/jwt", - "golang.org/x/sync/errgroup", - "gopkg.in/ini.v1", - "gopkg.in/ldap.v3", - "gopkg.in/macaron.v1", - "gopkg.in/mail.v2", - "gopkg.in/redis.v2", - "gopkg.in/square/go-jose.v2", - "gopkg.in/yaml.v2", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/UPGRADING_DEPENDENCIES.md b/UPGRADING_DEPENDENCIES.md index 7d489556981a3..16e6ce9ad4459 100644 --- a/UPGRADING_DEPENDENCIES.md +++ b/UPGRADING_DEPENDENCIES.md @@ -18,10 +18,21 @@ Upgrading Go or Node.js requires making changes in many different files. See bel ## Go Dependencies -Updated using `dep`. +The Grafana project uses [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages. This requires a working Go environment with version 1.11 or greater installed. -- `Gopkg.toml` -- `Gopkg.lock` +All dependencies are vendored in the `vendor/` directory. + +To add or update a new dependency, use the `go get` command: + +```bash +# Pick the latest tagged release. +go get example.com/some/module/pkg + +# Pick a specific version. +go get example.com/some/module/pkg@vX.Y.Z +``` + +Tidy up the `go.mod` and `go.sum` files and copy the new/updated dependency to the `vendor/` directory: ## Node.js Dependencies diff --git a/docs/sources/http_api/folder_dashboard_search.md b/docs/sources/http_api/folder_dashboard_search.md index 0a736a277b78d..cee7d335cc32a 100644 --- a/docs/sources/http_api/folder_dashboard_search.md +++ b/docs/sources/http_api/folder_dashboard_search.md @@ -24,7 +24,7 @@ Query parameters: - **folderIds** – List of folder id's to search in for dashboards - **starred** – Flag indicating if only starred Dashboards should be returned - **limit** – Limit the number of returned results (max 5000) -- **page** – Use this parameter to access hits beyond limit. Numbering starts at 1. limit param acts as page size. +- **page** – Use this parameter to access hits beyond limit. Numbering starts at 1. limit param acts as page size. Only available in Grafana v6.2+. **Example request for retrieving folders and dashboards of the general folder**: diff --git a/latest.json b/latest.json index 42613210e0f1f..47c25593c18d6 100644 --- a/latest.json +++ b/latest.json @@ -1,4 +1,4 @@ { - "stable": "6.1.3", - "testing": "6.1.3" + "stable": "6.1.6", + "testing": "6.1.6" } diff --git a/packages/grafana-ui/src/components/FormField/FormField.tsx b/packages/grafana-ui/src/components/FormField/FormField.tsx index 310af17c5dda3..600fc4038b700 100644 --- a/packages/grafana-ui/src/components/FormField/FormField.tsx +++ b/packages/grafana-ui/src/components/FormField/FormField.tsx @@ -1,8 +1,10 @@ import React, { InputHTMLAttributes, FunctionComponent } from 'react'; import { FormLabel } from '../FormLabel/FormLabel'; +import { PopperContent } from '../Tooltip/PopperController'; export interface Props extends InputHTMLAttributes { label: string; + tooltip?: PopperContent; labelWidth?: number; inputWidth?: number; inputEl?: React.ReactNode; @@ -17,10 +19,19 @@ const defaultProps = { * Default form field including label used in Grafana UI. Default input element is simple . You can also pass * custom inputEl if required in which case inputWidth and inputProps are ignored. */ -export const FormField: FunctionComponent = ({ label, labelWidth, inputWidth, inputEl, ...inputProps }) => { +export const FormField: FunctionComponent = ({ + label, + tooltip, + labelWidth, + inputWidth, + inputEl, + ...inputProps +}) => { return (
- {label} + + {label} + {inputEl || }
); diff --git a/packages/grafana-ui/src/components/FormLabel/FormLabel.tsx b/packages/grafana-ui/src/components/FormLabel/FormLabel.tsx index eceaa0648083c..5e54cb2de4393 100644 --- a/packages/grafana-ui/src/components/FormLabel/FormLabel.tsx +++ b/packages/grafana-ui/src/components/FormLabel/FormLabel.tsx @@ -1,6 +1,7 @@ import React, { FunctionComponent, ReactNode } from 'react'; import classNames from 'classnames'; import { Tooltip } from '../Tooltip/Tooltip'; +import { PopperContent } from '../Tooltip/PopperController'; interface Props { children: ReactNode; @@ -8,7 +9,7 @@ interface Props { htmlFor?: string; isFocused?: boolean; isInvalid?: boolean; - tooltip?: string; + tooltip?: PopperContent; width?: number; } diff --git a/packages/grafana-ui/src/components/Table/Table.story.tsx b/packages/grafana-ui/src/components/Table/Table.story.tsx index 71206af2b0ab9..1fea903adbd9d 100644 --- a/packages/grafana-ui/src/components/Table/Table.story.tsx +++ b/packages/grafana-ui/src/components/Table/Table.story.tsx @@ -43,7 +43,7 @@ export function makeDummyTable(columnCount: number, rowCount: number): SeriesDat }; } -storiesOf('Alpha/Table', module) +storiesOf('UI/Table', module) .add('Basic Table', () => { // NOTE: This example does not seem to survice rotate & // Changing fixed headers... but the next one does? @@ -56,7 +56,7 @@ storiesOf('Alpha/Table', module) return withFullSizeStory(Table, { styles: [], - data: simpleTable, + data: { ...simpleTable }, replaceVariables, showHeader, fixedHeader, diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx index d2a65bdf9b060..3d759ec1ae521 100644 --- a/packages/grafana-ui/src/components/Table/Table.tsx +++ b/packages/grafana-ui/src/components/Table/Table.tsx @@ -61,6 +61,7 @@ export class Table extends Component { renderer: ColumnRenderInfo[]; measurer: CellMeasurerCache; scrollToTop = false; + rotateWidth = 100; static defaultProps = { showHeader: true, @@ -85,7 +86,7 @@ export class Table extends Component { } componentDidUpdate(prevProps: Props, prevState: State) { - const { data, styles, showHeader } = this.props; + const { data, styles, showHeader, rotate } = this.props; const { sortBy, sortDirection } = this.state; const dataChanged = data !== prevProps.data; const configsChanged = @@ -105,6 +106,11 @@ export class Table extends Component { this.renderer = this.initColumns(this.props); } + if (dataChanged || rotate !== prevProps.rotate) { + const { width, minColumnWidth } = this.props; + this.rotateWidth = Math.max(width / data.rows.length, minColumnWidth); + } + // Update the data when data or sort changes if (dataChanged || sortBy !== prevState.sortBy || sortDirection !== prevState.sortDirection) { this.scrollToTop = true; @@ -115,6 +121,10 @@ export class Table extends Component { /** Given the configuration, setup how each column gets rendered */ initColumns(props: Props): ColumnRenderInfo[] { const { styles, data, width, minColumnWidth } = props; + if (!data || !data.fields || !data.fields.length || !styles) { + return []; + } + const columnWidth = Math.max(width / data.fields.length, minColumnWidth); return data.fields.map((col, index) => { @@ -235,12 +245,18 @@ export class Table extends Component { }; getColumnWidth = (col: Index): number => { + if (this.props.rotate) { + return this.rotateWidth; // fixed for now + } return this.renderer[col.index].width; }; render() { const { showHeader, fixedHeader, fixedColumns, rotate, width, height } = this.props; const { data } = this.state; + if (!data || !data.fields || !data.fields.length) { + return Missing Fields; // nothing + } let columnCount = data.fields.length; let rowCount = data.rows.length + (showHeader ? 1 : 0); diff --git a/packages/grafana-ui/src/components/Table/examples.ts b/packages/grafana-ui/src/components/Table/examples.ts index 15b430d892013..efeac94969d1e 100644 --- a/packages/grafana-ui/src/components/Table/examples.ts +++ b/packages/grafana-ui/src/components/Table/examples.ts @@ -162,6 +162,6 @@ export const migratedTestStyles: ColumnStyle[] = [ export const simpleTable = { type: 'table', - columns: [{ name: 'First' }, { name: 'Second' }, { name: 'Third' }], + fields: [{ name: 'First' }, { name: 'Second' }, { name: 'Third' }], rows: [[701, 205, 305], [702, 206, 301], [703, 207, 304]], }; diff --git a/packages/grafana-ui/src/types/data.ts b/packages/grafana-ui/src/types/data.ts index fbde1b14fc122..12570519b0453 100644 --- a/packages/grafana-ui/src/types/data.ts +++ b/packages/grafana-ui/src/types/data.ts @@ -19,6 +19,12 @@ export interface QueryResultMeta { // Match the result to the query requestId?: string; + + // Used in Explore for highlighting + search?: string; + + // Used in Explore to show limit applied to search result + limit?: number; } export interface QueryResultBase { diff --git a/packages/grafana-ui/src/types/datasource.ts b/packages/grafana-ui/src/types/datasource.ts index 8cd1e65289699..015d7cd10a1a7 100644 --- a/packages/grafana-ui/src/types/datasource.ts +++ b/packages/grafana-ui/src/types/datasource.ts @@ -1,6 +1,6 @@ import { ComponentClass } from 'react'; import { TimeRange } from './time'; -import { PluginMeta } from './plugin'; +import { PluginMeta, GrafanaPlugin } from './plugin'; import { TableData, TimeSeries, SeriesData, LoadingState } from './data'; import { PanelData } from './panel'; @@ -8,11 +8,14 @@ export interface DataSourcePluginOptionsEditorProps { options: TOptions; onOptionsChange: (options: TOptions) => void; } -export class DataSourcePlugin { +export class DataSourcePlugin extends GrafanaPlugin< + DataSourcePluginMeta +> { DataSourceClass: DataSourceConstructor; components: DataSourcePluginComponents; constructor(DataSourceClass: DataSourceConstructor) { + super(); this.DataSourceClass = DataSourceClass; this.components = {}; } @@ -68,6 +71,24 @@ export class DataSourcePlugin { QueryCtrl?: any; ConfigCtrl?: any; @@ -137,7 +158,11 @@ export interface DataSourceApi { * we attach the components to this instance for easy access */ components?: DataSourcePluginComponents; - meta?: PluginMeta; + + /** + * static information about the datasource + */ + meta?: DataSourcePluginMeta; } export interface ExploreDataSourceApi extends DataSourceApi { @@ -340,7 +365,7 @@ export interface DataSourceInstanceSettings { id: number; type: string; name: string; - meta: PluginMeta; + meta: DataSourcePluginMeta; url?: string; jsonData: { [str: string]: any }; username?: string; @@ -359,6 +384,6 @@ export interface DataSourceInstanceSettings { export interface DataSourceSelectItem { name: string; value: string | null; - meta: PluginMeta; + meta: DataSourcePluginMeta; sort: string; } diff --git a/packages/grafana-ui/src/types/index.ts b/packages/grafana-ui/src/types/index.ts index bf3b5e2995fdc..2980686cd3b27 100644 --- a/packages/grafana-ui/src/types/index.ts +++ b/packages/grafana-ui/src/types/index.ts @@ -6,6 +6,7 @@ export * from './datasource'; export * from './theme'; export * from './graph'; export * from './threshold'; +export * from './navModel'; export * from './input'; export * from './logs'; export * from './displayValue'; diff --git a/public/app/types/navModel.ts b/packages/grafana-ui/src/types/navModel.ts similarity index 68% rename from public/app/types/navModel.ts rename to packages/grafana-ui/src/types/navModel.ts index aae4a030cb43c..2f1018eed9cee 100644 --- a/public/app/types/navModel.ts +++ b/packages/grafana-ui/src/types/navModel.ts @@ -1,15 +1,15 @@ export interface NavModelItem { text: string; - url: string; + url?: string; subTitle?: string; icon?: string; img?: string; - id: string; + id?: string; active?: boolean; hideFromTabs?: boolean; divider?: boolean; children?: NavModelItem[]; - breadcrumbs?: Array<{ title: string; url: string }>; + breadcrumbs?: NavModelBreadcrumb[]; target?: string; parentItem?: NavModelItem; } @@ -17,6 +17,12 @@ export interface NavModelItem { export interface NavModel { main: NavModelItem; node: NavModelItem; + breadcrumbs?: NavModelItem[]; +} + +export interface NavModelBreadcrumb { + title: string; + url?: string; } export type NavIndex = { [s: string]: NavModelItem }; diff --git a/packages/grafana-ui/src/types/panel.ts b/packages/grafana-ui/src/types/panel.ts index 5354df29d1de1..ea28ca2fb47da 100644 --- a/packages/grafana-ui/src/types/panel.ts +++ b/packages/grafana-ui/src/types/panel.ts @@ -2,9 +2,25 @@ import { ComponentClass, ComponentType } from 'react'; import { LoadingState, SeriesData } from './data'; import { TimeRange } from './time'; import { ScopedVars, DataQueryRequest, DataQueryError, LegacyResponseData } from './datasource'; +import { PluginMeta, GrafanaPlugin } from './plugin'; export type InterpolateFunction = (value: string, scopedVars?: ScopedVars, format?: string | Function) => string; +export interface PanelPluginMeta extends PluginMeta { + hideFromList?: boolean; + sort: number; + + // if length>0 the query tab will show up + // Before 6.2 this could be table and/or series, but 6.2+ supports both transparently + // so it will be deprecated soon + dataFormats?: PanelDataFormat[]; +} + +export enum PanelDataFormat { + Table = 'table', + TimeSeries = 'time_series', +} + export interface PanelData { state: LoadingState; series: SeriesData[]; @@ -53,14 +69,20 @@ export type PanelTypeChangedHandler = ( prevOptions: any ) => Partial; -export class PanelPlugin { +export class PanelPlugin extends GrafanaPlugin { panel: ComponentType>; editor?: ComponentClass>; defaults?: TOptions; onPanelMigration?: PanelMigrationHandler; onPanelTypeChanged?: PanelTypeChangedHandler; + /** + * Legacy angular ctrl. If this exists it will be used instead of the panel + */ + angularPanelCtrl?: any; + constructor(panel: ComponentType>) { + super(); this.panel = panel; } @@ -95,16 +117,6 @@ export class PanelPlugin { } } -export class AngularPanelPlugin { - components: { - PanelCtrl: any; - }; - - constructor(PanelCtrl: any) { - this.components = { PanelCtrl: PanelCtrl }; - } -} - export interface PanelSize { width: number; height: number; diff --git a/packages/grafana-ui/src/types/plugin.ts b/packages/grafana-ui/src/types/plugin.ts index f3ab8ba5da2b2..af5382426ba5d 100644 --- a/packages/grafana-ui/src/types/plugin.ts +++ b/packages/grafana-ui/src/types/plugin.ts @@ -24,23 +24,10 @@ export interface PluginMeta { // Filled in by the backend jsonData?: { [str: string]: any }; enabled?: boolean; - - // Datasource-specific - builtIn?: boolean; - metrics?: boolean; - tables?: boolean; - logs?: boolean; - explore?: boolean; - annotations?: boolean; - mixed?: boolean; - hasQueryHelp?: boolean; - queryOptions?: PluginMetaQueryOptions; -} - -interface PluginMetaQueryOptions { - cacheTimeout?: boolean; - maxDataPoints?: boolean; - minInterval?: boolean; + defaultNavUrl?: string; + hasUpdate?: boolean; + latestVersion?: string; + pinned?: boolean; } export enum PluginIncludeType { @@ -82,16 +69,20 @@ export interface PluginMetaInfo { version: string; } -export class AppPlugin { - meta: PluginMeta; +export class GrafanaPlugin { + // Meta is filled in by the plugin loading system + meta?: T; + + // Soon this will also include common config options +} +export class AppPlugin extends GrafanaPlugin { angular?: { ConfigCtrl?: any; pages: { [component: string]: any }; }; - constructor(meta: PluginMeta, pluginExports: any) { - this.meta = meta; + setComponentsFromLegacyExports(pluginExports: any) { const legacy = { ConfigCtrl: undefined, pages: {} as any, @@ -102,7 +93,8 @@ export class AppPlugin { this.angular = legacy; } - if (meta.includes) { + const { meta } = this; + if (meta && meta.includes) { for (const include of meta.includes) { const { type, component } = include; if (type === PluginIncludeType.page && component) { diff --git a/packages/grafana-ui/src/types/time.ts b/packages/grafana-ui/src/types/time.ts index 2bc22485b5cdc..d6c524ac19a9d 100644 --- a/packages/grafana-ui/src/types/time.ts +++ b/packages/grafana-ui/src/types/time.ts @@ -11,11 +11,30 @@ export interface TimeRange { raw: RawTimeRange; } +export interface AbsoluteTimeRange { + from: number; + to: number; +} + export interface IntervalValues { interval: string; // 10s,5m intervalMs: number; } +export interface TimeZone { + raw: string; + isUtc: boolean; +} + +export const parseTimeZone = (raw: string): TimeZone => { + return { + raw, + isUtc: raw === 'utc', + }; +}; + +export const DefaultTimeZone = parseTimeZone('browser'); + export interface TimeOption { from: string; to: string; diff --git a/packages/grafana-ui/src/utils/fieldCache.test.ts b/packages/grafana-ui/src/utils/fieldCache.test.ts new file mode 100644 index 0000000000000..9f86b6df3e0ac --- /dev/null +++ b/packages/grafana-ui/src/utils/fieldCache.test.ts @@ -0,0 +1,71 @@ +import { FieldType } from '../types/index'; +import { FieldCache } from './fieldCache'; + +describe('FieldCache', () => { + it('when creating a new FieldCache from fields should be able to query cache', () => { + const fields = [ + { name: 'time', type: FieldType.time }, + { name: 'string', type: FieldType.string }, + { name: 'number', type: FieldType.number }, + { name: 'boolean', type: FieldType.boolean }, + { name: 'other', type: FieldType.other }, + { name: 'undefined' }, + ]; + const fieldCache = new FieldCache(fields); + const allFields = fieldCache.getFields(); + expect(allFields).toHaveLength(6); + + const expectedFields = [ + { ...fields[0], index: 0 }, + { ...fields[1], index: 1 }, + { ...fields[2], index: 2 }, + { ...fields[3], index: 3 }, + { ...fields[4], index: 4 }, + { ...fields[5], type: FieldType.other, index: 5 }, + ]; + + expect(allFields).toMatchObject(expectedFields); + + expect(fieldCache.hasFieldOfType(FieldType.time)).toBeTruthy(); + expect(fieldCache.hasFieldOfType(FieldType.string)).toBeTruthy(); + expect(fieldCache.hasFieldOfType(FieldType.number)).toBeTruthy(); + expect(fieldCache.hasFieldOfType(FieldType.boolean)).toBeTruthy(); + expect(fieldCache.hasFieldOfType(FieldType.other)).toBeTruthy(); + + expect(fieldCache.getFields(FieldType.time)).toMatchObject([expectedFields[0]]); + expect(fieldCache.getFields(FieldType.string)).toMatchObject([expectedFields[1]]); + expect(fieldCache.getFields(FieldType.number)).toMatchObject([expectedFields[2]]); + expect(fieldCache.getFields(FieldType.boolean)).toMatchObject([expectedFields[3]]); + expect(fieldCache.getFields(FieldType.other)).toMatchObject([expectedFields[4], expectedFields[5]]); + + expect(fieldCache.getFieldByIndex(0)).toMatchObject(expectedFields[0]); + expect(fieldCache.getFieldByIndex(1)).toMatchObject(expectedFields[1]); + expect(fieldCache.getFieldByIndex(2)).toMatchObject(expectedFields[2]); + expect(fieldCache.getFieldByIndex(3)).toMatchObject(expectedFields[3]); + expect(fieldCache.getFieldByIndex(4)).toMatchObject(expectedFields[4]); + expect(fieldCache.getFieldByIndex(5)).toMatchObject(expectedFields[5]); + expect(fieldCache.getFieldByIndex(6)).toBeNull(); + + expect(fieldCache.getFirstFieldOfType(FieldType.time)).toMatchObject(expectedFields[0]); + expect(fieldCache.getFirstFieldOfType(FieldType.string)).toMatchObject(expectedFields[1]); + expect(fieldCache.getFirstFieldOfType(FieldType.number)).toMatchObject(expectedFields[2]); + expect(fieldCache.getFirstFieldOfType(FieldType.boolean)).toMatchObject(expectedFields[3]); + expect(fieldCache.getFirstFieldOfType(FieldType.other)).toMatchObject(expectedFields[4]); + + expect(fieldCache.hasFieldNamed('tim')).toBeFalsy(); + expect(fieldCache.hasFieldNamed('time')).toBeTruthy(); + expect(fieldCache.hasFieldNamed('string')).toBeTruthy(); + expect(fieldCache.hasFieldNamed('number')).toBeTruthy(); + expect(fieldCache.hasFieldNamed('boolean')).toBeTruthy(); + expect(fieldCache.hasFieldNamed('other')).toBeTruthy(); + expect(fieldCache.hasFieldNamed('undefined')).toBeTruthy(); + + expect(fieldCache.getFieldByName('time')).toMatchObject(expectedFields[0]); + expect(fieldCache.getFieldByName('string')).toMatchObject(expectedFields[1]); + expect(fieldCache.getFieldByName('number')).toMatchObject(expectedFields[2]); + expect(fieldCache.getFieldByName('boolean')).toMatchObject(expectedFields[3]); + expect(fieldCache.getFieldByName('other')).toMatchObject(expectedFields[4]); + expect(fieldCache.getFieldByName('undefined')).toMatchObject(expectedFields[5]); + expect(fieldCache.getFieldByName('null')).toBeNull(); + }); +}); diff --git a/packages/grafana-ui/src/utils/fieldCache.ts b/packages/grafana-ui/src/utils/fieldCache.ts new file mode 100644 index 0000000000000..b430e6a3f2195 --- /dev/null +++ b/packages/grafana-ui/src/utils/fieldCache.ts @@ -0,0 +1,76 @@ +import { Field, FieldType } from '../types/index'; + +export interface IndexedField extends Field { + index: number; +} + +export class FieldCache { + private fields: Field[]; + private fieldIndexByName: { [key: string]: number }; + private fieldIndexByType: { [key: string]: number[] }; + + constructor(fields?: Field[]) { + this.fields = []; + this.fieldIndexByName = {}; + this.fieldIndexByType = {}; + this.fieldIndexByType[FieldType.time] = []; + this.fieldIndexByType[FieldType.string] = []; + this.fieldIndexByType[FieldType.number] = []; + this.fieldIndexByType[FieldType.boolean] = []; + this.fieldIndexByType[FieldType.other] = []; + + if (fields) { + for (let n = 0; n < fields.length; n++) { + const field = fields[n]; + this.addField(field); + } + } + } + + addField(field: Field) { + this.fields.push({ + type: FieldType.other, + ...field, + }); + const index = this.fields.length - 1; + this.fieldIndexByName[field.name] = index; + this.fieldIndexByType[field.type || FieldType.other].push(index); + } + + hasFieldOfType(type: FieldType): boolean { + return this.fieldIndexByType[type] && this.fieldIndexByType[type].length > 0; + } + + getFields(type?: FieldType): IndexedField[] { + const fields: IndexedField[] = []; + for (let index = 0; index < this.fields.length; index++) { + const field = this.fields[index]; + + if (!type || field.type === type) { + fields.push({ ...field, index }); + } + } + + return fields; + } + + getFieldByIndex(index: number): IndexedField | null { + return this.fields[index] ? { ...this.fields[index], index } : null; + } + + getFirstFieldOfType(type: FieldType): IndexedField | null { + return this.hasFieldOfType(type) + ? { ...this.fields[this.fieldIndexByType[type][0]], index: this.fieldIndexByType[type][0] } + : null; + } + + hasFieldNamed(name: string): boolean { + return this.fieldIndexByName[name] !== undefined; + } + + getFieldByName(name: string): IndexedField | null { + return this.hasFieldNamed(name) + ? { ...this.fields[this.fieldIndexByName[name]], index: this.fieldIndexByName[name] } + : null; + } +} diff --git a/packages/grafana-ui/src/utils/index.ts b/packages/grafana-ui/src/utils/index.ts index 5d5a7b32c60eb..f2af60e353946 100644 --- a/packages/grafana-ui/src/utils/index.ts +++ b/packages/grafana-ui/src/utils/index.ts @@ -14,3 +14,4 @@ export { getMappedValue } from './valueMappings'; export * from './validate'; export { getFlotPairs } from './flotPairs'; export * from './object'; +export * from './fieldCache'; diff --git a/packages/grafana-ui/src/utils/processSeriesData.ts b/packages/grafana-ui/src/utils/processSeriesData.ts index 1e78eee3da006..0a8d420fdaa13 100644 --- a/packages/grafana-ui/src/utils/processSeriesData.ts +++ b/packages/grafana-ui/src/utils/processSeriesData.ts @@ -43,16 +43,6 @@ function convertTimeSeriesToSeriesData(timeSeries: TimeSeries): SeriesData { }; } -export const getFirstTimeField = (series: SeriesData): number => { - const { fields } = series; - for (let i = 0; i < fields.length; i++) { - if (fields[i].type === FieldType.time) { - return i; - } - } - return -1; -}; - // PapaParse Dynamic Typing regex: // https://github.com/mholt/PapaParse/blob/master/papaparse.js#L998 const NUMBER = /^\s*-?(\d*\.?\d+|\d+\.?\d*)(e[-+]?\d+)?\s*$/i; diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 3980e4bf5d8d5..d72accb0cd924 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -17,6 +17,7 @@ FROM ${BASE_IMAGE} ARG GF_UID="472" ARG GF_GID="472" +ARG DEBIAN_FRONTEND=noninteractive ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \ GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \ diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh index a522363089bbb..ceb7c52e2af6e 100755 --- a/packaging/docker/build.sh +++ b/packaging/docker/build.sh @@ -1,4 +1,19 @@ #!/bin/sh +BUILD_FAST=0 + +while [ "$1" != "" ]; do + case "$1" in + "--fast") + BUILD_FAST=1 + echo "Fast build enabled" + shift + ;; + * ) + # unknown param causes args to be passed through to $@ + break + ;; + esac +done _grafana_tag=${1:-} _docker_repo=${2:-grafana/grafana} @@ -27,19 +42,28 @@ docker_build () { --no-cache=true . } +docker_tag_linux_amd64 () { + repo=$1 + tag=$2 + docker tag "${_docker_repo}:${_grafana_version}" "${repo}:${tag}" +} + # Tag docker images of all architectures docker_tag_all () { repo=$1 tag=$2 - docker tag "${_docker_repo}:${_grafana_version}" "${repo}:${tag}" - docker tag "${_docker_repo}-arm32v7-linux:${_grafana_version}" "${repo}-arm32v7-linux:${tag}" - docker tag "${_docker_repo}-arm64v8-linux:${_grafana_version}" "${repo}-arm64v8-linux:${tag}" + docker_tag_linux_amd64 $1 $2 + if [ $BUILD_FAST = "0" ]; then + docker tag "${_docker_repo}-arm32v7-linux:${_grafana_version}" "${repo}-arm32v7-linux:${tag}" + docker tag "${_docker_repo}-arm64v8-linux:${_grafana_version}" "${repo}-arm64v8-linux:${tag}" + fi } docker_build "debian:stretch-slim" "grafana-latest.linux-x64.tar.gz" "${_docker_repo}:${_grafana_version}" -docker_build "arm32v7/debian:stretch-slim" "grafana-latest.linux-armv7.tar.gz" "${_docker_repo}-arm32v7-linux:${_grafana_version}" -docker_build "arm64v8/debian:stretch-slim" "grafana-latest.linux-arm64.tar.gz" "${_docker_repo}-arm64v8-linux:${_grafana_version}" - +if [ $BUILD_FAST = "0" ]; then + docker_build "arm32v7/debian:stretch-slim" "grafana-latest.linux-armv7.tar.gz" "${_docker_repo}-arm32v7-linux:${_grafana_version}" + docker_build "arm64v8/debian:stretch-slim" "grafana-latest.linux-arm64.tar.gz" "${_docker_repo}-arm64v8-linux:${_grafana_version}" +fi # Tag as 'latest' for official release; otherwise tag as grafana/grafana:master if echo "$_grafana_tag" | grep -q "^v"; then docker_tag_all "${_docker_repo}" "latest" diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go index 4ad8a2b84ab55..76193771eb91f 100644 --- a/pkg/api/admin_users.go +++ b/pkg/api/admin_users.go @@ -119,7 +119,7 @@ func (server *HTTPServer) AdminLogoutUser(c *m.ReqContext) Response { return Error(400, "You cannot logout yourself", nil) } - return server.logoutUserFromAllDevicesInternal(userID) + return server.logoutUserFromAllDevicesInternal(c.Req.Context(), userID) } // GET /api/admin/users/:id/auth-tokens diff --git a/pkg/api/api.go b/pkg/api/api.go index a727ed15e9610..df532442f8627 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -283,10 +283,10 @@ func (hs *HTTPServer) registerRoutes() { // Dashboard apiRoute.Group("/dashboards", func(dashboardRoute routing.RouteRegister) { - dashboardRoute.Get("/uid/:uid", Wrap(GetDashboard)) + dashboardRoute.Get("/uid/:uid", Wrap(hs.GetDashboard)) dashboardRoute.Delete("/uid/:uid", Wrap(DeleteDashboardByUID)) - dashboardRoute.Get("/db/:slug", Wrap(GetDashboard)) + dashboardRoute.Get("/db/:slug", Wrap(hs.GetDashboard)) dashboardRoute.Delete("/db/:slug", Wrap(DeleteDashboardBySlug)) dashboardRoute.Post("/calculate-diff", bind(dtos.CalculateDiffOptions{}), Wrap(CalculateDashboardDiff)) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index a9d78383045b8..212b568428091 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -5,6 +5,7 @@ import ( "fmt" "os" "path" + "path/filepath" "github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/dashboards" @@ -47,7 +48,7 @@ func dashboardGuardianResponse(err error) Response { return Error(403, "Access denied to this dashboard", nil) } -func GetDashboard(c *m.ReqContext) Response { +func (hs *HTTPServer) GetDashboard(c *m.ReqContext) Response { dash, rsp := getDashboardHelper(c.OrgId, c.Params(":slug"), 0, c.Params(":uid")) if rsp != nil { return rsp @@ -106,14 +107,22 @@ func GetDashboard(c *m.ReqContext) Response { meta.FolderUrl = query.Result.GetUrl() } - isDashboardProvisioned := &m.IsDashboardProvisionedQuery{DashboardId: dash.Id} - err = bus.Dispatch(isDashboardProvisioned) + provisioningData, err := dashboards.NewProvisioningService().GetProvisionedDashboardDataByDashboardId(dash.Id) if err != nil { return Error(500, "Error while checking if dashboard is provisioned", err) } - if isDashboardProvisioned.Result { + if provisioningData != nil { meta.Provisioned = true + meta.ProvisionedExternalId, err = filepath.Rel( + hs.ProvisioningService.GetDashboardProvisionerResolvedPath(provisioningData.Name), + provisioningData.ExternalId, + ) + if err != nil { + // Not sure when this could happen so not sure how to better handle this. Right now ProvisionedExternalId + // is for better UX, showing in Save/Delete dialogs and so it won't break anything if it is empty. + hs.log.Warn("Failed to create ProvisionedExternalId", "err", err) + } } // make sure db version is in sync with json model version diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go index ec6c404e6412f..a3ddf76a7b804 100644 --- a/pkg/api/dashboard_test.go +++ b/pkg/api/dashboard_test.go @@ -11,6 +11,7 @@ import ( m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/dashboards" + "github.com/grafana/grafana/pkg/services/provisioning" "github.com/grafana/grafana/pkg/setting" . "github.com/smartystreets/goconvey/convey" @@ -43,8 +44,8 @@ func TestDashboardApiEndpoint(t *testing.T) { return nil }) - bus.AddHandler("test", func(query *m.IsDashboardProvisionedQuery) error { - query.Result = false + bus.AddHandler("test", func(query *m.GetProvisionedDashboardDataByIdQuery) error { + query.Result = nil return nil }) @@ -198,8 +199,8 @@ func TestDashboardApiEndpoint(t *testing.T) { fakeDash.HasAcl = true setting.ViewersCanEdit = false - bus.AddHandler("test", func(query *m.IsDashboardProvisionedQuery) error { - query.Result = false + bus.AddHandler("test", func(query *m.GetProvisionedDashboardDataByIdQuery) error { + query.Result = nil return nil }) @@ -235,6 +236,10 @@ func TestDashboardApiEndpoint(t *testing.T) { return nil }) + hs := &HTTPServer{ + Cfg: setting.NewCfg(), + } + // This tests six scenarios: // 1. user is an org viewer AND has no permissions for this dashboard // 2. user is an org editor AND has no permissions for this dashboard @@ -247,7 +252,7 @@ func TestDashboardApiEndpoint(t *testing.T) { role := m.ROLE_VIEWER loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) { - sc.handlerFunc = GetDashboard + sc.handlerFunc = hs.GetDashboard sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec() Convey("Should lookup dashboard by slug", func() { @@ -260,7 +265,7 @@ func TestDashboardApiEndpoint(t *testing.T) { }) loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) { - sc.handlerFunc = GetDashboard + sc.handlerFunc = hs.GetDashboard sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec() Convey("Should lookup dashboard by uid", func() { @@ -305,7 +310,7 @@ func TestDashboardApiEndpoint(t *testing.T) { role := m.ROLE_EDITOR loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) { - sc.handlerFunc = GetDashboard + sc.handlerFunc = hs.GetDashboard sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec() Convey("Should lookup dashboard by slug", func() { @@ -318,7 +323,7 @@ func TestDashboardApiEndpoint(t *testing.T) { }) loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/uid/abcdefghi", "/api/dashboards/uid/:uid", role, func(sc *scenarioContext) { - sc.handlerFunc = GetDashboard + sc.handlerFunc = hs.GetDashboard sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec() Convey("Should lookup dashboard by uid", func() { @@ -636,8 +641,8 @@ func TestDashboardApiEndpoint(t *testing.T) { dashTwo.FolderId = 3 dashTwo.HasAcl = false - bus.AddHandler("test", func(query *m.IsDashboardProvisionedQuery) error { - query.Result = false + bus.AddHandler("test", func(query *m.GetProvisionedDashboardDataByIdQuery) error { + query.Result = nil return nil }) @@ -766,8 +771,8 @@ func TestDashboardApiEndpoint(t *testing.T) { return nil }) - bus.AddHandler("test", func(query *m.IsDashboardProvisionedQuery) error { - query.Result = false + bus.AddHandler("test", func(query *m.GetProvisionedDashboardDataByIdQuery) error { + query.Result = nil return nil }) @@ -905,12 +910,12 @@ func TestDashboardApiEndpoint(t *testing.T) { return nil }) bus.AddHandler("test", func(query *m.GetDashboardQuery) error { - query.Result = &m.Dashboard{Id: 1} + query.Result = &m.Dashboard{Id: 1, Data: &simplejson.Json{}} return nil }) - bus.AddHandler("test", func(query *m.IsDashboardProvisionedQuery) error { - query.Result = true + bus.AddHandler("test", func(query *m.GetProvisionedDashboardDataByIdQuery) error { + query.Result = &m.DashboardProvisioning{ExternalId: "/tmp/grafana/dashboards/test/dashboard1.json"} return nil }) @@ -940,11 +945,32 @@ func TestDashboardApiEndpoint(t *testing.T) { So(result.Get("error").MustString(), ShouldEqual, m.ErrDashboardCannotDeleteProvisionedDashboard.Error()) }) }) + + loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/uid/dash", "/api/dashboards/uid/:uid", m.ROLE_EDITOR, func(sc *scenarioContext) { + mock := provisioning.NewProvisioningServiceMock() + mock.GetDashboardProvisionerResolvedPathFunc = func(name string) string { + return "/tmp/grafana/dashboards" + } + + dash := GetDashboardShouldReturn200WithConfig(sc, mock) + + Convey("Should return relative path to provisioning file", func() { + So(dash.Meta.ProvisionedExternalId, ShouldEqual, "test/dashboard1.json") + }) + }) }) } -func GetDashboardShouldReturn200(sc *scenarioContext) dtos.DashboardFullWithMeta { - CallGetDashboard(sc) +func GetDashboardShouldReturn200WithConfig(sc *scenarioContext, provisioningService ProvisioningService) dtos.DashboardFullWithMeta { + if provisioningService == nil { + provisioningService = provisioning.NewProvisioningServiceMock() + } + + hs := &HTTPServer{ + Cfg: setting.NewCfg(), + ProvisioningService: provisioningService, + } + CallGetDashboard(sc, hs) So(sc.resp.Code, ShouldEqual, 200) @@ -955,8 +981,13 @@ func GetDashboardShouldReturn200(sc *scenarioContext) dtos.DashboardFullWithMeta return dash } -func CallGetDashboard(sc *scenarioContext) { - sc.handlerFunc = GetDashboard +func GetDashboardShouldReturn200(sc *scenarioContext) dtos.DashboardFullWithMeta { + return GetDashboardShouldReturn200WithConfig(sc, nil) +} + +func CallGetDashboard(sc *scenarioContext, hs *HTTPServer) { + + sc.handlerFunc = hs.GetDashboard sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec() } diff --git a/pkg/api/dtos/dashboard.go b/pkg/api/dtos/dashboard.go index 39a6dca580d95..c30e0dbcad249 100644 --- a/pkg/api/dtos/dashboard.go +++ b/pkg/api/dtos/dashboard.go @@ -7,28 +7,29 @@ import ( ) type DashboardMeta struct { - IsStarred bool `json:"isStarred,omitempty"` - IsHome bool `json:"isHome,omitempty"` - IsSnapshot bool `json:"isSnapshot,omitempty"` - Type string `json:"type,omitempty"` - CanSave bool `json:"canSave"` - CanEdit bool `json:"canEdit"` - CanAdmin bool `json:"canAdmin"` - CanStar bool `json:"canStar"` - Slug string `json:"slug"` - Url string `json:"url"` - Expires time.Time `json:"expires"` - Created time.Time `json:"created"` - Updated time.Time `json:"updated"` - UpdatedBy string `json:"updatedBy"` - CreatedBy string `json:"createdBy"` - Version int `json:"version"` - HasAcl bool `json:"hasAcl"` - IsFolder bool `json:"isFolder"` - FolderId int64 `json:"folderId"` - FolderTitle string `json:"folderTitle"` - FolderUrl string `json:"folderUrl"` - Provisioned bool `json:"provisioned"` + IsStarred bool `json:"isStarred,omitempty"` + IsHome bool `json:"isHome,omitempty"` + IsSnapshot bool `json:"isSnapshot,omitempty"` + Type string `json:"type,omitempty"` + CanSave bool `json:"canSave"` + CanEdit bool `json:"canEdit"` + CanAdmin bool `json:"canAdmin"` + CanStar bool `json:"canStar"` + Slug string `json:"slug"` + Url string `json:"url"` + Expires time.Time `json:"expires"` + Created time.Time `json:"created"` + Updated time.Time `json:"updated"` + UpdatedBy string `json:"updatedBy"` + CreatedBy string `json:"createdBy"` + Version int `json:"version"` + HasAcl bool `json:"hasAcl"` + IsFolder bool `json:"isFolder"` + FolderId int64 `json:"folderId"` + FolderTitle string `json:"folderTitle"` + FolderUrl string `json:"folderUrl"` + Provisioned bool `json:"provisioned"` + ProvisionedExternalId string `json:"provisionedExternalId"` } type DashboardFullWithMeta struct { diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go index a8e92014a8f1e..7c84d579e4a95 100644 --- a/pkg/api/http_server.go +++ b/pkg/api/http_server.go @@ -25,13 +25,12 @@ import ( "github.com/grafana/grafana/pkg/services/cache" "github.com/grafana/grafana/pkg/services/datasources" "github.com/grafana/grafana/pkg/services/hooks" - "github.com/grafana/grafana/pkg/services/provisioning" "github.com/grafana/grafana/pkg/services/quota" "github.com/grafana/grafana/pkg/services/rendering" "github.com/grafana/grafana/pkg/setting" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - macaron "gopkg.in/macaron.v1" + "gopkg.in/macaron.v1" ) func init() { @@ -42,6 +41,13 @@ func init() { }) } +type ProvisioningService interface { + ProvisionDatasources() error + ProvisionNotifications() error + ProvisionDashboards() error + GetDashboardProvisionerResolvedPath(name string) string +} + type HTTPServer struct { log log.Logger macaron *macaron.Macaron @@ -49,17 +55,17 @@ type HTTPServer struct { streamManager *live.StreamManager httpSrv *http.Server - RouteRegister routing.RouteRegister `inject:""` - Bus bus.Bus `inject:""` - RenderService rendering.Service `inject:""` - Cfg *setting.Cfg `inject:""` - HooksService *hooks.HooksService `inject:""` - CacheService *cache.CacheService `inject:""` - DatasourceCache datasources.CacheService `inject:""` - AuthTokenService models.UserTokenService `inject:""` - QuotaService *quota.QuotaService `inject:""` - RemoteCacheService *remotecache.RemoteCache `inject:""` - ProvisioningService provisioning.ProvisioningService `inject:""` + RouteRegister routing.RouteRegister `inject:""` + Bus bus.Bus `inject:""` + RenderService rendering.Service `inject:""` + Cfg *setting.Cfg `inject:""` + HooksService *hooks.HooksService `inject:""` + CacheService *cache.CacheService `inject:""` + DatasourceCache datasources.CacheService `inject:""` + AuthTokenService models.UserTokenService `inject:""` + QuotaService *quota.QuotaService `inject:""` + RemoteCacheService *remotecache.RemoteCache `inject:""` + ProvisioningService ProvisioningService `inject:""` } func (hs *HTTPServer) Init() error { diff --git a/pkg/api/login.go b/pkg/api/login.go index 65ace1b2b835e..ebf4cc8db07ce 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -131,7 +131,7 @@ func (hs *HTTPServer) loginUserWithUser(user *m.User, c *m.ReqContext) { hs.log.Error("user login with nil user") } - userToken, err := hs.AuthTokenService.CreateToken(user.Id, c.RemoteAddr(), c.Req.UserAgent()) + userToken, err := hs.AuthTokenService.CreateToken(c.Req.Context(), user.Id, c.RemoteAddr(), c.Req.UserAgent()) if err != nil { hs.log.Error("failed to create auth token", "error", err) } @@ -140,7 +140,7 @@ func (hs *HTTPServer) loginUserWithUser(user *m.User, c *m.ReqContext) { } func (hs *HTTPServer) Logout(c *m.ReqContext) { - if err := hs.AuthTokenService.RevokeToken(c.UserToken); err != nil && err != m.ErrUserTokenNotFound { + if err := hs.AuthTokenService.RevokeToken(c.Req.Context(), c.UserToken); err != nil && err != m.ErrUserTokenNotFound { hs.log.Error("failed to revoke auth token", "error", err) } diff --git a/pkg/api/pluginproxy/ds_proxy.go b/pkg/api/pluginproxy/ds_proxy.go index b86d1834844f7..fe79fa565950b 100644 --- a/pkg/api/pluginproxy/ds_proxy.go +++ b/pkg/api/pluginproxy/ds_proxy.go @@ -101,8 +101,14 @@ func (proxy *DataSourceProxy) HandleRequest() { opentracing.HTTPHeaders, opentracing.HTTPHeadersCarrier(proxy.ctx.Req.Request.Header)) + originalSetCookie := proxy.ctx.Resp.Header().Get("Set-Cookie") + reverseProxy.ServeHTTP(proxy.ctx.Resp, proxy.ctx.Req.Request) proxy.ctx.Resp.Header().Del("Set-Cookie") + + if originalSetCookie != "" { + proxy.ctx.Resp.Header().Set("Set-Cookie", originalSetCookie) + } } func (proxy *DataSourceProxy) addTraceFromHeaderValue(span opentracing.Span, headerName string, tagName string) { diff --git a/pkg/api/pluginproxy/ds_proxy_test.go b/pkg/api/pluginproxy/ds_proxy_test.go index e9e526fb7c39d..c3eccb4a57c96 100644 --- a/pkg/api/pluginproxy/ds_proxy_test.go +++ b/pkg/api/pluginproxy/ds_proxy_test.go @@ -3,13 +3,15 @@ package pluginproxy import ( "bytes" "fmt" - "github.com/grafana/grafana/pkg/components/securejsondata" "io/ioutil" "net/http" + "net/http/httptest" "net/url" "testing" "time" + "github.com/grafana/grafana/pkg/components/securejsondata" + "golang.org/x/oauth2" macaron "gopkg.in/macaron.v1" @@ -496,9 +498,73 @@ func TestDSRouteRule(t *testing.T) { runDatasourceAuthTest(test) } }) + + Convey("HandleRequest()", func() { + backend := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + http.SetCookie(w, &http.Cookie{Name: "flavor", Value: "chocolateChip"}) + w.WriteHeader(200) + w.Write([]byte("I am the backend")) + })) + defer backend.Close() + + plugin := &plugins.DataSourcePlugin{} + ds := &m.DataSource{Url: backend.URL, Type: m.DS_GRAPHITE} + + responseRecorder := &CloseNotifierResponseRecorder{ + ResponseRecorder: httptest.NewRecorder(), + } + defer responseRecorder.Close() + + setupCtx := func(fn func(http.ResponseWriter)) *m.ReqContext { + responseWriter := macaron.NewResponseWriter("GET", responseRecorder) + if fn != nil { + fn(responseWriter) + } + + return &m.ReqContext{ + SignedInUser: &m.SignedInUser{}, + Context: &macaron.Context{ + Req: macaron.Request{ + Request: httptest.NewRequest("GET", "/render", nil), + }, + Resp: responseWriter, + }, + } + } + + Convey("When response header Set-Cookie is not set should remove proxied Set-Cookie header", func() { + ctx := setupCtx(nil) + proxy := NewDataSourceProxy(ds, plugin, ctx, "/render", &setting.Cfg{}) + proxy.HandleRequest() + So(proxy.ctx.Resp.Header().Get("Set-Cookie"), ShouldBeEmpty) + }) + + Convey("When response header Set-Cookie is set should remove proxied Set-Cookie header and restore the original Set-Cookie header", func() { + ctx := setupCtx(func(w http.ResponseWriter) { + w.Header().Set("Set-Cookie", "important_cookie=important_value") + }) + proxy := NewDataSourceProxy(ds, plugin, ctx, "/render", &setting.Cfg{}) + proxy.HandleRequest() + So(proxy.ctx.Resp.Header().Get("Set-Cookie"), ShouldEqual, "important_cookie=important_value") + }) + }) }) } +type CloseNotifierResponseRecorder struct { + *httptest.ResponseRecorder + closeChan chan bool +} + +func (r *CloseNotifierResponseRecorder) CloseNotify() <-chan bool { + r.closeChan = make(chan bool) + return r.closeChan +} + +func (r *CloseNotifierResponseRecorder) Close() { + close(r.closeChan) +} + // getDatasourceProxiedRequest is a helper for easier setup of tests based on global config and ReqContext. func getDatasourceProxiedRequest(ctx *m.ReqContext, cfg *setting.Cfg) *http.Request { plugin := &plugins.DataSourcePlugin{} diff --git a/pkg/api/user_token.go b/pkg/api/user_token.go index 2f74eedea5dce..3e53a003bd893 100644 --- a/pkg/api/user_token.go +++ b/pkg/api/user_token.go @@ -1,6 +1,7 @@ package api import ( + "context" "time" "github.com/grafana/grafana/pkg/api/dtos" @@ -19,7 +20,7 @@ func (server *HTTPServer) RevokeUserAuthToken(c *models.ReqContext, cmd models.R return server.revokeUserAuthTokenInternal(c, c.UserId, cmd) } -func (server *HTTPServer) logoutUserFromAllDevicesInternal(userID int64) Response { +func (server *HTTPServer) logoutUserFromAllDevicesInternal(ctx context.Context, userID int64) Response { userQuery := models.GetUserByIdQuery{Id: userID} if err := bus.Dispatch(&userQuery); err != nil { @@ -29,7 +30,7 @@ func (server *HTTPServer) logoutUserFromAllDevicesInternal(userID int64) Respons return Error(500, "Could not read user from database", err) } - err := server.AuthTokenService.RevokeAllUserTokens(userID) + err := server.AuthTokenService.RevokeAllUserTokens(ctx, userID) if err != nil { return Error(500, "Failed to logout user", err) } @@ -49,7 +50,7 @@ func (server *HTTPServer) getUserAuthTokensInternal(c *models.ReqContext, userID return Error(500, "Failed to get user", err) } - tokens, err := server.AuthTokenService.GetUserTokens(userID) + tokens, err := server.AuthTokenService.GetUserTokens(c.Req.Context(), userID) if err != nil { return Error(500, "Failed to get user auth tokens", err) } @@ -84,7 +85,7 @@ func (server *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, user return Error(500, "Failed to get user", err) } - token, err := server.AuthTokenService.GetUserToken(userID, cmd.AuthTokenId) + token, err := server.AuthTokenService.GetUserToken(c.Req.Context(), userID, cmd.AuthTokenId) if err != nil { if err == models.ErrUserTokenNotFound { return Error(404, "User auth token not found", err) @@ -96,7 +97,7 @@ func (server *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, user return Error(400, "Cannot revoke active user auth token", nil) } - err = server.AuthTokenService.RevokeToken(token) + err = server.AuthTokenService.RevokeToken(c.Req.Context(), token) if err != nil { if err == models.ErrUserTokenNotFound { return Error(404, "User auth token not found", err) diff --git a/pkg/api/user_token_test.go b/pkg/api/user_token_test.go index 111070dca92c5..aa5bc47f93e96 100644 --- a/pkg/api/user_token_test.go +++ b/pkg/api/user_token_test.go @@ -1,6 +1,7 @@ package api import ( + "context" "testing" "time" @@ -75,7 +76,7 @@ func TestUserTokenApiEndpoint(t *testing.T) { token := &m.UserToken{Id: 1} revokeUserAuthTokenInternalScenario("Should be successful", cmd, 200, token, func(sc *scenarioContext) { - sc.userAuthTokenService.GetUserTokenProvider = func(userId, userTokenId int64) (*m.UserToken, error) { + sc.userAuthTokenService.GetUserTokenProvider = func(ctx context.Context, userId, userTokenId int64) (*m.UserToken, error) { return &m.UserToken{Id: 2}, nil } sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec() @@ -93,7 +94,7 @@ func TestUserTokenApiEndpoint(t *testing.T) { token := &m.UserToken{Id: 2} revokeUserAuthTokenInternalScenario("Should not be successful", cmd, TestUserID, token, func(sc *scenarioContext) { - sc.userAuthTokenService.GetUserTokenProvider = func(userId, userTokenId int64) (*m.UserToken, error) { + sc.userAuthTokenService.GetUserTokenProvider = func(ctx context.Context, userId, userTokenId int64) (*m.UserToken, error) { return token, nil } sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec() @@ -126,7 +127,7 @@ func TestUserTokenApiEndpoint(t *testing.T) { SeenAt: time.Now().Unix(), }, } - sc.userAuthTokenService.GetUserTokensProvider = func(userId int64) ([]*m.UserToken, error) { + sc.userAuthTokenService.GetUserTokensProvider = func(ctx context.Context, userId int64) ([]*m.UserToken, error) { return tokens, nil } sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec() @@ -226,7 +227,7 @@ func logoutUserFromAllDevicesInternalScenario(desc string, userId int64, fn scen sc.context.OrgId = TestOrgID sc.context.OrgRole = m.ROLE_ADMIN - return hs.logoutUserFromAllDevicesInternal(userId) + return hs.logoutUserFromAllDevicesInternal(context.Background(), userId) }) sc.m.Post("/", sc.defaultHandler) diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go index bec1d51bff468..99cef15e50e3f 100644 --- a/pkg/cmd/grafana-cli/commands/install_command.go +++ b/pkg/cmd/grafana-cli/commands/install_command.go @@ -144,7 +144,7 @@ func downloadFile(pluginName, filePath, url string) (err error) { } }() - resp, err := http.Get(url) + resp, err := http.Get(url) // #nosec if err != nil { return err } @@ -167,7 +167,7 @@ func extractFiles(body []byte, pluginName string, filePath string) error { newFile := path.Join(filePath, RemoveGitBuildFromName(pluginName, zf.Name)) if zf.FileInfo().IsDir() { - err := os.Mkdir(newFile, 0777) + err := os.Mkdir(newFile, 0755) if permissionsError(err) { return fmt.Errorf(permissionsDeniedMessage, newFile) } diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go index c825ea0d8ba09..f988b0b576337 100644 --- a/pkg/middleware/middleware.go +++ b/pkg/middleware/middleware.go @@ -174,7 +174,7 @@ func initContextWithToken(authTokenService m.UserTokenService, ctx *m.ReqContext return false } - token, err := authTokenService.LookupToken(rawToken) + token, err := authTokenService.LookupToken(ctx.Req.Context(), rawToken) if err != nil { ctx.Logger.Error("failed to look up user based on cookie", "error", err) WriteSessionCookie(ctx, "", -1) @@ -191,7 +191,7 @@ func initContextWithToken(authTokenService m.UserTokenService, ctx *m.ReqContext ctx.IsSignedIn = true ctx.UserToken = token - rotated, err := authTokenService.TryRotateToken(token, ctx.RemoteAddr(), ctx.Req.UserAgent()) + rotated, err := authTokenService.TryRotateToken(ctx.Req.Context(), token, ctx.RemoteAddr(), ctx.Req.UserAgent()) if err != nil { ctx.Logger.Error("failed to rotate token", "error", err) return true diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go index 92d3da0896f2c..e59e017398a78 100644 --- a/pkg/middleware/middleware_test.go +++ b/pkg/middleware/middleware_test.go @@ -1,6 +1,7 @@ package middleware import ( + "context" "encoding/json" "fmt" "net/http" @@ -156,7 +157,7 @@ func TestMiddlewareContext(t *testing.T) { return nil }) - sc.userAuthTokenService.LookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) { + sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*m.UserToken, error) { return &m.UserToken{ UserId: 12, UnhashedToken: unhashedToken, @@ -185,14 +186,14 @@ func TestMiddlewareContext(t *testing.T) { return nil }) - sc.userAuthTokenService.LookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) { + sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*m.UserToken, error) { return &m.UserToken{ UserId: 12, UnhashedToken: "", }, nil } - sc.userAuthTokenService.TryRotateTokenProvider = func(userToken *m.UserToken, clientIP, userAgent string) (bool, error) { + sc.userAuthTokenService.TryRotateTokenProvider = func(ctx context.Context, userToken *m.UserToken, clientIP, userAgent string) (bool, error) { userToken.UnhashedToken = "rotated" return true, nil } @@ -227,7 +228,7 @@ func TestMiddlewareContext(t *testing.T) { middlewareScenario(t, "Invalid/expired auth token in cookie", func(sc *scenarioContext) { sc.withTokenSessionCookie("token") - sc.userAuthTokenService.LookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) { + sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*m.UserToken, error) { return nil, m.ErrUserTokenNotFound } diff --git a/pkg/middleware/org_redirect_test.go b/pkg/middleware/org_redirect_test.go index f307376331ece..e74b6e8451c90 100644 --- a/pkg/middleware/org_redirect_test.go +++ b/pkg/middleware/org_redirect_test.go @@ -1,6 +1,7 @@ package middleware import ( + "context" "fmt" "testing" @@ -23,7 +24,7 @@ func TestOrgRedirectMiddleware(t *testing.T) { return nil }) - sc.userAuthTokenService.LookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) { + sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*m.UserToken, error) { return &m.UserToken{ UserId: 0, UnhashedToken: "", @@ -49,7 +50,7 @@ func TestOrgRedirectMiddleware(t *testing.T) { return nil }) - sc.userAuthTokenService.LookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) { + sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*m.UserToken, error) { return &m.UserToken{ UserId: 12, UnhashedToken: "", diff --git a/pkg/middleware/quota_test.go b/pkg/middleware/quota_test.go index c3b448c9f6a07..c6c8a1fd4d336 100644 --- a/pkg/middleware/quota_test.go +++ b/pkg/middleware/quota_test.go @@ -1,6 +1,7 @@ package middleware import ( + "context" "testing" "github.com/grafana/grafana/pkg/bus" @@ -87,7 +88,7 @@ func TestMiddlewareQuota(t *testing.T) { return nil }) - sc.userAuthTokenService.LookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) { + sc.userAuthTokenService.LookupTokenProvider = func(ctx context.Context, unhashedToken string) (*m.UserToken, error) { return &m.UserToken{ UserId: 12, UnhashedToken: "", diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go index e54d0c1145349..60677c9b6f6ea 100644 --- a/pkg/models/dashboards.go +++ b/pkg/models/dashboards.go @@ -323,15 +323,13 @@ type GetDashboardSlugByIdQuery struct { Result string } -type IsDashboardProvisionedQuery struct { +type GetProvisionedDashboardDataByIdQuery struct { DashboardId int64 - - Result bool + Result *DashboardProvisioning } type GetProvisionedDashboardDataQuery struct { - Name string - + Name string Result []*DashboardProvisioning } diff --git a/pkg/models/user_token.go b/pkg/models/user_token.go index 8c3e7985995e7..b07bd50811487 100644 --- a/pkg/models/user_token.go +++ b/pkg/models/user_token.go @@ -1,6 +1,7 @@ package models import ( + "context" "errors" ) @@ -31,12 +32,12 @@ type RevokeAuthTokenCmd struct { // UserTokenService are used for generating and validating user tokens type UserTokenService interface { - CreateToken(userId int64, clientIP, userAgent string) (*UserToken, error) - LookupToken(unhashedToken string) (*UserToken, error) - TryRotateToken(token *UserToken, clientIP, userAgent string) (bool, error) - RevokeToken(token *UserToken) error - RevokeAllUserTokens(userId int64) error - ActiveTokenCount() (int64, error) - GetUserToken(userId, userTokenId int64) (*UserToken, error) - GetUserTokens(userId int64) ([]*UserToken, error) + CreateToken(ctx context.Context, userId int64, clientIP, userAgent string) (*UserToken, error) + LookupToken(ctx context.Context, unhashedToken string) (*UserToken, error) + TryRotateToken(ctx context.Context, token *UserToken, clientIP, userAgent string) (bool, error) + RevokeToken(ctx context.Context, token *UserToken) error + RevokeAllUserTokens(ctx context.Context, userId int64) error + ActiveTokenCount(ctx context.Context) (int64, error) + GetUserToken(ctx context.Context, userId, userTokenId int64) (*UserToken, error) + GetUserTokens(ctx context.Context, userId int64) ([]*UserToken, error) } diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go index 1a0a910a5d329..c28ac49b8945d 100644 --- a/pkg/services/alerting/notifier.go +++ b/pkg/services/alerting/notifier.go @@ -3,7 +3,6 @@ package alerting import ( "errors" "fmt" - "time" "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/components/imguploader" @@ -127,7 +126,7 @@ func (n *notificationService) uploadImage(context *EvalContext) (err error) { renderOpts := rendering.Opts{ Width: 1000, Height: 500, - Timeout: time.Duration(setting.AlertingEvaluationTimeout.Seconds() * 0.9), + Timeout: setting.AlertingEvaluationTimeout, OrgId: context.Rule.OrgId, OrgRole: m.ROLE_ADMIN, ConcurrentLimit: setting.AlertingRenderLimit, diff --git a/pkg/services/auth/auth_token.go b/pkg/services/auth/auth_token.go index 740e5081668d0..dc9936f2f3ffd 100644 --- a/pkg/services/auth/auth_token.go +++ b/pkg/services/auth/auth_token.go @@ -1,6 +1,7 @@ package auth import ( + "context" "crypto/sha256" "encoding/hex" "time" @@ -35,14 +36,24 @@ func (s *UserAuthTokenService) Init() error { return nil } -func (s *UserAuthTokenService) ActiveTokenCount() (int64, error) { - var model userAuthToken - count, err := s.SQLStore.NewSession().Where(`created_at > ? AND rotated_at > ?`, s.createdAfterParam(), s.rotatedAfterParam()).Count(&model) +func (s *UserAuthTokenService) ActiveTokenCount(ctx context.Context) (int64, error) { + + var count int64 + var err error + err = s.SQLStore.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error { + var model userAuthToken + count, err = dbSession.Where(`created_at > ? AND rotated_at > ?`, + s.createdAfterParam(), + s.rotatedAfterParam()). + Count(&model) + + return err + }) return count, err } -func (s *UserAuthTokenService) CreateToken(userId int64, clientIP, userAgent string) (*models.UserToken, error) { +func (s *UserAuthTokenService) CreateToken(ctx context.Context, userId int64, clientIP, userAgent string) (*models.UserToken, error) { clientIP = util.ParseIPAddress(clientIP) token, err := util.RandomHex(16) if err != nil { @@ -65,7 +76,12 @@ func (s *UserAuthTokenService) CreateToken(userId int64, clientIP, userAgent str SeenAt: 0, AuthTokenSeen: false, } - _, err = s.SQLStore.NewSession().Insert(&userAuthToken) + + err = s.SQLStore.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error { + _, err = dbSession.Insert(&userAuthToken) + return err + }) + if err != nil { return nil, err } @@ -80,14 +96,27 @@ func (s *UserAuthTokenService) CreateToken(userId int64, clientIP, userAgent str return &userToken, err } -func (s *UserAuthTokenService) LookupToken(unhashedToken string) (*models.UserToken, error) { +func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken string) (*models.UserToken, error) { hashedToken := hashToken(unhashedToken) if setting.Env == setting.DEV { s.log.Debug("looking up token", "unhashed", unhashedToken, "hashed", hashedToken) } var model userAuthToken - exists, err := s.SQLStore.NewSession().Where("(auth_token = ? OR prev_auth_token = ?) AND created_at > ? AND rotated_at > ?", hashedToken, hashedToken, s.createdAfterParam(), s.rotatedAfterParam()).Get(&model) + var exists bool + var err error + err = s.SQLStore.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error { + exists, err = dbSession.Where("(auth_token = ? OR prev_auth_token = ?) AND created_at > ? AND rotated_at > ?", + hashedToken, + hashedToken, + s.createdAfterParam(), + s.rotatedAfterParam()). + Get(&model) + + return err + + }) + if err != nil { return nil, err } @@ -100,7 +129,18 @@ func (s *UserAuthTokenService) LookupToken(unhashedToken string) (*models.UserTo modelCopy := model modelCopy.AuthTokenSeen = false expireBefore := getTime().Add(-urgentRotateTime).Unix() - affectedRows, err := s.SQLStore.NewSession().Where("id = ? AND prev_auth_token = ? AND rotated_at < ?", modelCopy.Id, modelCopy.PrevAuthToken, expireBefore).AllCols().Update(&modelCopy) + + var affectedRows int64 + err = s.SQLStore.WithTransactionalDbSession(ctx, func(dbSession *sqlstore.DBSession) error { + affectedRows, err = dbSession.Where("id = ? AND prev_auth_token = ? AND rotated_at < ?", + modelCopy.Id, + modelCopy.PrevAuthToken, + expireBefore). + AllCols().Update(&modelCopy) + + return err + }) + if err != nil { return nil, err } @@ -116,7 +156,17 @@ func (s *UserAuthTokenService) LookupToken(unhashedToken string) (*models.UserTo modelCopy := model modelCopy.AuthTokenSeen = true modelCopy.SeenAt = getTime().Unix() - affectedRows, err := s.SQLStore.NewSession().Where("id = ? AND auth_token = ?", modelCopy.Id, modelCopy.AuthToken).AllCols().Update(&modelCopy) + + var affectedRows int64 + err = s.SQLStore.WithTransactionalDbSession(ctx, func(dbSession *sqlstore.DBSession) error { + affectedRows, err = dbSession.Where("id = ? AND auth_token = ?", + modelCopy.Id, + modelCopy.AuthToken). + AllCols().Update(&modelCopy) + + return err + }) + if err != nil { return nil, err } @@ -140,7 +190,7 @@ func (s *UserAuthTokenService) LookupToken(unhashedToken string) (*models.UserTo return &userToken, err } -func (s *UserAuthTokenService) TryRotateToken(token *models.UserToken, clientIP, userAgent string) (bool, error) { +func (s *UserAuthTokenService) TryRotateToken(ctx context.Context, token *models.UserToken, clientIP, userAgent string) (bool, error) { if token == nil { return false, nil } @@ -183,12 +233,21 @@ func (s *UserAuthTokenService) TryRotateToken(token *models.UserToken, clientIP, rotated_at = ? WHERE id = ? AND (auth_token_seen = ? OR rotated_at < ?)` - res, err := s.SQLStore.NewSession().Exec(sql, userAgent, clientIP, s.SQLStore.Dialect.BooleanStr(true), hashedToken, s.SQLStore.Dialect.BooleanStr(false), now.Unix(), model.Id, s.SQLStore.Dialect.BooleanStr(true), now.Add(-30*time.Second).Unix()) + var affected int64 + err = s.SQLStore.WithTransactionalDbSession(ctx, func(dbSession *sqlstore.DBSession) error { + res, err := dbSession.Exec(sql, userAgent, clientIP, s.SQLStore.Dialect.BooleanStr(true), hashedToken, s.SQLStore.Dialect.BooleanStr(false), now.Unix(), model.Id, s.SQLStore.Dialect.BooleanStr(true), now.Add(-30*time.Second).Unix()) + if err != nil { + return err + } + + affected, err = res.RowsAffected() + return err + }) + if err != nil { return false, err } - affected, _ := res.RowsAffected() s.log.Debug("auth token rotated", "affected", affected, "auth_token_id", model.Id, "userId", model.UserId) if affected > 0 { model.UnhashedToken = newToken @@ -199,14 +258,20 @@ func (s *UserAuthTokenService) TryRotateToken(token *models.UserToken, clientIP, return false, nil } -func (s *UserAuthTokenService) RevokeToken(token *models.UserToken) error { +func (s *UserAuthTokenService) RevokeToken(ctx context.Context, token *models.UserToken) error { if token == nil { return models.ErrUserTokenNotFound } model := userAuthTokenFromUserToken(token) - rowsAffected, err := s.SQLStore.NewSession().Delete(model) + var rowsAffected int64 + var err error + err = s.SQLStore.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error { + rowsAffected, err = dbSession.Delete(model) + return err + }) + if err != nil { return err } @@ -221,55 +286,71 @@ func (s *UserAuthTokenService) RevokeToken(token *models.UserToken) error { return nil } -func (s *UserAuthTokenService) RevokeAllUserTokens(userId int64) error { - sql := `DELETE from user_auth_token WHERE user_id = ?` - res, err := s.SQLStore.NewSession().Exec(sql, userId) - if err != nil { - return err - } +func (s *UserAuthTokenService) RevokeAllUserTokens(ctx context.Context, userId int64) error { + return s.SQLStore.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error { + sql := `DELETE from user_auth_token WHERE user_id = ?` + res, err := dbSession.Exec(sql, userId) + if err != nil { + return err + } - affected, err := res.RowsAffected() - if err != nil { - return err - } + affected, err := res.RowsAffected() + if err != nil { + return err + } - s.log.Debug("all user tokens for user revoked", "userId", userId, "count", affected) + s.log.Debug("all user tokens for user revoked", "userId", userId, "count", affected) - return nil + return err + }) } -func (s *UserAuthTokenService) GetUserToken(userId, userTokenId int64) (*models.UserToken, error) { - var token userAuthToken - exists, err := s.SQLStore.NewSession().Where("id = ? AND user_id = ?", userTokenId, userId).Get(&token) - if err != nil { - return nil, err - } - - if !exists { - return nil, models.ErrUserTokenNotFound - } +func (s *UserAuthTokenService) GetUserToken(ctx context.Context, userId, userTokenId int64) (*models.UserToken, error) { var result models.UserToken - token.toUserToken(&result) + err := s.SQLStore.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error { + var token userAuthToken + exists, err := dbSession.Where("id = ? AND user_id = ?", userTokenId, userId).Get(&token) + if err != nil { + return err + } + + if !exists { + return models.ErrUserTokenNotFound + } + + token.toUserToken(&result) + return nil + }) - return &result, nil + return &result, err } -func (s *UserAuthTokenService) GetUserTokens(userId int64) ([]*models.UserToken, error) { - var tokens []*userAuthToken - err := s.SQLStore.NewSession().Where("user_id = ? AND created_at > ? AND rotated_at > ?", userId, s.createdAfterParam(), s.rotatedAfterParam()).Find(&tokens) - if err != nil { - return nil, err - } +func (s *UserAuthTokenService) GetUserTokens(ctx context.Context, userId int64) ([]*models.UserToken, error) { result := []*models.UserToken{} - for _, token := range tokens { - var userToken models.UserToken - token.toUserToken(&userToken) - result = append(result, &userToken) - } + err := s.SQLStore.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error { + var tokens []*userAuthToken + err := dbSession.Where("user_id = ? AND created_at > ? AND rotated_at > ?", + userId, + s.createdAfterParam(), + s.rotatedAfterParam()). + Find(&tokens) + + if err != nil { + return err + } + + for _, token := range tokens { + var userToken models.UserToken + token.toUserToken(&userToken) + result = append(result, &userToken) + } + + return nil + }) - return result, nil + return result, err } func (s *UserAuthTokenService) createdAfterParam() int64 { diff --git a/pkg/services/auth/auth_token_test.go b/pkg/services/auth/auth_token_test.go index 33eb309ad18dd..b1398834bdc94 100644 --- a/pkg/services/auth/auth_token_test.go +++ b/pkg/services/auth/auth_token_test.go @@ -1,6 +1,7 @@ package auth import ( + "context" "encoding/json" "testing" "time" @@ -26,19 +27,19 @@ func TestUserAuthToken(t *testing.T) { } Convey("When creating token", func() { - userToken, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent") + userToken, err := userAuthTokenService.CreateToken(context.Background(), userID, "192.168.10.11:1234", "some user agent") So(err, ShouldBeNil) So(userToken, ShouldNotBeNil) So(userToken.AuthTokenSeen, ShouldBeFalse) Convey("Can count active tokens", func() { - count, err := userAuthTokenService.ActiveTokenCount() + count, err := userAuthTokenService.ActiveTokenCount(context.Background()) So(err, ShouldBeNil) So(count, ShouldEqual, 1) }) Convey("When lookup unhashed token should return user auth token", func() { - userToken, err := userAuthTokenService.LookupToken(userToken.UnhashedToken) + userToken, err := userAuthTokenService.LookupToken(context.Background(), userToken.UnhashedToken) So(err, ShouldBeNil) So(userToken, ShouldNotBeNil) So(userToken.UserId, ShouldEqual, userID) @@ -51,13 +52,13 @@ func TestUserAuthToken(t *testing.T) { }) Convey("When lookup hashed token should return user auth token not found error", func() { - userToken, err := userAuthTokenService.LookupToken(userToken.AuthToken) + userToken, err := userAuthTokenService.LookupToken(context.Background(), userToken.AuthToken) So(err, ShouldEqual, models.ErrUserTokenNotFound) So(userToken, ShouldBeNil) }) Convey("revoking existing token should delete token", func() { - err = userAuthTokenService.RevokeToken(userToken) + err = userAuthTokenService.RevokeToken(context.Background(), userToken) So(err, ShouldBeNil) model, err := ctx.getAuthTokenByID(userToken.Id) @@ -66,37 +67,37 @@ func TestUserAuthToken(t *testing.T) { }) Convey("revoking nil token should return error", func() { - err = userAuthTokenService.RevokeToken(nil) + err = userAuthTokenService.RevokeToken(context.Background(), nil) So(err, ShouldEqual, models.ErrUserTokenNotFound) }) Convey("revoking non-existing token should return error", func() { userToken.Id = 1000 - err = userAuthTokenService.RevokeToken(userToken) + err = userAuthTokenService.RevokeToken(context.Background(), userToken) So(err, ShouldEqual, models.ErrUserTokenNotFound) }) Convey("When creating an additional token", func() { - userToken2, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent") + userToken2, err := userAuthTokenService.CreateToken(context.Background(), userID, "192.168.10.11:1234", "some user agent") So(err, ShouldBeNil) So(userToken2, ShouldNotBeNil) Convey("Can get first user token", func() { - token, err := userAuthTokenService.GetUserToken(userID, userToken.Id) + token, err := userAuthTokenService.GetUserToken(context.Background(), userID, userToken.Id) So(err, ShouldBeNil) So(token, ShouldNotBeNil) So(token.Id, ShouldEqual, userToken.Id) }) Convey("Can get second user token", func() { - token, err := userAuthTokenService.GetUserToken(userID, userToken2.Id) + token, err := userAuthTokenService.GetUserToken(context.Background(), userID, userToken2.Id) So(err, ShouldBeNil) So(token, ShouldNotBeNil) So(token.Id, ShouldEqual, userToken2.Id) }) Convey("Can get user tokens", func() { - tokens, err := userAuthTokenService.GetUserTokens(userID) + tokens, err := userAuthTokenService.GetUserTokens(context.Background(), userID) So(err, ShouldBeNil) So(tokens, ShouldHaveLength, 2) So(tokens[0].Id, ShouldEqual, userToken.Id) @@ -104,7 +105,7 @@ func TestUserAuthToken(t *testing.T) { }) Convey("Can revoke all user tokens", func() { - err := userAuthTokenService.RevokeAllUserTokens(userID) + err := userAuthTokenService.RevokeAllUserTokens(context.Background(), userID) So(err, ShouldBeNil) model, err := ctx.getAuthTokenByID(userToken.Id) @@ -119,24 +120,24 @@ func TestUserAuthToken(t *testing.T) { }) Convey("expires correctly", func() { - userToken, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent") + userToken, err := userAuthTokenService.CreateToken(context.Background(), userID, "192.168.10.11:1234", "some user agent") So(err, ShouldBeNil) - userToken, err = userAuthTokenService.LookupToken(userToken.UnhashedToken) + userToken, err = userAuthTokenService.LookupToken(context.Background(), userToken.UnhashedToken) So(err, ShouldBeNil) getTime = func() time.Time { return t.Add(time.Hour) } - rotated, err := userAuthTokenService.TryRotateToken(userToken, "192.168.10.11:1234", "some user agent") + rotated, err := userAuthTokenService.TryRotateToken(context.Background(), userToken, "192.168.10.11:1234", "some user agent") So(err, ShouldBeNil) So(rotated, ShouldBeTrue) - userToken, err = userAuthTokenService.LookupToken(userToken.UnhashedToken) + userToken, err = userAuthTokenService.LookupToken(context.Background(), userToken.UnhashedToken) So(err, ShouldBeNil) - stillGood, err := userAuthTokenService.LookupToken(userToken.UnhashedToken) + stillGood, err := userAuthTokenService.LookupToken(context.Background(), userToken.UnhashedToken) So(err, ShouldBeNil) So(stillGood, ShouldNotBeNil) @@ -148,7 +149,7 @@ func TestUserAuthToken(t *testing.T) { return time.Unix(model.RotatedAt, 0).Add(24 * 7 * time.Hour).Add(-time.Second) } - stillGood, err = userAuthTokenService.LookupToken(stillGood.UnhashedToken) + stillGood, err = userAuthTokenService.LookupToken(context.Background(), stillGood.UnhashedToken) So(err, ShouldBeNil) So(stillGood, ShouldNotBeNil) }) @@ -158,12 +159,12 @@ func TestUserAuthToken(t *testing.T) { return time.Unix(model.RotatedAt, 0).Add(24 * 7 * time.Hour) } - notGood, err := userAuthTokenService.LookupToken(userToken.UnhashedToken) + notGood, err := userAuthTokenService.LookupToken(context.Background(), userToken.UnhashedToken) So(err, ShouldEqual, models.ErrUserTokenNotFound) So(notGood, ShouldBeNil) Convey("should not find active token when expired", func() { - count, err := userAuthTokenService.ActiveTokenCount() + count, err := userAuthTokenService.ActiveTokenCount(context.Background()) So(err, ShouldBeNil) So(count, ShouldEqual, 0) }) @@ -178,7 +179,7 @@ func TestUserAuthToken(t *testing.T) { return time.Unix(model.CreatedAt, 0).Add(24 * 30 * time.Hour).Add(-time.Second) } - stillGood, err = userAuthTokenService.LookupToken(stillGood.UnhashedToken) + stillGood, err = userAuthTokenService.LookupToken(context.Background(), stillGood.UnhashedToken) So(err, ShouldBeNil) So(stillGood, ShouldNotBeNil) }) @@ -192,20 +193,20 @@ func TestUserAuthToken(t *testing.T) { return time.Unix(model.CreatedAt, 0).Add(24 * 30 * time.Hour) } - notGood, err := userAuthTokenService.LookupToken(userToken.UnhashedToken) + notGood, err := userAuthTokenService.LookupToken(context.Background(), userToken.UnhashedToken) So(err, ShouldEqual, models.ErrUserTokenNotFound) So(notGood, ShouldBeNil) }) }) Convey("can properly rotate tokens", func() { - userToken, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent") + userToken, err := userAuthTokenService.CreateToken(context.Background(), userID, "192.168.10.11:1234", "some user agent") So(err, ShouldBeNil) prevToken := userToken.AuthToken unhashedPrev := userToken.UnhashedToken - rotated, err := userAuthTokenService.TryRotateToken(userToken, "192.168.10.12:1234", "a new user agent") + rotated, err := userAuthTokenService.TryRotateToken(context.Background(), userToken, "192.168.10.12:1234", "a new user agent") So(err, ShouldBeNil) So(rotated, ShouldBeFalse) @@ -224,7 +225,7 @@ func TestUserAuthToken(t *testing.T) { return t.Add(time.Hour) } - rotated, err = userAuthTokenService.TryRotateToken(&tok, "192.168.10.12:1234", "a new user agent") + rotated, err = userAuthTokenService.TryRotateToken(context.Background(), &tok, "192.168.10.12:1234", "a new user agent") So(err, ShouldBeNil) So(rotated, ShouldBeTrue) @@ -243,13 +244,13 @@ func TestUserAuthToken(t *testing.T) { // ability to auth using an old token - lookedUpUserToken, err := userAuthTokenService.LookupToken(model.UnhashedToken) + lookedUpUserToken, err := userAuthTokenService.LookupToken(context.Background(), model.UnhashedToken) So(err, ShouldBeNil) So(lookedUpUserToken, ShouldNotBeNil) So(lookedUpUserToken.AuthTokenSeen, ShouldBeTrue) So(lookedUpUserToken.SeenAt, ShouldEqual, getTime().Unix()) - lookedUpUserToken, err = userAuthTokenService.LookupToken(unhashedPrev) + lookedUpUserToken, err = userAuthTokenService.LookupToken(context.Background(), unhashedPrev) So(err, ShouldBeNil) So(lookedUpUserToken, ShouldNotBeNil) So(lookedUpUserToken.Id, ShouldEqual, model.Id) @@ -259,7 +260,7 @@ func TestUserAuthToken(t *testing.T) { return t.Add(time.Hour + (2 * time.Minute)) } - lookedUpUserToken, err = userAuthTokenService.LookupToken(unhashedPrev) + lookedUpUserToken, err = userAuthTokenService.LookupToken(context.Background(), unhashedPrev) So(err, ShouldBeNil) So(lookedUpUserToken, ShouldNotBeNil) So(lookedUpUserToken.AuthTokenSeen, ShouldBeTrue) @@ -269,7 +270,7 @@ func TestUserAuthToken(t *testing.T) { So(lookedUpModel, ShouldNotBeNil) So(lookedUpModel.AuthTokenSeen, ShouldBeFalse) - rotated, err = userAuthTokenService.TryRotateToken(userToken, "192.168.10.12:1234", "a new user agent") + rotated, err = userAuthTokenService.TryRotateToken(context.Background(), userToken, "192.168.10.12:1234", "a new user agent") So(err, ShouldBeNil) So(rotated, ShouldBeTrue) @@ -280,11 +281,11 @@ func TestUserAuthToken(t *testing.T) { }) Convey("keeps prev token valid for 1 minute after it is confirmed", func() { - userToken, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent") + userToken, err := userAuthTokenService.CreateToken(context.Background(), userID, "192.168.10.11:1234", "some user agent") So(err, ShouldBeNil) So(userToken, ShouldNotBeNil) - lookedUpUserToken, err := userAuthTokenService.LookupToken(userToken.UnhashedToken) + lookedUpUserToken, err := userAuthTokenService.LookupToken(context.Background(), userToken.UnhashedToken) So(err, ShouldBeNil) So(lookedUpUserToken, ShouldNotBeNil) @@ -293,7 +294,7 @@ func TestUserAuthToken(t *testing.T) { } prevToken := userToken.UnhashedToken - rotated, err := userAuthTokenService.TryRotateToken(userToken, "1.1.1.1", "firefox") + rotated, err := userAuthTokenService.TryRotateToken(context.Background(), userToken, "1.1.1.1", "firefox") So(err, ShouldBeNil) So(rotated, ShouldBeTrue) @@ -301,25 +302,25 @@ func TestUserAuthToken(t *testing.T) { return t.Add(20 * time.Minute) } - currentUserToken, err := userAuthTokenService.LookupToken(userToken.UnhashedToken) + currentUserToken, err := userAuthTokenService.LookupToken(context.Background(), userToken.UnhashedToken) So(err, ShouldBeNil) So(currentUserToken, ShouldNotBeNil) - prevUserToken, err := userAuthTokenService.LookupToken(prevToken) + prevUserToken, err := userAuthTokenService.LookupToken(context.Background(), prevToken) So(err, ShouldBeNil) So(prevUserToken, ShouldNotBeNil) }) Convey("will not mark token unseen when prev and current are the same", func() { - userToken, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent") + userToken, err := userAuthTokenService.CreateToken(context.Background(), userID, "192.168.10.11:1234", "some user agent") So(err, ShouldBeNil) So(userToken, ShouldNotBeNil) - lookedUpUserToken, err := userAuthTokenService.LookupToken(userToken.UnhashedToken) + lookedUpUserToken, err := userAuthTokenService.LookupToken(context.Background(), userToken.UnhashedToken) So(err, ShouldBeNil) So(lookedUpUserToken, ShouldNotBeNil) - lookedUpUserToken, err = userAuthTokenService.LookupToken(userToken.UnhashedToken) + lookedUpUserToken, err = userAuthTokenService.LookupToken(context.Background(), userToken.UnhashedToken) So(err, ShouldBeNil) So(lookedUpUserToken, ShouldNotBeNil) @@ -330,7 +331,7 @@ func TestUserAuthToken(t *testing.T) { }) Convey("Rotate token", func() { - userToken, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent") + userToken, err := userAuthTokenService.CreateToken(context.Background(), userID, "192.168.10.11:1234", "some user agent") So(err, ShouldBeNil) So(userToken, ShouldNotBeNil) @@ -345,7 +346,7 @@ func TestUserAuthToken(t *testing.T) { return t.Add(10 * time.Minute) } - rotated, err := userAuthTokenService.TryRotateToken(userToken, "1.1.1.1", "firefox") + rotated, err := userAuthTokenService.TryRotateToken(context.Background(), userToken, "1.1.1.1", "firefox") So(err, ShouldBeNil) So(rotated, ShouldBeTrue) @@ -366,7 +367,7 @@ func TestUserAuthToken(t *testing.T) { return t.Add(20 * time.Minute) } - rotated, err = userAuthTokenService.TryRotateToken(userToken, "1.1.1.1", "firefox") + rotated, err = userAuthTokenService.TryRotateToken(context.Background(), userToken, "1.1.1.1", "firefox") So(err, ShouldBeNil) So(rotated, ShouldBeTrue) @@ -385,7 +386,7 @@ func TestUserAuthToken(t *testing.T) { return t.Add(2 * time.Minute) } - rotated, err := userAuthTokenService.TryRotateToken(userToken, "1.1.1.1", "firefox") + rotated, err := userAuthTokenService.TryRotateToken(context.Background(), userToken, "1.1.1.1", "firefox") So(err, ShouldBeNil) So(rotated, ShouldBeTrue) diff --git a/pkg/services/auth/testing.go b/pkg/services/auth/testing.go index 68e65466c3d6f..378a68b053c10 100644 --- a/pkg/services/auth/testing.go +++ b/pkg/services/auth/testing.go @@ -1,81 +1,85 @@ package auth -import "github.com/grafana/grafana/pkg/models" +import ( + "context" + + "github.com/grafana/grafana/pkg/models" +) type FakeUserAuthTokenService struct { - CreateTokenProvider func(userId int64, clientIP, userAgent string) (*models.UserToken, error) - TryRotateTokenProvider func(token *models.UserToken, clientIP, userAgent string) (bool, error) - LookupTokenProvider func(unhashedToken string) (*models.UserToken, error) - RevokeTokenProvider func(token *models.UserToken) error - RevokeAllUserTokensProvider func(userId int64) error - ActiveAuthTokenCount func() (int64, error) - GetUserTokenProvider func(userId, userTokenId int64) (*models.UserToken, error) - GetUserTokensProvider func(userId int64) ([]*models.UserToken, error) + CreateTokenProvider func(ctx context.Context, userId int64, clientIP, userAgent string) (*models.UserToken, error) + TryRotateTokenProvider func(ctx context.Context, token *models.UserToken, clientIP, userAgent string) (bool, error) + LookupTokenProvider func(ctx context.Context, unhashedToken string) (*models.UserToken, error) + RevokeTokenProvider func(ctx context.Context, token *models.UserToken) error + RevokeAllUserTokensProvider func(ctx context.Context, userId int64) error + ActiveAuthTokenCount func(ctx context.Context) (int64, error) + GetUserTokenProvider func(ctx context.Context, userId, userTokenId int64) (*models.UserToken, error) + GetUserTokensProvider func(ctx context.Context, userId int64) ([]*models.UserToken, error) } func NewFakeUserAuthTokenService() *FakeUserAuthTokenService { return &FakeUserAuthTokenService{ - CreateTokenProvider: func(userId int64, clientIP, userAgent string) (*models.UserToken, error) { + CreateTokenProvider: func(ctx context.Context, userId int64, clientIP, userAgent string) (*models.UserToken, error) { return &models.UserToken{ UserId: 0, UnhashedToken: "", }, nil }, - TryRotateTokenProvider: func(token *models.UserToken, clientIP, userAgent string) (bool, error) { + TryRotateTokenProvider: func(ctx context.Context, token *models.UserToken, clientIP, userAgent string) (bool, error) { return false, nil }, - LookupTokenProvider: func(unhashedToken string) (*models.UserToken, error) { + LookupTokenProvider: func(ctx context.Context, unhashedToken string) (*models.UserToken, error) { return &models.UserToken{ UserId: 0, UnhashedToken: "", }, nil }, - RevokeTokenProvider: func(token *models.UserToken) error { + RevokeTokenProvider: func(ctx context.Context, token *models.UserToken) error { return nil }, - RevokeAllUserTokensProvider: func(userId int64) error { + RevokeAllUserTokensProvider: func(ctx context.Context, userId int64) error { return nil }, - ActiveAuthTokenCount: func() (int64, error) { + ActiveAuthTokenCount: func(ctx context.Context) (int64, error) { return 10, nil }, - GetUserTokenProvider: func(userId, userTokenId int64) (*models.UserToken, error) { + GetUserTokenProvider: func(ctx context.Context, userId, userTokenId int64) (*models.UserToken, error) { return nil, nil }, - GetUserTokensProvider: func(userId int64) ([]*models.UserToken, error) { + GetUserTokensProvider: func(ctx context.Context, userId int64) ([]*models.UserToken, error) { return nil, nil }, } } -func (s *FakeUserAuthTokenService) CreateToken(userId int64, clientIP, userAgent string) (*models.UserToken, error) { - return s.CreateTokenProvider(userId, clientIP, userAgent) +func (s *FakeUserAuthTokenService) CreateToken(ctx context.Context, userId int64, clientIP, userAgent string) (*models.UserToken, error) { + return s.CreateTokenProvider(context.Background(), userId, clientIP, userAgent) } -func (s *FakeUserAuthTokenService) LookupToken(unhashedToken string) (*models.UserToken, error) { - return s.LookupTokenProvider(unhashedToken) +func (s *FakeUserAuthTokenService) LookupToken(ctx context.Context, unhashedToken string) (*models.UserToken, error) { + return s.LookupTokenProvider(context.Background(), unhashedToken) } -func (s *FakeUserAuthTokenService) TryRotateToken(token *models.UserToken, clientIP, userAgent string) (bool, error) { - return s.TryRotateTokenProvider(token, clientIP, userAgent) +func (s *FakeUserAuthTokenService) TryRotateToken(ctx context.Context, token *models.UserToken, clientIP, userAgent string) (bool, error) { + return s.TryRotateTokenProvider(context.Background(), token, clientIP, userAgent) } -func (s *FakeUserAuthTokenService) RevokeToken(token *models.UserToken) error { - return s.RevokeTokenProvider(token) +func (s *FakeUserAuthTokenService) RevokeToken(ctx context.Context, token *models.UserToken) error { + return s.RevokeTokenProvider(context.Background(), token) } -func (s *FakeUserAuthTokenService) RevokeAllUserTokens(userId int64) error { - return s.RevokeAllUserTokensProvider(userId) +func (s *FakeUserAuthTokenService) RevokeAllUserTokens(ctx context.Context, userId int64) error { + return s.RevokeAllUserTokensProvider(context.Background(), userId) } -func (s *FakeUserAuthTokenService) ActiveTokenCount() (int64, error) { - return s.ActiveAuthTokenCount() +func (s *FakeUserAuthTokenService) ActiveTokenCount(ctx context.Context) (int64, error) { + return s.ActiveAuthTokenCount(context.Background()) } -func (s *FakeUserAuthTokenService) GetUserToken(userId, userTokenId int64) (*models.UserToken, error) { - return s.GetUserTokenProvider(userId, userTokenId) +func (s *FakeUserAuthTokenService) GetUserToken(ctx context.Context, userId, userTokenId int64) (*models.UserToken, error) { + return s.GetUserTokenProvider(context.Background(), userId, userTokenId) } -func (s *FakeUserAuthTokenService) GetUserTokens(userId int64) ([]*models.UserToken, error) { - return s.GetUserTokensProvider(userId) +func (s *FakeUserAuthTokenService) GetUserTokens(ctx context.Context, userId int64) ([]*models.UserToken, error) { + return s.GetUserTokensProvider(context.Background(), userId) } diff --git a/pkg/services/auth/token_cleanup.go b/pkg/services/auth/token_cleanup.go index 1fe0996aa4cb7..671d3d7f5b75d 100644 --- a/pkg/services/auth/token_cleanup.go +++ b/pkg/services/auth/token_cleanup.go @@ -3,6 +3,8 @@ package auth import ( "context" "time" + + "github.com/grafana/grafana/pkg/services/sqlstore" ) func (srv *UserAuthTokenService) Run(ctx context.Context) error { @@ -11,21 +13,22 @@ func (srv *UserAuthTokenService) Run(ctx context.Context) error { maxLifetime := time.Duration(srv.Cfg.LoginMaxLifetimeDays) * 24 * time.Hour err := srv.ServerLockService.LockAndExecute(ctx, "cleanup expired auth tokens", time.Hour*12, func() { - srv.deleteExpiredTokens(maxInactiveLifetime, maxLifetime) + srv.deleteExpiredTokens(ctx, maxInactiveLifetime, maxLifetime) }) + if err != nil { - srv.log.Error("failed to lock and execite cleanup of expired auth token", "erro", err) + srv.log.Error("failed to lock and execute cleanup of expired auth token", "error", err) } for { select { case <-ticker.C: err := srv.ServerLockService.LockAndExecute(ctx, "cleanup expired auth tokens", time.Hour*12, func() { - srv.deleteExpiredTokens(maxInactiveLifetime, maxLifetime) + srv.deleteExpiredTokens(ctx, maxInactiveLifetime, maxLifetime) }) if err != nil { - srv.log.Error("failed to lock and execite cleanup of expired auth token", "erro", err) + srv.log.Error("failed to lock and execute cleanup of expired auth token", "error", err) } case <-ctx.Done(): @@ -34,24 +37,30 @@ func (srv *UserAuthTokenService) Run(ctx context.Context) error { } } -func (srv *UserAuthTokenService) deleteExpiredTokens(maxInactiveLifetime, maxLifetime time.Duration) (int64, error) { +func (srv *UserAuthTokenService) deleteExpiredTokens(ctx context.Context, maxInactiveLifetime, maxLifetime time.Duration) (int64, error) { createdBefore := getTime().Add(-maxLifetime) rotatedBefore := getTime().Add(-maxInactiveLifetime) srv.log.Debug("starting cleanup of expired auth tokens", "createdBefore", createdBefore, "rotatedBefore", rotatedBefore) - sql := `DELETE from user_auth_token WHERE created_at <= ? OR rotated_at <= ?` - res, err := srv.SQLStore.NewSession().Exec(sql, createdBefore.Unix(), rotatedBefore.Unix()) - if err != nil { - return 0, err - } + var affected int64 + err := srv.SQLStore.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error { + sql := `DELETE from user_auth_token WHERE created_at <= ? OR rotated_at <= ?` + res, err := dbSession.Exec(sql, createdBefore.Unix(), rotatedBefore.Unix()) + if err != nil { + return err + } - affected, err := res.RowsAffected() - if err != nil { - srv.log.Error("failed to cleanup expired auth tokens", "error", err) - return 0, nil - } + affected, err = res.RowsAffected() + if err != nil { + srv.log.Error("failed to cleanup expired auth tokens", "error", err) + return nil + } + + srv.log.Debug("cleanup of expired auth tokens done", "count", affected) + + return nil + }) - srv.log.Debug("cleanup of expired auth tokens done", "count", affected) return affected, err } diff --git a/pkg/services/auth/token_cleanup_test.go b/pkg/services/auth/token_cleanup_test.go index 410764d3f8dba..2df42eb724ca3 100644 --- a/pkg/services/auth/token_cleanup_test.go +++ b/pkg/services/auth/token_cleanup_test.go @@ -1,6 +1,7 @@ package auth import ( + "context" "fmt" "testing" "time" @@ -40,7 +41,7 @@ func TestUserAuthTokenCleanup(t *testing.T) { insertToken(fmt.Sprintf("newA%d", i), fmt.Sprintf("newB%d", i), from.Unix(), from.Unix()) } - affected, err := ctx.tokenService.deleteExpiredTokens(7*24*time.Hour, 30*24*time.Hour) + affected, err := ctx.tokenService.deleteExpiredTokens(context.Background(), 7*24*time.Hour, 30*24*time.Hour) So(err, ShouldBeNil) So(affected, ShouldEqual, 3) }) @@ -60,7 +61,7 @@ func TestUserAuthTokenCleanup(t *testing.T) { insertToken(fmt.Sprintf("newA%d", i), fmt.Sprintf("newB%d", i), from.Unix(), fromRotate.Unix()) } - affected, err := ctx.tokenService.deleteExpiredTokens(7*24*time.Hour, 30*24*time.Hour) + affected, err := ctx.tokenService.deleteExpiredTokens(context.Background(), 7*24*time.Hour, 30*24*time.Hour) So(err, ShouldBeNil) So(affected, ShouldEqual, 3) }) diff --git a/pkg/services/dashboards/dashboard_service.go b/pkg/services/dashboards/dashboard_service.go index cdf3d93a80022..884d993f43c6d 100644 --- a/pkg/services/dashboards/dashboard_service.go +++ b/pkg/services/dashboards/dashboard_service.go @@ -24,6 +24,7 @@ type DashboardProvisioningService interface { SaveProvisionedDashboard(dto *SaveDashboardDTO, provisioning *models.DashboardProvisioning) (*models.Dashboard, error) SaveFolderForProvisionedDashboards(*SaveDashboardDTO) (*models.Dashboard, error) GetProvisionedDashboardData(name string) ([]*models.DashboardProvisioning, error) + GetProvisionedDashboardDataByDashboardId(dashboardId int64) (*models.DashboardProvisioning, error) UnprovisionDashboard(dashboardId int64) error DeleteProvisionedDashboard(dashboardId int64, orgId int64) error } @@ -37,7 +38,9 @@ var NewService = func() DashboardService { // NewProvisioningService factory for creating a new dashboard provisioning service var NewProvisioningService = func() DashboardProvisioningService { - return &dashboardServiceImpl{} + return &dashboardServiceImpl{ + log: log.New("dashboard-provisioning-service"), + } } type SaveDashboardDTO struct { @@ -65,6 +68,16 @@ func (dr *dashboardServiceImpl) GetProvisionedDashboardData(name string) ([]*mod return cmd.Result, nil } +func (dr *dashboardServiceImpl) GetProvisionedDashboardDataByDashboardId(dashboardId int64) (*models.DashboardProvisioning, error) { + cmd := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: dashboardId} + err := bus.Dispatch(cmd) + if err != nil { + return nil, err + } + + return cmd.Result, nil +} + func (dr *dashboardServiceImpl) buildSaveDashboardCommand(dto *SaveDashboardDTO, validateAlerts bool, validateProvisionedDashboard bool) (*models.SaveDashboardCommand, error) { dash := dto.Dashboard @@ -123,14 +136,12 @@ func (dr *dashboardServiceImpl) buildSaveDashboardCommand(dto *SaveDashboardDTO, } if validateProvisionedDashboard { - isDashboardProvisioned := &models.IsDashboardProvisionedQuery{DashboardId: dash.Id} - err := bus.Dispatch(isDashboardProvisioned) - + provisionedData, err := dr.GetProvisionedDashboardDataByDashboardId(dash.Id) if err != nil { return nil, err } - if isDashboardProvisioned.Result { + if provisionedData != nil { return nil, models.ErrDashboardCannotSaveProvisionedDashboard } } @@ -258,13 +269,12 @@ func (dr *dashboardServiceImpl) DeleteProvisionedDashboard(dashboardId int64, or func (dr *dashboardServiceImpl) deleteDashboard(dashboardId int64, orgId int64, validateProvisionedDashboard bool) error { if validateProvisionedDashboard { - isDashboardProvisioned := &models.IsDashboardProvisionedQuery{DashboardId: dashboardId} - err := bus.Dispatch(isDashboardProvisioned) + provisionedData, err := dr.GetProvisionedDashboardDataByDashboardId(dashboardId) if err != nil { return errutil.Wrap("failed to check if dashboard is provisioned", err) } - if isDashboardProvisioned.Result { + if provisionedData != nil { return models.ErrDashboardCannotDeleteProvisionedDashboard } } diff --git a/pkg/services/dashboards/dashboard_service_test.go b/pkg/services/dashboards/dashboard_service_test.go index 968c3f9a3b49d..db3ef997d65ef 100644 --- a/pkg/services/dashboards/dashboard_service_test.go +++ b/pkg/services/dashboards/dashboard_service_test.go @@ -55,8 +55,8 @@ func TestDashboardService(t *testing.T) { return nil }) - bus.AddHandler("test", func(cmd *models.IsDashboardProvisionedQuery) error { - cmd.Result = false + bus.AddHandler("test", func(cmd *models.GetProvisionedDashboardDataByIdQuery) error { + cmd.Result = nil return nil }) @@ -85,9 +85,9 @@ func TestDashboardService(t *testing.T) { Convey("Should return validation error if dashboard is provisioned", func() { provisioningValidated := false - bus.AddHandler("test", func(cmd *models.IsDashboardProvisionedQuery) error { + bus.AddHandler("test", func(cmd *models.GetProvisionedDashboardDataByIdQuery) error { provisioningValidated = true - cmd.Result = true + cmd.Result = &models.DashboardProvisioning{} return nil }) @@ -109,8 +109,8 @@ func TestDashboardService(t *testing.T) { }) Convey("Should return validation error if alert data is invalid", func() { - bus.AddHandler("test", func(cmd *models.IsDashboardProvisionedQuery) error { - cmd.Result = false + bus.AddHandler("test", func(cmd *models.GetProvisionedDashboardDataByIdQuery) error { + cmd.Result = nil return nil }) @@ -129,9 +129,9 @@ func TestDashboardService(t *testing.T) { Convey("Should not return validation error if dashboard is provisioned", func() { provisioningValidated := false - bus.AddHandler("test", func(cmd *models.IsDashboardProvisionedQuery) error { + bus.AddHandler("test", func(cmd *models.GetProvisionedDashboardDataByIdQuery) error { provisioningValidated = true - cmd.Result = true + cmd.Result = &models.DashboardProvisioning{} return nil }) @@ -166,9 +166,9 @@ func TestDashboardService(t *testing.T) { Convey("Should return validation error if dashboard is provisioned", func() { provisioningValidated := false - bus.AddHandler("test", func(cmd *models.IsDashboardProvisionedQuery) error { + bus.AddHandler("test", func(cmd *models.GetProvisionedDashboardDataByIdQuery) error { provisioningValidated = true - cmd.Result = true + cmd.Result = &models.DashboardProvisioning{} return nil }) @@ -241,8 +241,12 @@ type Result struct { } func setupDeleteHandlers(provisioned bool) *Result { - bus.AddHandler("test", func(cmd *models.IsDashboardProvisionedQuery) error { - cmd.Result = provisioned + bus.AddHandler("test", func(cmd *models.GetProvisionedDashboardDataByIdQuery) error { + if provisioned { + cmd.Result = &models.DashboardProvisioning{} + } else { + cmd.Result = nil + } return nil }) diff --git a/pkg/services/dashboards/folder_service_test.go b/pkg/services/dashboards/folder_service_test.go index 4c9cecd3352c8..bdf7556413ff9 100644 --- a/pkg/services/dashboards/folder_service_test.go +++ b/pkg/services/dashboards/folder_service_test.go @@ -112,8 +112,9 @@ func TestFolderService(t *testing.T) { provisioningValidated := false - bus.AddHandler("test", func(query *models.IsDashboardProvisionedQuery) error { + bus.AddHandler("test", func(query *models.GetProvisionedDashboardDataByIdQuery) error { provisioningValidated = true + query.Result = nil return nil }) diff --git a/pkg/services/notifications/codes.go b/pkg/services/notifications/codes.go index 4dbe76c1cad57..6382b609036b6 100644 --- a/pkg/services/notifications/codes.go +++ b/pkg/services/notifications/codes.go @@ -7,6 +7,7 @@ import ( "time" "github.com/Unknwon/com" + m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" ) diff --git a/pkg/services/provisioning/dashboards/dashboard.go b/pkg/services/provisioning/dashboards/dashboard.go index b7e5539c3b027..fd3a824420c6b 100644 --- a/pkg/services/provisioning/dashboards/dashboard.go +++ b/pkg/services/provisioning/dashboards/dashboard.go @@ -7,18 +7,11 @@ import ( "github.com/pkg/errors" ) -type DashboardProvisioner interface { - Provision() error - PollChanges(ctx context.Context) -} - type DashboardProvisionerImpl struct { log log.Logger fileReaders []*fileReader } -type DashboardProvisionerFactory func(string) (DashboardProvisioner, error) - func NewDashboardProvisionerImpl(configDirectory string) (*DashboardProvisionerImpl, error) { logger := log.New("provisioning.dashboard") cfgReader := &configReader{path: configDirectory, log: logger} @@ -61,6 +54,17 @@ func (provider *DashboardProvisionerImpl) PollChanges(ctx context.Context) { } } +// GetProvisionerResolvedPath returns resolved path for the specified provisioner name. Can be used to generate +// relative path to provisioning file from it's external_id. +func (provider *DashboardProvisionerImpl) GetProvisionerResolvedPath(name string) string { + for _, reader := range provider.fileReaders { + if reader.Cfg.Name == name { + return reader.resolvedPath() + } + } + return "" +} + func getFileReaders(configs []*DashboardsAsConfig, logger log.Logger) ([]*fileReader, error) { var readers []*fileReader diff --git a/pkg/services/provisioning/dashboards/dashboard_mock.go b/pkg/services/provisioning/dashboards/dashboard_mock.go index 5cdaab9be70dd..303338106e635 100644 --- a/pkg/services/provisioning/dashboards/dashboard_mock.go +++ b/pkg/services/provisioning/dashboards/dashboard_mock.go @@ -3,14 +3,16 @@ package dashboards import "context" type Calls struct { - Provision []interface{} - PollChanges []interface{} + Provision []interface{} + PollChanges []interface{} + GetProvisionerResolvedPath []interface{} } type DashboardProvisionerMock struct { - Calls *Calls - ProvisionFunc func() error - PollChangesFunc func(ctx context.Context) + Calls *Calls + ProvisionFunc func() error + PollChangesFunc func(ctx context.Context) + GetProvisionerResolvedPathFunc func(name string) string } func NewDashboardProvisionerMock() *DashboardProvisionerMock { @@ -34,3 +36,12 @@ func (dpm *DashboardProvisionerMock) PollChanges(ctx context.Context) { dpm.PollChangesFunc(ctx) } } + +func (dpm *DashboardProvisionerMock) GetProvisionerResolvedPath(name string) string { + dpm.Calls.PollChanges = append(dpm.Calls.GetProvisionerResolvedPath, name) + if dpm.GetProvisionerResolvedPathFunc != nil { + return dpm.GetProvisionerResolvedPathFunc(name) + } else { + return "" + } +} diff --git a/pkg/services/provisioning/dashboards/file_reader.go b/pkg/services/provisioning/dashboards/file_reader.go index 62709ce6ba9a8..96da9c8f6dfbf 100644 --- a/pkg/services/provisioning/dashboards/file_reader.go +++ b/pkg/services/provisioning/dashboards/file_reader.go @@ -70,7 +70,7 @@ func (fr *fileReader) pollChanges(ctx context.Context) { // to the database. func (fr *fileReader) startWalkingDisk() error { fr.log.Debug("Start walking disk", "path", fr.Path) - resolvedPath := fr.resolvePath(fr.Path) + resolvedPath := fr.resolvedPath() if _, err := os.Stat(resolvedPath); err != nil { if os.IsNotExist(err) { return err @@ -329,24 +329,23 @@ func (fr *fileReader) readDashboardFromFile(path string, lastModified time.Time, }, nil } -func (fr *fileReader) resolvePath(path string) string { - if _, err := os.Stat(path); os.IsNotExist(err) { +func (fr *fileReader) resolvedPath() string { + if _, err := os.Stat(fr.Path); os.IsNotExist(err) { fr.log.Error("Cannot read directory", "error", err) } - copy := path - path, err := filepath.Abs(path) + path, err := filepath.Abs(fr.Path) if err != nil { - fr.log.Error("Could not create absolute path", "path", copy, "error", err) + fr.log.Error("Could not create absolute path", "path", fr.Path, "error", err) } path, err = filepath.EvalSymlinks(path) if err != nil { - fr.log.Error("Failed to read content of symlinked path", "path", copy, "error", err) + fr.log.Error("Failed to read content of symlinked path", "path", fr.Path, "error", err) } if path == "" { - path = copy + path = fr.Path fr.log.Info("falling back to original path due to EvalSymlink/Abs failure") } return path diff --git a/pkg/services/provisioning/dashboards/file_reader_linux_test.go b/pkg/services/provisioning/dashboards/file_reader_linux_test.go index 77f488ebcfb6c..d62a59a4f4c74 100644 --- a/pkg/services/provisioning/dashboards/file_reader_linux_test.go +++ b/pkg/services/provisioning/dashboards/file_reader_linux_test.go @@ -33,7 +33,7 @@ func TestProvsionedSymlinkedFolder(t *testing.T) { t.Errorf("expected err to be nil") } - resolvedPath := reader.resolvePath(reader.Path) + resolvedPath := reader.resolvedPath() if resolvedPath != want { t.Errorf("got %s want %s", resolvedPath, want) } diff --git a/pkg/services/provisioning/dashboards/file_reader_test.go b/pkg/services/provisioning/dashboards/file_reader_test.go index 8c0a04a808ae5..efc6052cbe799 100644 --- a/pkg/services/provisioning/dashboards/file_reader_test.go +++ b/pkg/services/provisioning/dashboards/file_reader_test.go @@ -70,7 +70,7 @@ func TestCreatingNewDashboardFileReader(t *testing.T) { reader, err := NewDashboardFileReader(cfg, log.New("test-logger")) So(err, ShouldBeNil) - resolvedPath := reader.resolvePath(reader.Path) + resolvedPath := reader.resolvedPath() So(filepath.IsAbs(resolvedPath), ShouldBeTrue) }) }) @@ -435,6 +435,10 @@ func (s *fakeDashboardProvisioningService) DeleteProvisionedDashboard(dashboardI return nil } +func (s *fakeDashboardProvisioningService) GetProvisionedDashboardDataByDashboardId(dashboardId int64) (*models.DashboardProvisioning, error) { + return nil, nil +} + func mockGetDashboardQuery(cmd *models.GetDashboardQuery) error { for _, d := range fakeService.getDashboard { if d.Slug == cmd.Slug { diff --git a/pkg/services/provisioning/provisioning.go b/pkg/services/provisioning/provisioning.go index 21f619776207f..29f2d13916433 100644 --- a/pkg/services/provisioning/provisioning.go +++ b/pkg/services/provisioning/provisioning.go @@ -2,11 +2,12 @@ package provisioning import ( "context" - "github.com/grafana/grafana/pkg/log" - "github.com/pkg/errors" "path" "sync" + "github.com/grafana/grafana/pkg/log" + "github.com/pkg/errors" + "github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/services/provisioning/dashboards" "github.com/grafana/grafana/pkg/services/provisioning/datasources" @@ -14,9 +15,17 @@ import ( "github.com/grafana/grafana/pkg/setting" ) +type DashboardProvisioner interface { + Provision() error + PollChanges(ctx context.Context) + GetProvisionerResolvedPath(name string) string +} + +type DashboardProvisionerFactory func(string) (DashboardProvisioner, error) + func init() { registry.RegisterService(NewProvisioningServiceImpl( - func(path string) (dashboards.DashboardProvisioner, error) { + func(path string) (DashboardProvisioner, error) { return dashboards.NewDashboardProvisionerImpl(path) }, notifiers.Provision, @@ -24,14 +33,8 @@ func init() { )) } -type ProvisioningService interface { - ProvisionDatasources() error - ProvisionNotifications() error - ProvisionDashboards() error -} - func NewProvisioningServiceImpl( - newDashboardProvisioner dashboards.DashboardProvisionerFactory, + newDashboardProvisioner DashboardProvisionerFactory, provisionNotifiers func(string) error, provisionDatasources func(string) error, ) *provisioningServiceImpl { @@ -47,8 +50,8 @@ type provisioningServiceImpl struct { Cfg *setting.Cfg `inject:""` log log.Logger pollingCtxCancel context.CancelFunc - newDashboardProvisioner dashboards.DashboardProvisionerFactory - dashboardProvisioner dashboards.DashboardProvisioner + newDashboardProvisioner DashboardProvisionerFactory + dashboardProvisioner DashboardProvisioner provisionNotifiers func(string) error provisionDatasources func(string) error mutex sync.Mutex @@ -78,7 +81,9 @@ func (ps *provisioningServiceImpl) Run(ctx context.Context) error { // Wait for unlock. This is tied to new dashboardProvisioner to be instantiated before we start polling. ps.mutex.Lock() - pollingContext, cancelFun := context.WithCancel(ctx) + // Using background here because otherwise if root context was canceled the select later on would + // non-deterministically take one of the route possibly going into one polling loop before exiting. + pollingContext, cancelFun := context.WithCancel(context.Background()) ps.pollingCtxCancel = cancelFun ps.dashboardProvisioner.PollChanges(pollingContext) ps.mutex.Unlock() @@ -88,7 +93,8 @@ func (ps *provisioningServiceImpl) Run(ctx context.Context) error { // Polling was canceled. continue case <-ctx.Done(): - // Root server context was cancelled so just leave. + // Root server context was cancelled so cancel polling and leave. + ps.cancelPolling() return ctx.Err() } } @@ -127,6 +133,10 @@ func (ps *provisioningServiceImpl) ProvisionDashboards() error { return nil } +func (ps *provisioningServiceImpl) GetDashboardProvisionerResolvedPath(name string) string { + return ps.dashboardProvisioner.GetProvisionerResolvedPath(name) +} + func (ps *provisioningServiceImpl) cancelPolling() { if ps.pollingCtxCancel != nil { ps.log.Debug("Stop polling for dashboard changes") diff --git a/pkg/services/provisioning/provisioning_mock.go b/pkg/services/provisioning/provisioning_mock.go new file mode 100644 index 0000000000000..7977e59b2e472 --- /dev/null +++ b/pkg/services/provisioning/provisioning_mock.go @@ -0,0 +1,58 @@ +package provisioning + +type Calls struct { + ProvisionDatasources []interface{} + ProvisionNotifications []interface{} + ProvisionDashboards []interface{} + GetDashboardProvisionerResolvedPath []interface{} +} + +type ProvisioningServiceMock struct { + Calls *Calls + ProvisionDatasourcesFunc func() error + ProvisionNotificationsFunc func() error + ProvisionDashboardsFunc func() error + GetDashboardProvisionerResolvedPathFunc func(name string) string +} + +func NewProvisioningServiceMock() *ProvisioningServiceMock { + return &ProvisioningServiceMock{ + Calls: &Calls{}, + } +} + +func (mock *ProvisioningServiceMock) ProvisionDatasources() error { + mock.Calls.ProvisionDatasources = append(mock.Calls.ProvisionDatasources, nil) + if mock.ProvisionDatasourcesFunc != nil { + return mock.ProvisionDatasourcesFunc() + } else { + return nil + } +} + +func (mock *ProvisioningServiceMock) ProvisionNotifications() error { + mock.Calls.ProvisionNotifications = append(mock.Calls.ProvisionNotifications, nil) + if mock.ProvisionNotificationsFunc != nil { + return mock.ProvisionNotificationsFunc() + } else { + return nil + } +} + +func (mock *ProvisioningServiceMock) ProvisionDashboards() error { + mock.Calls.ProvisionDashboards = append(mock.Calls.ProvisionDashboards, nil) + if mock.ProvisionDashboardsFunc != nil { + return mock.ProvisionDashboardsFunc() + } else { + return nil + } +} + +func (mock *ProvisioningServiceMock) GetDashboardProvisionerResolvedPath(name string) string { + mock.Calls.GetDashboardProvisionerResolvedPath = append(mock.Calls.GetDashboardProvisionerResolvedPath, name) + if mock.GetDashboardProvisionerResolvedPathFunc != nil { + return mock.GetDashboardProvisionerResolvedPathFunc(name) + } else { + return "" + } +} diff --git a/pkg/services/provisioning/provisioning_test.go b/pkg/services/provisioning/provisioning_test.go index 73f207122f7fd..119fa7261caa9 100644 --- a/pkg/services/provisioning/provisioning_test.go +++ b/pkg/services/provisioning/provisioning_test.go @@ -3,88 +3,130 @@ package provisioning import ( "context" "errors" + "testing" + "time" + "github.com/grafana/grafana/pkg/services/provisioning/dashboards" "github.com/grafana/grafana/pkg/setting" "github.com/stretchr/testify/assert" - "testing" - "time" ) func TestProvisioningServiceImpl(t *testing.T) { t.Run("Restart dashboard provisioning and stop service", func(t *testing.T) { - service, mock := setup() - ctx, cancel := context.WithCancel(context.Background()) - var serviceRunning bool - var serviceError error - - err := service.ProvisionDashboards() + serviceTest := setup() + err := serviceTest.service.ProvisionDashboards() assert.Nil(t, err) - go func() { - serviceRunning = true - serviceError = service.Run(ctx) - serviceRunning = false - }() - time.Sleep(time.Millisecond) - assert.Equal(t, 1, len(mock.Calls.PollChanges), "PollChanges should have been called") + serviceTest.startService() + serviceTest.waitForPollChanges() - err = service.ProvisionDashboards() + assert.Equal(t, 1, len(serviceTest.mock.Calls.PollChanges), "PollChanges should have been called") + + err = serviceTest.service.ProvisionDashboards() assert.Nil(t, err) - time.Sleep(time.Millisecond) - assert.Equal(t, 2, len(mock.Calls.PollChanges), "PollChanges should have been called 2 times") - pollingCtx := mock.Calls.PollChanges[0].(context.Context) + serviceTest.waitForPollChanges() + assert.Equal(t, 2, len(serviceTest.mock.Calls.PollChanges), "PollChanges should have been called 2 times") + + pollingCtx := serviceTest.mock.Calls.PollChanges[0].(context.Context) assert.Equal(t, context.Canceled, pollingCtx.Err(), "Polling context from first call should have been cancelled") - assert.True(t, serviceRunning, "Service should be still running") + assert.True(t, serviceTest.serviceRunning, "Service should be still running") // Cancelling the root context and stopping the service - cancel() - time.Sleep(time.Millisecond) + serviceTest.cancel() + serviceTest.waitForStop() - assert.False(t, serviceRunning, "Service should not be running") - assert.Equal(t, context.Canceled, serviceError, "Service should have returned canceled error") + assert.False(t, serviceTest.serviceRunning, "Service should not be running") + assert.Equal(t, context.Canceled, serviceTest.serviceError, "Service should have returned canceled error") }) t.Run("Failed reloading does not stop polling with old provisioned", func(t *testing.T) { - service, mock := setup() - ctx, cancel := context.WithCancel(context.Background()) - var serviceRunning bool - - err := service.ProvisionDashboards() + serviceTest := setup() + err := serviceTest.service.ProvisionDashboards() assert.Nil(t, err) - go func() { - serviceRunning = true - _ = service.Run(ctx) - serviceRunning = false - }() - time.Sleep(time.Millisecond) - assert.Equal(t, 1, len(mock.Calls.PollChanges), "PollChanges should have been called") + serviceTest.startService() + serviceTest.waitForPollChanges() + assert.Equal(t, 1, len(serviceTest.mock.Calls.PollChanges), "PollChanges should have been called") - mock.ProvisionFunc = func() error { + serviceTest.mock.ProvisionFunc = func() error { return errors.New("Test error") } - err = service.ProvisionDashboards() + err = serviceTest.service.ProvisionDashboards() assert.NotNil(t, err) - time.Sleep(time.Millisecond) + serviceTest.waitForPollChanges() + // This should have been called with the old provisioner, after the last one failed. - assert.Equal(t, 2, len(mock.Calls.PollChanges), "PollChanges should have been called 2 times") - assert.True(t, serviceRunning, "Service should be still running") + assert.Equal(t, 2, len(serviceTest.mock.Calls.PollChanges), "PollChanges should have been called 2 times") + assert.True(t, serviceTest.serviceRunning, "Service should be still running") // Cancelling the root context and stopping the service - cancel() - + serviceTest.cancel() }) } -func setup() (*provisioningServiceImpl, *dashboards.DashboardProvisionerMock) { - dashMock := dashboards.NewDashboardProvisionerMock() - service := NewProvisioningServiceImpl( - func(path string) (dashboards.DashboardProvisioner, error) { - return dashMock, nil +type serviceTestStruct struct { + waitForPollChanges func() + waitForStop func() + waitTimeout time.Duration + + serviceRunning bool + serviceError error + + startService func() + cancel func() + + mock *dashboards.DashboardProvisionerMock + service *provisioningServiceImpl +} + +func setup() *serviceTestStruct { + serviceTest := &serviceTestStruct{} + serviceTest.waitTimeout = time.Second + + pollChangesChannel := make(chan context.Context) + serviceStopped := make(chan interface{}) + + serviceTest.mock = dashboards.NewDashboardProvisionerMock() + serviceTest.mock.PollChangesFunc = func(ctx context.Context) { + pollChangesChannel <- ctx + } + + serviceTest.service = NewProvisioningServiceImpl( + func(path string) (DashboardProvisioner, error) { + return serviceTest.mock, nil }, nil, nil, ) - service.Cfg = setting.NewCfg() - return service, dashMock + serviceTest.service.Cfg = setting.NewCfg() + + ctx, cancel := context.WithCancel(context.Background()) + serviceTest.cancel = cancel + + serviceTest.startService = func() { + go func() { + serviceTest.serviceRunning = true + serviceTest.serviceError = serviceTest.service.Run(ctx) + serviceTest.serviceRunning = false + serviceStopped <- true + }() + } + + serviceTest.waitForPollChanges = func() { + timeoutChan := time.After(serviceTest.waitTimeout) + select { + case <-pollChangesChannel: + case <-timeoutChan: + } + } + + serviceTest.waitForStop = func() { + timeoutChan := time.After(serviceTest.waitTimeout) + select { + case <-serviceStopped: + case <-timeoutChan: + } + } + + return serviceTest } diff --git a/pkg/services/quota/quota.go b/pkg/services/quota/quota.go index b65ad9326991a..7e1e62fc52ace 100644 --- a/pkg/services/quota/quota.go +++ b/pkg/services/quota/quota.go @@ -43,7 +43,7 @@ func (qs *QuotaService) QuotaReached(c *m.ReqContext, target string) (bool, erro } if target == "session" { - usedSessions, err := qs.AuthTokenService.ActiveTokenCount() + usedSessions, err := qs.AuthTokenService.ActiveTokenCount(c.Req.Context()) if err != nil { return false, err } diff --git a/pkg/services/rendering/phantomjs.go b/pkg/services/rendering/phantomjs.go index 29c2f39fd7745..35389fe7918e1 100644 --- a/pkg/services/rendering/phantomjs.go +++ b/pkg/services/rendering/phantomjs.go @@ -42,7 +42,8 @@ func (rs *RenderingService) renderViaPhantomJS(ctx context.Context, opts Opts) ( cmdArgs := []string{ "--ignore-ssl-errors=true", - "--web-security=false", + "--web-security=true", + "--local-url-access=false", phantomDebugArg, scriptPath, fmt.Sprintf("url=%v", url), diff --git a/pkg/services/sqlstore/dashboard_provisioning.go b/pkg/services/sqlstore/dashboard_provisioning.go index b6c20682faee1..48238477ce990 100644 --- a/pkg/services/sqlstore/dashboard_provisioning.go +++ b/pkg/services/sqlstore/dashboard_provisioning.go @@ -19,16 +19,16 @@ type DashboardExtras struct { Value string } -func GetProvisionedDataByDashboardId(cmd *models.IsDashboardProvisionedQuery) error { +func GetProvisionedDataByDashboardId(cmd *models.GetProvisionedDashboardDataByIdQuery) error { result := &models.DashboardProvisioning{} exist, err := x.Where("dashboard_id = ?", cmd.DashboardId).Get(result) if err != nil { return err } - - cmd.Result = exist - + if exist { + cmd.Result = result + } return nil } diff --git a/pkg/services/sqlstore/dashboard_provisioning_test.go b/pkg/services/sqlstore/dashboard_provisioning_test.go index 82ac294349c1b..b58829c92f8ad 100644 --- a/pkg/services/sqlstore/dashboard_provisioning_test.go +++ b/pkg/services/sqlstore/dashboard_provisioning_test.go @@ -65,20 +65,20 @@ func TestDashboardProvisioningTest(t *testing.T) { }) Convey("Can query for one provisioned dashboard", func() { - query := &models.IsDashboardProvisionedQuery{DashboardId: cmd.Result.Id} + query := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: cmd.Result.Id} err := GetProvisionedDataByDashboardId(query) So(err, ShouldBeNil) - So(query.Result, ShouldBeTrue) + So(query.Result, ShouldNotBeNil) }) Convey("Can query for none provisioned dashboard", func() { - query := &models.IsDashboardProvisionedQuery{DashboardId: 3000} + query := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: 3000} err := GetProvisionedDataByDashboardId(query) So(err, ShouldBeNil) - So(query.Result, ShouldBeFalse) + So(query.Result, ShouldBeNil) }) Convey("Deleting folder should delete provision meta data", func() { @@ -89,11 +89,11 @@ func TestDashboardProvisioningTest(t *testing.T) { So(DeleteDashboard(deleteCmd), ShouldBeNil) - query := &models.IsDashboardProvisionedQuery{DashboardId: cmd.Result.Id} + query := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: cmd.Result.Id} err = GetProvisionedDataByDashboardId(query) So(err, ShouldBeNil) - So(query.Result, ShouldBeFalse) + So(query.Result, ShouldBeNil) }) Convey("UnprovisionDashboard should delete provisioning metadata", func() { @@ -103,11 +103,11 @@ func TestDashboardProvisioningTest(t *testing.T) { So(UnprovisionDashboard(unprovisionCmd), ShouldBeNil) - query := &models.IsDashboardProvisionedQuery{DashboardId: dashId} + query := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: dashId} err = GetProvisionedDataByDashboardId(query) So(err, ShouldBeNil) - So(query.Result, ShouldBeFalse) + So(query.Result, ShouldBeNil) }) }) }) diff --git a/pkg/services/sqlstore/dashboard_service_integration_test.go b/pkg/services/sqlstore/dashboard_service_integration_test.go index a4e76aca34068..82e0d21213076 100644 --- a/pkg/services/sqlstore/dashboard_service_integration_test.go +++ b/pkg/services/sqlstore/dashboard_service_integration_test.go @@ -27,8 +27,8 @@ func TestIntegratedDashboardService(t *testing.T) { return nil }) - bus.AddHandler("test", func(cmd *models.IsDashboardProvisionedQuery) error { - cmd.Result = false + bus.AddHandler("test", func(cmd *models.GetProvisionedDashboardDataByIdQuery) error { + cmd.Result = nil return nil }) diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 6d407941608cb..4f017591f0b23 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -918,8 +918,10 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error { return err } - AlertingEvaluationTimeout = alerting.Key("evaluation_timeout_seconds").MustDuration(time.Second * 30) - AlertingNotificationTimeout = alerting.Key("notification_timeout_seconds").MustDuration(time.Second * 30) + evaluationTimeoutSeconds := alerting.Key("evaluation_timeout_seconds").MustInt64(30) + AlertingEvaluationTimeout = time.Second * time.Duration(evaluationTimeoutSeconds) + notificationTimeoutSeconds := alerting.Key("notification_timeout_seconds").MustInt64(30) + AlertingNotificationTimeout = time.Second * time.Duration(notificationTimeoutSeconds) AlertingMaxAttempts = alerting.Key("max_attempts").MustInt(3) explore := iniFile.Section("explore") diff --git a/public/app/core/actions/navModel.ts b/public/app/core/actions/navModel.ts index a40a0e880ee05..1f4755e16edf8 100644 --- a/public/app/core/actions/navModel.ts +++ b/public/app/core/actions/navModel.ts @@ -1,4 +1,4 @@ -import { NavModelItem } from '../../types'; +import { NavModelItem } from '@grafana/ui'; export enum ActionTypes { UpdateNavIndex = 'UPDATE_NAV_INDEX', diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx index 1803317a8daf8..04986011fd4da 100644 --- a/public/app/core/components/Page/Page.tsx +++ b/public/app/core/components/Page/Page.tsx @@ -1,14 +1,13 @@ // Libraries import React, { Component } from 'react'; import config from 'app/core/config'; -import { NavModel } from 'app/types'; import { getTitleFromNavModel } from 'app/core/selectors/navModel'; // Components import PageHeader from '../PageHeader/PageHeader'; import Footer from '../Footer/Footer'; import PageContents from './PageContents'; -import { CustomScrollbar } from '@grafana/ui'; +import { CustomScrollbar, NavModel } from '@grafana/ui'; import { isEqual } from 'lodash'; interface Props { diff --git a/public/app/core/components/PageHeader/PageHeader.tsx b/public/app/core/components/PageHeader/PageHeader.tsx index 623070651d1d4..d0cbf0f8c13af 100644 --- a/public/app/core/components/PageHeader/PageHeader.tsx +++ b/public/app/core/components/PageHeader/PageHeader.tsx @@ -1,7 +1,7 @@ import React, { FormEvent } from 'react'; -import { NavModel, NavModelItem } from 'app/types'; import classNames from 'classnames'; import appEvents from 'app/core/app_events'; +import { NavModel, NavModelItem, NavModelBreadcrumb } from '@grafana/ui'; export interface Props { model: NavModel; @@ -89,7 +89,7 @@ export default class PageHeader extends React.Component { return true; } - renderTitle(title: string, breadcrumbs: any[]) { + renderTitle(title: string, breadcrumbs: NavModelBreadcrumb[]) { if (!title && (!breadcrumbs || breadcrumbs.length === 0)) { return null; } @@ -99,16 +99,15 @@ export default class PageHeader extends React.Component { } const breadcrumbsResult = []; - for (let i = 0; i < breadcrumbs.length; i++) { - const bc = breadcrumbs[i]; + for (const bc of breadcrumbs) { if (bc.url) { breadcrumbsResult.push( - + {bc.title} ); } else { - breadcrumbsResult.push( / {bc.title}); + breadcrumbsResult.push( / {bc.title}); } } breadcrumbsResult.push( / {title}); @@ -116,7 +115,7 @@ export default class PageHeader extends React.Component { return

{breadcrumbsResult}

; } - renderHeaderTitle(main) { + renderHeaderTitle(main: NavModelItem) { return (
@@ -127,12 +126,6 @@ export default class PageHeader extends React.Component {
{this.renderTitle(main.text, main.breadcrumbs)} {main.subTitle &&
{main.subTitle}
} - {main.subType && ( -
- - {main.subType.text} -
- )}
); diff --git a/public/app/core/components/navbar/navbar.ts b/public/app/core/components/navbar/navbar.ts index db0924738ed9c..f4de87451728d 100644 --- a/public/app/core/components/navbar/navbar.ts +++ b/public/app/core/components/navbar/navbar.ts @@ -1,6 +1,6 @@ import coreModule from '../../core_module'; -import { NavModel } from '../../nav_model_srv'; import appEvents from 'app/core/app_events'; +import { NavModel } from '@grafana/ui'; export class NavbarCtrl { model: NavModel; diff --git a/public/app/core/config.ts b/public/app/core/config.ts index 4d83cb8f5b17f..8d762514e003c 100644 --- a/public/app/core/config.ts +++ b/public/app/core/config.ts @@ -1,6 +1,5 @@ import _ from 'lodash'; -import { PanelPluginMeta } from 'app/types/plugins'; -import { GrafanaTheme, getTheme, GrafanaThemeType, DataSourceInstanceSettings } from '@grafana/ui'; +import { GrafanaTheme, getTheme, GrafanaThemeType, PanelPluginMeta, DataSourceInstanceSettings } from '@grafana/ui'; export interface BuildInfo { version: string; diff --git a/public/app/core/core.ts b/public/app/core/core.ts index 80987b8fc88e2..c7f03781710cb 100644 --- a/public/app/core/core.ts +++ b/public/app/core/core.ts @@ -40,7 +40,7 @@ import { contextSrv } from './services/context_srv'; import { KeybindingSrv } from './services/keybindingSrv'; import { helpModal } from './components/help/help'; import { JsonExplorer } from './components/json_explorer/json_explorer'; -import { NavModelSrv, NavModel } from './nav_model_srv'; +import { NavModelSrv } from './nav_model_srv'; import { geminiScrollbar } from './components/scroll/scroll'; import { orgSwitcher } from './components/org_switcher'; import { profiler } from './profiler'; @@ -49,6 +49,7 @@ import { updateLegendValues } from './time_series2'; import TimeSeries from './time_series2'; import { searchResultsDirective } from './components/search/search_results'; import { manageDashboardsDirective } from './components/manage_dashboards/manage_dashboards'; +import { NavModel } from '@grafana/ui'; export { profiler, diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts index 9d1ca2f44b798..03420f8029949 100644 --- a/public/app/core/logs_model.ts +++ b/public/app/core/logs_model.ts @@ -1,7 +1,22 @@ import _ from 'lodash'; - -import { colors, TimeSeries, Labels, LogLevel } from '@grafana/ui'; +import moment from 'moment'; +import ansicolor from 'vendor/ansicolor/ansicolor'; + +import { + colors, + TimeSeries, + Labels, + LogLevel, + SeriesData, + findCommonLabels, + findUniqueLabels, + getLogLevel, + toLegacyResponseData, + FieldCache, + FieldType, +} from '@grafana/ui'; import { getThemeColor } from 'app/core/utils/colors'; +import { hasAnsiCodes } from 'app/core/utils/text'; export const LogLevelColor = { [LogLevel.critical]: colors[7], @@ -23,7 +38,6 @@ export interface LogRowModel { duplicates?: number; entry: string; hasAnsi: boolean; - key: string; // timestamp + labels labels: Labels; logLevel: LogLevel; raw: string; @@ -56,27 +70,11 @@ export interface LogsMetaItem { export interface LogsModel { hasUniqueLabels: boolean; - id: string; // Identify one logs result from another meta?: LogsMetaItem[]; rows: LogRowModel[]; series?: TimeSeries[]; } -export interface LogsStream { - labels: string; - entries: LogsStreamEntry[]; - search?: string; - parsedLabels?: Labels; - uniqueLabels?: Labels; -} - -export interface LogsStreamEntry { - line: string; - ts: string; - // Legacy, was renamed to ts - timestamp?: string; -} - export enum LogsDedupDescription { none = 'No de-duplication', exact = 'De-duplication of successive lines that are identical, ignoring ISO datetimes.', @@ -326,3 +324,136 @@ export function makeSeriesForLogs(rows: LogRowModel[], intervalMs: number): Time }; }); } + +function isLogsData(series: SeriesData) { + return series.fields.some(f => f.type === FieldType.time) && series.fields.some(f => f.type === FieldType.string); +} + +export function seriesDataToLogsModel(seriesData: SeriesData[], intervalMs: number): LogsModel { + const metricSeries: SeriesData[] = []; + const logSeries: SeriesData[] = []; + + for (const series of seriesData) { + if (isLogsData(series)) { + logSeries.push(series); + continue; + } + + metricSeries.push(series); + } + + const logsModel = logSeriesToLogsModel(logSeries); + if (logsModel) { + if (metricSeries.length === 0) { + logsModel.series = makeSeriesForLogs(logsModel.rows, intervalMs); + } else { + logsModel.series = []; + for (const series of metricSeries) { + logsModel.series.push(toLegacyResponseData(series) as TimeSeries); + } + } + + return logsModel; + } + + return undefined; +} + +export function logSeriesToLogsModel(logSeries: SeriesData[]): LogsModel { + if (logSeries.length === 0) { + return undefined; + } + + const allLabels: Labels[] = []; + for (let n = 0; n < logSeries.length; n++) { + const series = logSeries[n]; + if (series.labels) { + allLabels.push(series.labels); + } + } + + let commonLabels: Labels = {}; + if (allLabels.length > 0) { + commonLabels = findCommonLabels(allLabels); + } + + const rows: LogRowModel[] = []; + let hasUniqueLabels = false; + + for (let i = 0; i < logSeries.length; i++) { + const series = logSeries[i]; + const fieldCache = new FieldCache(series.fields); + const uniqueLabels = findUniqueLabels(series.labels, commonLabels); + if (Object.keys(uniqueLabels).length > 0) { + hasUniqueLabels = true; + } + + for (let j = 0; j < series.rows.length; j++) { + rows.push(processLogSeriesRow(series, fieldCache, j, uniqueLabels)); + } + } + + const sortedRows = rows.sort((a, b) => { + return a.timestamp > b.timestamp ? -1 : 1; + }); + + // Meta data to display in status + const meta: LogsMetaItem[] = []; + if (_.size(commonLabels) > 0) { + meta.push({ + label: 'Common labels', + value: commonLabels, + kind: LogsMetaKind.LabelsMap, + }); + } + + const limits = logSeries.filter(series => series.meta && series.meta.limit); + + if (limits.length > 0) { + meta.push({ + label: 'Limit', + value: `${limits[0].meta.limit} (${sortedRows.length} returned)`, + kind: LogsMetaKind.String, + }); + } + + return { + hasUniqueLabels, + meta, + rows: sortedRows, + }; +} + +export function processLogSeriesRow( + series: SeriesData, + fieldCache: FieldCache, + rowIndex: number, + uniqueLabels: Labels +): LogRowModel { + const row = series.rows[rowIndex]; + const timeFieldIndex = fieldCache.getFirstFieldOfType(FieldType.time).index; + const ts = row[timeFieldIndex]; + const stringFieldIndex = fieldCache.getFirstFieldOfType(FieldType.string).index; + const message = row[stringFieldIndex]; + const time = moment(ts); + const timeEpochMs = time.valueOf(); + const timeFromNow = time.fromNow(); + const timeLocal = time.format('YYYY-MM-DD HH:mm:ss'); + const logLevel = getLogLevel(message); + const hasAnsi = hasAnsiCodes(message); + const search = series.meta && series.meta.search ? series.meta.search : ''; + + return { + logLevel, + timeFromNow, + timeEpochMs, + timeLocal, + uniqueLabels, + hasAnsi, + entry: hasAnsi ? ansicolor.strip(message) : message, + raw: message, + labels: series.labels, + searchWords: search ? [search] : [], + timestamp: ts, + }; +} diff --git a/public/app/core/nav_model_srv.ts b/public/app/core/nav_model_srv.ts index 661cdbe77a3e4..a394511aa2c4d 100644 --- a/public/app/core/nav_model_srv.ts +++ b/public/app/core/nav_model_srv.ts @@ -1,29 +1,7 @@ import coreModule from 'app/core/core_module'; import config from 'app/core/config'; import _ from 'lodash'; - -export interface NavModelItem { - text: string; - url: string; - icon?: string; - img?: string; - id: string; - active?: boolean; - hideFromTabs?: boolean; - divider?: boolean; - children: NavModelItem[]; - target?: string; -} - -export class NavModel { - breadcrumbs: NavModelItem[]; - main: NavModelItem; - node: NavModelItem; - - constructor() { - this.breadcrumbs = []; - } -} +import { NavModel } from '@grafana/ui'; export class NavModelSrv { navItems: any; @@ -39,7 +17,9 @@ export class NavModelSrv { getNav(...args) { let children = this.navItems; - const nav = new NavModel(); + const nav = { + breadcrumbs: [], + } as NavModel; for (const id of args) { // if its a number then it's the index to use for main diff --git a/public/app/core/reducers/navModel.ts b/public/app/core/reducers/navModel.ts index 942739e45e6f0..f75b701a9ff19 100644 --- a/public/app/core/reducers/navModel.ts +++ b/public/app/core/reducers/navModel.ts @@ -1,5 +1,5 @@ import { Action, ActionTypes } from 'app/core/actions/navModel'; -import { NavIndex, NavModelItem } from 'app/types'; +import { NavIndex, NavModelItem } from '@grafana/ui'; import config from 'app/core/config'; export function buildInitialState(): NavIndex { diff --git a/public/app/core/selectors/navModel.ts b/public/app/core/selectors/navModel.ts index 849ee364e25cb..66a7011389c7c 100644 --- a/public/app/core/selectors/navModel.ts +++ b/public/app/core/selectors/navModel.ts @@ -1,4 +1,4 @@ -import { NavModel, NavModelItem, NavIndex } from 'app/types'; +import { NavModel, NavModelItem, NavIndex } from '@grafana/ui'; function getNotFoundModel(): NavModel { const node: NavModelItem = { diff --git a/public/app/core/specs/logs_model.test.ts b/public/app/core/specs/logs_model.test.ts index dcd1e48333071..807605965ef95 100644 --- a/public/app/core/specs/logs_model.test.ts +++ b/public/app/core/specs/logs_model.test.ts @@ -6,7 +6,10 @@ import { LogsDedupStrategy, LogsModel, LogsParsers, + seriesDataToLogsModel, + LogsMetaKind, } from '../logs_model'; +import { SeriesData, FieldType } from '@grafana/ui'; describe('dedupLogRows()', () => { test('should return rows as is when dedup is set to none', () => { @@ -329,3 +332,216 @@ describe('LogsParsers', () => { }); }); }); + +describe('seriesDataToLogsModel', () => { + it('given empty series should return undefined', () => { + expect(seriesDataToLogsModel([] as SeriesData[], 0)).toBeUndefined(); + }); + + it('given series without correct series name should not be processed', () => { + const series: SeriesData[] = [ + { + fields: [], + rows: [], + }, + ]; + expect(seriesDataToLogsModel(series, 0)).toBeUndefined(); + }); + + it('given series without a time field should not be processed', () => { + const series: SeriesData[] = [ + { + fields: [ + { + name: 'message', + type: FieldType.string, + }, + ], + rows: [], + }, + ]; + expect(seriesDataToLogsModel(series, 0)).toBeUndefined(); + }); + + it('given series without a string field should not be processed', () => { + const series: SeriesData[] = [ + { + fields: [ + { + name: 'time', + type: FieldType.time, + }, + ], + rows: [], + }, + ]; + expect(seriesDataToLogsModel(series, 0)).toBeUndefined(); + }); + + it('given one series should return expected logs model', () => { + const series: SeriesData[] = [ + { + labels: { + filename: '/var/log/grafana/grafana.log', + job: 'grafana', + }, + fields: [ + { + name: 'time', + type: FieldType.time, + }, + { + name: 'message', + type: FieldType.string, + }, + ], + rows: [ + [ + '2019-04-26T09:28:11.352440161Z', + 't=2019-04-26T11:05:28+0200 lvl=info msg="Initializing DatasourceCacheService" logger=server', + ], + [ + '2019-04-26T14:42:50.991981292Z', + 't=2019-04-26T16:42:50+0200 lvl=eror msg="new token…t unhashed token=56d9fdc5c8b7400bd51b060eea8ca9d7', + ], + ], + meta: { + limit: 1000, + }, + }, + ]; + const logsModel = seriesDataToLogsModel(series, 0); + expect(logsModel.hasUniqueLabels).toBeFalsy(); + expect(logsModel.rows).toHaveLength(2); + expect(logsModel.rows).toMatchObject([ + { + timestamp: '2019-04-26T14:42:50.991981292Z', + entry: 't=2019-04-26T16:42:50+0200 lvl=eror msg="new token…t unhashed token=56d9fdc5c8b7400bd51b060eea8ca9d7', + labels: { filename: '/var/log/grafana/grafana.log', job: 'grafana' }, + logLevel: 'error', + uniqueLabels: {}, + }, + { + timestamp: '2019-04-26T09:28:11.352440161Z', + entry: 't=2019-04-26T11:05:28+0200 lvl=info msg="Initializing DatasourceCacheService" logger=server', + labels: { filename: '/var/log/grafana/grafana.log', job: 'grafana' }, + logLevel: 'info', + uniqueLabels: {}, + }, + ]); + + expect(logsModel.series).toHaveLength(2); + expect(logsModel.meta).toHaveLength(2); + expect(logsModel.meta[0]).toMatchObject({ + label: 'Common labels', + value: series[0].labels, + kind: LogsMetaKind.LabelsMap, + }); + expect(logsModel.meta[1]).toMatchObject({ + label: 'Limit', + value: `1000 (2 returned)`, + kind: LogsMetaKind.String, + }); + }); + + it('given one series without labels should return expected logs model', () => { + const series: SeriesData[] = [ + { + fields: [ + { + name: 'time', + type: FieldType.time, + }, + { + name: 'message', + type: FieldType.string, + }, + ], + rows: [['1970-01-01T00:00:01Z', 'WARN boooo']], + }, + ]; + const logsModel = seriesDataToLogsModel(series, 0); + expect(logsModel.rows).toHaveLength(1); + expect(logsModel.rows).toMatchObject([ + { + entry: 'WARN boooo', + labels: undefined, + logLevel: 'warning', + uniqueLabels: {}, + }, + ]); + }); + + it('given multiple series should return expected logs model', () => { + const series: SeriesData[] = [ + { + labels: { + foo: 'bar', + baz: '1', + }, + fields: [ + { + name: 'ts', + type: FieldType.time, + }, + { + name: 'line', + type: FieldType.string, + }, + ], + rows: [['1970-01-01T00:00:01Z', 'WARN boooo']], + }, + { + name: 'logs', + labels: { + foo: 'bar', + baz: '2', + }, + fields: [ + { + name: 'time', + type: FieldType.time, + }, + { + name: 'message', + type: FieldType.string, + }, + ], + rows: [['1970-01-01T00:00:00Z', 'INFO 1'], ['1970-01-01T00:00:02Z', 'INFO 2']], + }, + ]; + const logsModel = seriesDataToLogsModel(series, 0); + expect(logsModel.hasUniqueLabels).toBeTruthy(); + expect(logsModel.rows).toHaveLength(3); + expect(logsModel.rows).toMatchObject([ + { + entry: 'INFO 2', + labels: { foo: 'bar', baz: '2' }, + logLevel: 'info', + uniqueLabels: { baz: '2' }, + }, + { + entry: 'WARN boooo', + labels: { foo: 'bar', baz: '1' }, + logLevel: 'warning', + uniqueLabels: { baz: '1' }, + }, + { + entry: 'INFO 1', + labels: { foo: 'bar', baz: '2' }, + logLevel: 'info', + uniqueLabels: { baz: '2' }, + }, + ]); + + expect(logsModel.series).toHaveLength(2); + expect(logsModel.meta).toHaveLength(1); + expect(logsModel.meta[0]).toMatchObject({ + label: 'Common labels', + value: { + foo: 'bar', + }, + kind: LogsMetaKind.LabelsMap, + }); + }); +}); diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts index cfc53ae450bac..2994fac71be05 100644 --- a/public/app/core/utils/explore.ts +++ b/public/app/core/utils/explore.ts @@ -1,18 +1,27 @@ // Libraries import _ from 'lodash'; +import moment, { Moment } from 'moment'; // Services & Utils import * as dateMath from 'app/core/utils/datemath'; import { renderUrl } from 'app/core/utils/url'; import kbn from 'app/core/utils/kbn'; import store from 'app/core/store'; -import { parse as parseDate } from 'app/core/utils/datemath'; -import { colors } from '@grafana/ui'; import TableModel, { mergeTablesIntoModel } from 'app/core/table_model'; import { getNextRefIdChar } from './query'; // Types -import { RawTimeRange, IntervalValues, DataQuery, DataSourceApi } from '@grafana/ui'; +import { + colors, + TimeRange, + RawTimeRange, + TimeZone, + IntervalValues, + DataQuery, + DataSourceApi, + toSeriesData, + guessFieldTypes, +} from '@grafana/ui'; import TimeSeries from 'app/core/time_series2'; import { ExploreUrlState, @@ -23,7 +32,7 @@ import { QueryOptions, ResultGetter, } from 'app/types/explore'; -import { LogsDedupStrategy } from 'app/core/logs_model'; +import { LogsDedupStrategy, seriesDataToLogsModel } from 'app/core/logs_model'; export const DEFAULT_RANGE = { from: 'now-6h', @@ -104,7 +113,7 @@ export function buildQueryTransaction( rowIndex: number, resultType: ResultType, queryOptions: QueryOptions, - range: RawTimeRange, + range: TimeRange, queryIntervals: QueryIntervals, scanning: boolean ): QueryTransaction { @@ -131,12 +140,8 @@ export function buildQueryTransaction( intervalMs, panelId, targets: configuredQueries, // Datasources rely on DataQueries being passed under the targets key. - range: { - from: dateMath.parse(range.from, false), - to: dateMath.parse(range.to, true), - raw: range, - }, - rangeRaw: range, + range, + rangeRaw: range.raw, scopedVars: { __interval: { text: interval, value: interval }, __interval_ms: { text: intervalMs, value: intervalMs }, @@ -298,15 +303,12 @@ export function calculateResultsFromQueryTransactions( .filter(qt => qt.resultType === 'Table' && qt.done && qt.result && qt.result.columns && qt.result.rows) .map(qt => qt.result) ); - const logsResult = - datasource && datasource.mergeStreams - ? datasource.mergeStreams( - _.flatten( - queryTransactions.filter(qt => qt.resultType === 'Logs' && qt.done && qt.result).map(qt => qt.result) - ), - graphInterval - ) - : undefined; + const logsResult = seriesDataToLogsModel( + _.flatten( + queryTransactions.filter(qt => qt.resultType === 'Logs' && qt.done && qt.result).map(qt => qt.result) + ).map(r => guessFieldTypes(toSeriesData(r))), + graphInterval + ); return { graphResult, @@ -315,17 +317,12 @@ export function calculateResultsFromQueryTransactions( }; } -export function getIntervals(range: RawTimeRange, lowLimit: string, resolution: number): IntervalValues { +export function getIntervals(range: TimeRange, lowLimit: string, resolution: number): IntervalValues { if (!resolution) { return { interval: '1s', intervalMs: 1000 }; } - const absoluteRange: RawTimeRange = { - from: parseDate(range.from, false), - to: parseDate(range.to, true), - }; - - return kbn.calculateInterval(absoluteRange, resolution, lowLimit); + return kbn.calculateInterval(range, resolution, lowLimit); } export const makeTimeSeriesList: ResultGetter = (dataList, transaction, allTransactions) => { @@ -395,3 +392,51 @@ export const getQueryKeys = (queries: DataQuery[], datasourceInstance: DataSourc return queryKeys; }; + +export const getTimeRange = (timeZone: TimeZone, rawRange: RawTimeRange): TimeRange => { + return { + from: dateMath.parse(rawRange.from, false, timeZone.raw as any), + to: dateMath.parse(rawRange.to, true, timeZone.raw as any), + raw: rawRange, + }; +}; + +const parseRawTime = (value): Moment | string => { + if (value === null) { + return null; + } + + if (value.indexOf('now') !== -1) { + return value; + } + if (value.length === 8) { + return moment.utc(value, 'YYYYMMDD'); + } + if (value.length === 15) { + return moment.utc(value, 'YYYYMMDDTHHmmss'); + } + // Backward compatibility + if (value.length === 19) { + return moment.utc(value, 'YYYY-MM-DD HH:mm:ss'); + } + + if (!isNaN(value)) { + const epoch = parseInt(value, 10); + return moment.utc(epoch); + } + + return null; +}; + +export const getTimeRangeFromUrl = (range: RawTimeRange, timeZone: TimeZone): TimeRange => { + const raw = { + from: parseRawTime(range.from), + to: parseRawTime(range.to), + }; + + return { + from: dateMath.parse(raw.from, false, timeZone.raw as any), + to: dateMath.parse(raw.to, true, timeZone.raw as any), + raw, + }; +}; diff --git a/public/app/features/admin/ServerStats.tsx b/public/app/features/admin/ServerStats.tsx index 92e7da6e8311e..c5129d11fbe2d 100644 --- a/public/app/features/admin/ServerStats.tsx +++ b/public/app/features/admin/ServerStats.tsx @@ -1,10 +1,11 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { NavModel, StoreState } from 'app/types'; +import { StoreState } from 'app/types'; import { getNavModel } from 'app/core/selectors/navModel'; import { getServerStats, ServerStat } from './state/apis'; import Page from 'app/core/components/Page/Page'; +import { NavModel } from '@grafana/ui'; interface Props { navModel: NavModel; diff --git a/public/app/features/alerting/AlertRuleList.test.tsx b/public/app/features/alerting/AlertRuleList.test.tsx index 61b59cc852327..88720c775a960 100644 --- a/public/app/features/alerting/AlertRuleList.test.tsx +++ b/public/app/features/alerting/AlertRuleList.test.tsx @@ -1,10 +1,11 @@ import React from 'react'; import { shallow } from 'enzyme'; import { AlertRuleList, Props } from './AlertRuleList'; -import { AlertRule, NavModel } from '../../types'; +import { AlertRule } from '../../types'; import appEvents from '../../core/app_events'; import { mockActionCreator } from 'app/core/redux'; import { updateLocation } from 'app/core/actions'; +import { NavModel } from '@grafana/ui'; jest.mock('../../core/app_events', () => ({ emit: jest.fn(), diff --git a/public/app/features/alerting/AlertRuleList.tsx b/public/app/features/alerting/AlertRuleList.tsx index 9b4ceac3acd31..dcd31b71419c8 100644 --- a/public/app/features/alerting/AlertRuleList.tsx +++ b/public/app/features/alerting/AlertRuleList.tsx @@ -6,10 +6,11 @@ import AlertRuleItem from './AlertRuleItem'; import appEvents from 'app/core/app_events'; import { updateLocation } from 'app/core/actions'; import { getNavModel } from 'app/core/selectors/navModel'; -import { NavModel, StoreState, AlertRule } from 'app/types'; +import { StoreState, AlertRule } from 'app/types'; import { getAlertRulesAsync, setSearchQuery, togglePauseAlertRule } from './state/actions'; import { getAlertRuleItems, getSearchQuery } from './state/selectors'; import { FilterInput } from 'app/core/components/FilterInput/FilterInput'; +import { NavModel } from '@grafana/ui'; export interface Props { navModel: NavModel; diff --git a/public/app/features/api-keys/ApiKeysPage.test.tsx b/public/app/features/api-keys/ApiKeysPage.test.tsx index 23def68728e1c..37afa36b173ae 100644 --- a/public/app/features/api-keys/ApiKeysPage.test.tsx +++ b/public/app/features/api-keys/ApiKeysPage.test.tsx @@ -1,8 +1,9 @@ import React from 'react'; import { shallow } from 'enzyme'; import { Props, ApiKeysPage } from './ApiKeysPage'; -import { NavModel, ApiKey } from 'app/types'; +import { ApiKey } from 'app/types'; import { getMultipleMockKeys, getMockKey } from './__mocks__/apiKeysMock'; +import { NavModel } from '@grafana/ui'; const setup = (propOverrides?: object) => { const props: Props = { diff --git a/public/app/features/api-keys/ApiKeysPage.tsx b/public/app/features/api-keys/ApiKeysPage.tsx index 9748a5727cfa6..7a058c1c25da9 100644 --- a/public/app/features/api-keys/ApiKeysPage.tsx +++ b/public/app/features/api-keys/ApiKeysPage.tsx @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; import ReactDOMServer from 'react-dom/server'; import { connect } from 'react-redux'; import { hot } from 'react-hot-loader'; -import { NavModel, ApiKey, NewApiKey, OrgRole } from 'app/types'; +import { ApiKey, NewApiKey, OrgRole } from 'app/types'; import { getNavModel } from 'app/core/selectors/navModel'; import { getApiKeys, getApiKeysCount } from './state/selectors'; import { loadApiKeys, deleteApiKey, setSearchQuery, addApiKey } from './state/actions'; @@ -12,7 +12,7 @@ import ApiKeysAddedModal from './ApiKeysAddedModal'; import config from 'app/core/config'; import appEvents from 'app/core/app_events'; import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA'; -import { DeleteButton, Input } from '@grafana/ui'; +import { DeleteButton, Input, NavModel } from '@grafana/ui'; import { FilterInput } from 'app/core/components/FilterInput/FilterInput'; export interface Props { diff --git a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts index 76151e26c1584..00959e98a3c6f 100644 --- a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts +++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts @@ -9,7 +9,7 @@ import config from 'app/core/config'; import { DashboardExporter } from './DashboardExporter'; import { DashboardModel } from '../../state/DashboardModel'; import { DatasourceSrv } from 'app/features/plugins/datasource_srv'; -import { PanelPluginMeta } from 'app/types'; +import { PanelPluginMeta } from '@grafana/ui'; describe('given dashboard with repeated panels', () => { let dash: any, exported: any; diff --git a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts index 78d84350b572f..79cbe918434ba 100644 --- a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts +++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts @@ -4,7 +4,7 @@ import config from 'app/core/config'; import { DashboardModel } from '../../state/DashboardModel'; import DatasourceSrv from 'app/features/plugins/datasource_srv'; import { PanelModel } from 'app/features/dashboard/state'; -import { PanelPluginMeta } from 'app/types/plugins'; +import { PanelPluginMeta } from '@grafana/ui'; interface Input { name: string; diff --git a/public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts b/public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts index c0332e619507f..2fb9d76daa342 100755 --- a/public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts +++ b/public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts @@ -192,6 +192,8 @@ export class SettingsCtrl { text2: ` See documentation for more information about provisioning. +
+ File path: ${this.dashboard.meta.provisionedExternalId} `, text2htmlBind: true, icon: 'fa-trash', diff --git a/public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.ts b/public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.ts index 851644d3f1490..ca85c962d1a41 100644 --- a/public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.ts +++ b/public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.ts @@ -1,6 +1,7 @@ import angular from 'angular'; import { saveAs } from 'file-saver'; import coreModule from 'app/core/core_module'; +import { DashboardModel } from '../../state'; const template = `
@@ -21,6 +22,9 @@ const template = ` See documentation for more information about provisioning. +
+ File path: {{ctrl.dashboardModel.meta.provisionedExternalId}} +
@@ -41,12 +45,14 @@ const template = ` export class SaveProvisionedDashboardModalCtrl { dash: any; + dashboardModel: DashboardModel; dashboardJson: string; dismiss: () => void; /** @ngInject */ constructor(dashboardSrv) { - this.dash = dashboardSrv.getCurrent().getSaveModelClone(); + this.dashboardModel = dashboardSrv.getCurrent(); + this.dash = this.dashboardModel.getSaveModelClone(); delete this.dash.id; this.dashboardJson = angular.toJson(this.dash, true); } diff --git a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx index 44ae626cc2050..e3b0b93f31d27 100644 --- a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx +++ b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx @@ -1,6 +1,5 @@ // Libraries import React, { PureComponent } from 'react'; -import config from 'app/core/config'; import classNames from 'classnames'; // Utils & Services @@ -9,7 +8,6 @@ import { importPanelPlugin } from 'app/features/plugins/plugin_loader'; // Components import { AddPanelWidget } from '../components/AddPanelWidget'; -import { getPanelPluginNotFound } from './PanelPluginNotFound'; import { DashboardRow } from '../components/DashboardRow'; import { PanelChrome } from './PanelChrome'; import { PanelEditor } from '../panel_editor/PanelEditor'; @@ -17,8 +15,7 @@ import { PanelResizer } from './PanelResizer'; // Types import { PanelModel, DashboardModel } from '../state'; -import { PanelPluginMeta } from 'app/types'; -import { AngularPanelPlugin, PanelPlugin } from '@grafana/ui/src/types/panel'; +import { PanelPluginMeta, PanelPlugin } from '@grafana/ui/src/types/panel'; import { AutoSizer } from 'react-virtualized'; export interface Props { @@ -29,7 +26,7 @@ export interface Props { } export interface State { - plugin: PanelPluginMeta; + plugin: PanelPlugin; angularPanel: AngularComponent; } @@ -73,15 +70,12 @@ export class DashboardPanel extends PureComponent { const { panel } = this.props; // handle plugin loading & changing of plugin type - if (!this.state.plugin || this.state.plugin.id !== pluginId) { - let plugin = config.panels[pluginId] || getPanelPluginNotFound(pluginId); + if (!this.state.plugin || this.state.plugin.meta.id !== pluginId) { + const plugin = await importPanelPlugin(pluginId); // unmount angular panel this.cleanUpAngularPanel(); - // load the actual plugin code - plugin = await this.importPanelPluginModule(plugin); - if (panel.type !== pluginId) { panel.changePlugin(plugin); } else { @@ -92,27 +86,6 @@ export class DashboardPanel extends PureComponent { } } - async importPanelPluginModule(plugin: PanelPluginMeta): Promise { - if (plugin.hasBeenImported) { - return plugin; - } - - try { - const importedPlugin = await importPanelPlugin(plugin.module); - if (importedPlugin instanceof AngularPanelPlugin) { - plugin.angularPlugin = importedPlugin as AngularPanelPlugin; - } else if (importedPlugin instanceof PanelPlugin) { - plugin.vizPlugin = importedPlugin as PanelPlugin; - } - } catch (e) { - plugin = getPanelPluginNotFound(plugin.id); - console.log('Failed to import plugin module', e); - } - - plugin.hasBeenImported = true; - return plugin; - } - componentDidMount() { this.loadPlugin(this.props.panel.type); } @@ -187,7 +160,7 @@ export class DashboardPanel extends PureComponent { } // if we have not loaded plugin exports yet, wait - if (!plugin || !plugin.hasBeenImported) { + if (!plugin) { return null; } @@ -210,8 +183,7 @@ export class DashboardPanel extends PureComponent { onMouseLeave={this.onMouseLeave} style={styles} > - {plugin.vizPlugin && this.renderReactPanel()} - {plugin.angularPlugin && this.renderAngularPanel()} + {plugin.angularPanelCtrl ? this.renderAngularPanel() : this.renderReactPanel()}
)} /> diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx index 148c559f6aac8..b6f9bed46aa43 100644 --- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx +++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx @@ -16,8 +16,7 @@ import config from 'app/core/config'; // Types import { DashboardModel, PanelModel } from '../state'; -import { PanelPluginMeta } from 'app/types'; -import { LoadingState, PanelData } from '@grafana/ui'; +import { LoadingState, PanelData, PanelPlugin } from '@grafana/ui'; import { ScopedVars } from '@grafana/ui'; import templateSrv from 'app/features/templating/template_srv'; @@ -30,7 +29,7 @@ const DEFAULT_PLUGIN_ERROR = 'Error in plugin'; export interface Props { panel: PanelModel; dashboard: DashboardModel; - plugin: PanelPluginMeta; + plugin: PanelPlugin; isFullscreen: boolean; width: number; height: number; @@ -210,13 +209,13 @@ export class PanelChrome extends PureComponent { } get wantsQueryExecution() { - return this.props.plugin.dataFormats.length > 0 && !this.hasPanelSnapshot; + return this.props.plugin.meta.dataFormats.length > 0 && !this.hasPanelSnapshot; } renderPanel(width: number, height: number): JSX.Element { const { panel, plugin } = this.props; const { renderCounter, data, isFirstLoad } = this.state; - const PanelComponent = plugin.vizPlugin.panel; + const PanelComponent = plugin.panel; // This is only done to increase a counter that is used by backend // image rendering (phantomjs/headless chrome) to know when to capture image @@ -237,7 +236,7 @@ export class PanelChrome extends PureComponent { { - constructor(props) { + constructor(props: Props) { super(props); } @@ -34,14 +34,15 @@ class PanelPluginNotFound extends PureComponent { } } -export function getPanelPluginNotFound(id: string): PanelPluginMeta { +export function getPanelPluginNotFound(id: string): PanelPlugin { const NotFound = class NotFound extends PureComponent { render() { return ; } }; - return { + const plugin = new PanelPlugin(NotFound); + plugin.meta = { id: id, name: id, sort: 100, @@ -63,7 +64,6 @@ export function getPanelPluginNotFound(id: string): PanelPluginMeta { updated: '', version: '', }, - vizPlugin: new PanelPlugin(NotFound), - angularPlugin: null, }; + return plugin; } diff --git a/public/app/features/dashboard/panel_editor/PanelEditor.tsx b/public/app/features/dashboard/panel_editor/PanelEditor.tsx index bc49207e5cc4f..5cf7ad78d1f89 100644 --- a/public/app/features/dashboard/panel_editor/PanelEditor.tsx +++ b/public/app/features/dashboard/panel_editor/PanelEditor.tsx @@ -13,14 +13,12 @@ import { AngularComponent } from 'app/core/services/AngularLoader'; import { PanelModel } from '../state/PanelModel'; import { DashboardModel } from '../state/DashboardModel'; -import { PanelPluginMeta } from 'app/types/plugins'; - -import { Tooltip } from '@grafana/ui'; +import { Tooltip, PanelPlugin, PanelPluginMeta } from '@grafana/ui'; interface PanelEditorProps { panel: PanelModel; dashboard: DashboardModel; - plugin: PanelPluginMeta; + plugin: PanelPlugin; angularPanel?: AngularComponent; onTypeChanged: (newType: PanelPluginMeta) => void; } @@ -57,7 +55,7 @@ const getPanelEditorTab = (tabId: PanelEditorTabIds): PanelEditorTab => { }; export class PanelEditor extends PureComponent { - constructor(props) { + constructor(props: PanelEditorProps) { super(props); } @@ -107,7 +105,7 @@ export class PanelEditor extends PureComponent { ]; // handle panels that do not have queries tab - if (plugin.dataFormats.length === 0) { + if (plugin.meta.dataFormats.length === 0) { // remove queries tab tabs.shift(); // switch tab @@ -116,7 +114,7 @@ export class PanelEditor extends PureComponent { } } - if (config.alertingEnabled && plugin.id === 'graph') { + if (config.alertingEnabled && plugin.meta.id === 'graph') { tabs.push(getPanelEditorTab(PanelEditorTabIds.Alert)); } diff --git a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx index 3247cf631a764..0cfa96da2a48d 100644 --- a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx +++ b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx @@ -16,14 +16,14 @@ import { FadeIn } from 'app/core/components/Animations/FadeIn'; // Types import { PanelModel } from '../state'; import { DashboardModel } from '../state'; -import { PanelPluginMeta } from 'app/types/plugins'; import { VizPickerSearch } from './VizPickerSearch'; import PluginStateinfo from 'app/features/plugins/PluginStateInfo'; +import { PanelPlugin, PanelPluginMeta } from '@grafana/ui'; interface Props { panel: PanelModel; dashboard: DashboardModel; - plugin: PanelPluginMeta; + plugin: PanelPlugin; angularPanel?: AngularComponent; onTypeChanged: (newType: PanelPluginMeta) => void; updateLocation: typeof updateLocation; @@ -41,7 +41,7 @@ export class VisualizationTab extends PureComponent { element: HTMLElement; angularOptions: AngularComponent; - constructor(props) { + constructor(props: Props) { super(props); this.state = { @@ -54,7 +54,7 @@ export class VisualizationTab extends PureComponent { getReactPanelOptions = () => { const { panel, plugin } = this.props; - return panel.getOptions(plugin.vizPlugin.defaults); + return panel.getOptions(plugin.defaults); }; renderPanelOptions() { @@ -64,12 +64,8 @@ export class VisualizationTab extends PureComponent { return
(this.element = element)} />; } - if (plugin.vizPlugin) { - const PanelEditor = plugin.vizPlugin.editor; - - if (PanelEditor) { - return ; - } + if (plugin.editor) { + return ; } return

Visualization has no options

; @@ -176,11 +172,12 @@ export class VisualizationTab extends PureComponent { renderToolbar = (): JSX.Element => { const { plugin } = this.props; const { isVizPickerOpen, searchQuery } = this.state; + const { meta } = plugin; if (isVizPickerOpen) { return ( { } else { return (
- -
{plugin.name}
+ +
{meta.name}
); @@ -198,14 +195,14 @@ export class VisualizationTab extends PureComponent { }; onTypeChanged = (plugin: PanelPluginMeta) => { - if (plugin.id === this.props.plugin.id) { + if (plugin.id === this.props.plugin.meta.id) { this.setState({ isVizPickerOpen: false }); } else { this.props.onTypeChanged(plugin); } }; - renderHelp = () => ; + renderHelp = () => ; setScrollTop = (event: React.MouseEvent) => { const target = event.target as HTMLElement; @@ -215,6 +212,7 @@ export class VisualizationTab extends PureComponent { render() { const { plugin } = this.props; const { isVizPickerOpen, searchQuery, scrollTop } = this.state; + const { meta } = plugin; const pluginHelp: EditorToolbarView = { heading: 'Help', @@ -233,13 +231,13 @@ export class VisualizationTab extends PureComponent { <> - + {this.renderPanelOptions()} diff --git a/public/app/features/dashboard/panel_editor/VizPickerSearch.tsx b/public/app/features/dashboard/panel_editor/VizPickerSearch.tsx index beb9a8508f969..d4773f15895f6 100644 --- a/public/app/features/dashboard/panel_editor/VizPickerSearch.tsx +++ b/public/app/features/dashboard/panel_editor/VizPickerSearch.tsx @@ -1,8 +1,7 @@ import React, { PureComponent } from 'react'; import { FilterInput } from 'app/core/components/FilterInput/FilterInput'; - -import { PanelPluginMeta } from 'app/types'; +import { PanelPluginMeta } from '@grafana/ui'; interface Props { plugin: PanelPluginMeta; diff --git a/public/app/features/dashboard/panel_editor/VizTypePicker.tsx b/public/app/features/dashboard/panel_editor/VizTypePicker.tsx index 71a02f9644eea..30da43940f9b7 100644 --- a/public/app/features/dashboard/panel_editor/VizTypePicker.tsx +++ b/public/app/features/dashboard/panel_editor/VizTypePicker.tsx @@ -1,9 +1,8 @@ import React, { PureComponent } from 'react'; import config from 'app/core/config'; -import { PanelPluginMeta } from 'app/types/plugins'; import VizTypePickerPlugin from './VizTypePickerPlugin'; -import { EmptySearchResult } from '@grafana/ui'; +import { PanelPluginMeta, EmptySearchResult } from '@grafana/ui'; export interface Props { current: PanelPluginMeta; diff --git a/public/app/features/dashboard/panel_editor/VizTypePickerPlugin.tsx b/public/app/features/dashboard/panel_editor/VizTypePickerPlugin.tsx index a91917e918c67..dd04d2fd624c4 100644 --- a/public/app/features/dashboard/panel_editor/VizTypePickerPlugin.tsx +++ b/public/app/features/dashboard/panel_editor/VizTypePickerPlugin.tsx @@ -1,6 +1,6 @@ import React from 'react'; import classNames from 'classnames'; -import { PanelPluginMeta } from 'app/types/plugins'; +import { PanelPluginMeta } from '@grafana/ui'; interface Props { isCurrent: boolean; diff --git a/public/app/features/dashboard/state/PanelModel.test.ts b/public/app/features/dashboard/state/PanelModel.test.ts index 6cde516d1af6a..ca88584ad08dd 100644 --- a/public/app/features/dashboard/state/PanelModel.test.ts +++ b/public/app/features/dashboard/state/PanelModel.test.ts @@ -1,6 +1,5 @@ import { PanelModel } from './PanelModel'; import { getPanelPlugin } from '../../plugins/__mocks__/pluginMocks'; -import { PanelPlugin, AngularPanelPlugin } from '@grafana/ui/src/types/panel'; class TablePanelCtrl {} @@ -31,10 +30,13 @@ describe('PanelModel', () => { }; model = new PanelModel(modelJson); model.pluginLoaded( - getPanelPlugin({ - id: 'table', - angularPlugin: new AngularPanelPlugin(TablePanelCtrl), - }) + getPanelPlugin( + { + id: 'table', + }, + null, // react + TablePanelCtrl // angular + ) ); }); @@ -123,15 +125,10 @@ describe('PanelModel', () => { describe('when changing to react panel', () => { const onPanelTypeChanged = jest.fn(); - const reactPlugin = new PanelPlugin({} as any).setPanelChangeHandler(onPanelTypeChanged as any); + const reactPlugin = getPanelPlugin({ id: 'react' }).setPanelChangeHandler(onPanelTypeChanged as any); beforeEach(() => { - model.changePlugin( - getPanelPlugin({ - id: 'react', - vizPlugin: reactPlugin, - }) - ); + model.changePlugin(reactPlugin); }); it('should call react onPanelTypeChanged', () => { diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts index e79d8df00acce..a09540adc9ab8 100644 --- a/public/app/features/dashboard/state/PanelModel.ts +++ b/public/app/features/dashboard/state/PanelModel.ts @@ -6,8 +6,7 @@ import { Emitter } from 'app/core/utils/emitter'; import { getNextRefIdChar } from 'app/core/utils/query'; // Types -import { DataQuery, Threshold, ScopedVars, DataQueryResponseData } from '@grafana/ui'; -import { PanelPluginMeta } from 'app/types'; +import { DataQuery, Threshold, ScopedVars, DataQueryResponseData, PanelPlugin } from '@grafana/ui'; import config from 'app/core/config'; import { PanelQueryRunner } from './PanelQueryRunner'; @@ -117,7 +116,7 @@ export class PanelModel { cacheTimeout?: any; cachedPluginOptions?: any; legend?: { show: boolean }; - plugin?: PanelPluginMeta; + plugin?: PanelPlugin; private queryRunner?: PanelQueryRunner; constructor(model: any) { @@ -249,29 +248,25 @@ export class PanelModel { }); } - private getPluginVersion(plugin: PanelPluginMeta): string { - return this.plugin && this.plugin.info.version ? this.plugin.info.version : config.buildInfo.version; - } - - pluginLoaded(plugin: PanelPluginMeta) { + pluginLoaded(plugin: PanelPlugin) { this.plugin = plugin; - if (plugin.vizPlugin && plugin.vizPlugin.onPanelMigration) { - const version = this.getPluginVersion(plugin); + if (plugin.panel && plugin.onPanelMigration) { + const version = getPluginVersion(plugin); if (version !== this.pluginVersion) { - this.options = plugin.vizPlugin.onPanelMigration(this); + this.options = plugin.onPanelMigration(this); this.pluginVersion = version; } } } - changePlugin(newPlugin: PanelPluginMeta) { - const pluginId = newPlugin.id; + changePlugin(newPlugin: PanelPlugin) { + const pluginId = newPlugin.meta.id; const oldOptions: any = this.getOptionsToRemember(); const oldPluginId = this.type; // for angular panels we must remove all events and let angular panels do some cleanup - if (this.plugin.angularPlugin) { + if (this.plugin.angularPanelCtrl) { this.destroy(); } @@ -292,18 +287,14 @@ export class PanelModel { this.plugin = newPlugin; // Let panel plugins inspect options from previous panel and keep any that it can use - const reactPanel = newPlugin.vizPlugin; - - if (reactPanel) { - if (reactPanel.onPanelTypeChanged) { - this.options = this.options || {}; - const old = oldOptions && oldOptions.options ? oldOptions.options : {}; - Object.assign(this.options, reactPanel.onPanelTypeChanged(this.options, oldPluginId, old)); - } + if (newPlugin.onPanelTypeChanged) { + this.options = this.options || {}; + const old = oldOptions && oldOptions.options ? oldOptions.options : {}; + Object.assign(this.options, newPlugin.onPanelTypeChanged(this.options, oldPluginId, old)); + } - if (reactPanel.onPanelMigration) { - this.pluginVersion = this.getPluginVersion(newPlugin); - } + if (newPlugin.onPanelMigration) { + this.pluginVersion = getPluginVersion(newPlugin); } } @@ -342,3 +333,7 @@ export class PanelModel { } } } + +function getPluginVersion(plugin: PanelPlugin): string { + return plugin && plugin.meta.info.version ? plugin.meta.info.version : config.buildInfo.version; +} diff --git a/public/app/features/datasources/DataSourceDashboards.test.tsx b/public/app/features/datasources/DataSourceDashboards.test.tsx index 21ae806c6031c..32ed7252e2d95 100644 --- a/public/app/features/datasources/DataSourceDashboards.test.tsx +++ b/public/app/features/datasources/DataSourceDashboards.test.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { shallow } from 'enzyme'; import { DataSourceDashboards, Props } from './DataSourceDashboards'; -import { DataSourceSettings } from '@grafana/ui/src/types'; -import { NavModel, PluginDashboard } from 'app/types'; +import { NavModel, DataSourceSettings } from '@grafana/ui'; +import { PluginDashboard } from 'app/types'; const setup = (propOverrides?: object) => { const props: Props = { diff --git a/public/app/features/datasources/DataSourceDashboards.tsx b/public/app/features/datasources/DataSourceDashboards.tsx index 548145a79f5ae..0993a455dc93f 100644 --- a/public/app/features/datasources/DataSourceDashboards.tsx +++ b/public/app/features/datasources/DataSourceDashboards.tsx @@ -16,8 +16,8 @@ import { importDashboard, removeDashboard } from '../dashboard/state/actions'; import { getDataSource } from './state/selectors'; // Types -import { NavModel, PluginDashboard, StoreState } from 'app/types'; -import { DataSourceSettings } from '@grafana/ui/src/types'; +import { PluginDashboard, StoreState } from 'app/types'; +import { NavModel, DataSourceSettings } from '@grafana/ui'; export interface Props { navModel: NavModel; diff --git a/public/app/features/datasources/DataSourcesListPage.test.tsx b/public/app/features/datasources/DataSourcesListPage.test.tsx index 65077201f6598..f796df3f4cadb 100644 --- a/public/app/features/datasources/DataSourcesListPage.test.tsx +++ b/public/app/features/datasources/DataSourcesListPage.test.tsx @@ -1,8 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { DataSourcesListPage, Props } from './DataSourcesListPage'; -import { NavModel } from 'app/types'; -import { DataSourceSettings } from '@grafana/ui/src/types'; +import { NavModel, DataSourceSettings } from '@grafana/ui'; import { LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector'; import { getMockDataSources } from './__mocks__/dataSourcesMocks'; import { setDataSourcesSearchQuery, setDataSourcesLayoutMode } from './state/actions'; diff --git a/public/app/features/datasources/DataSourcesListPage.tsx b/public/app/features/datasources/DataSourcesListPage.tsx index 9f881446aeccc..cc04856ce3430 100644 --- a/public/app/features/datasources/DataSourcesListPage.tsx +++ b/public/app/features/datasources/DataSourcesListPage.tsx @@ -10,8 +10,8 @@ import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA'; import DataSourcesList from './DataSourcesList'; // Types -import { DataSourceSettings } from '@grafana/ui/src/types'; -import { NavModel, StoreState } from 'app/types'; +import { NavModel, DataSourceSettings } from '@grafana/ui'; +import { StoreState } from 'app/types'; import { LayoutMode } from 'app/core/components/LayoutSelector/LayoutSelector'; // Actions diff --git a/public/app/features/datasources/NewDataSourcePage.tsx b/public/app/features/datasources/NewDataSourcePage.tsx index b572bacc1a192..ae0eae9e02f4a 100644 --- a/public/app/features/datasources/NewDataSourcePage.tsx +++ b/public/app/features/datasources/NewDataSourcePage.tsx @@ -2,15 +2,16 @@ import React, { PureComponent } from 'react'; import { connect } from 'react-redux'; import { hot } from 'react-hot-loader'; import Page from 'app/core/components/Page/Page'; -import { NavModel, Plugin, StoreState } from 'app/types'; +import { StoreState } from 'app/types'; import { addDataSource, loadDataSourceTypes, setDataSourceTypeSearchQuery } from './state/actions'; import { getNavModel } from 'app/core/selectors/navModel'; import { getDataSourceTypes } from './state/selectors'; import { FilterInput } from 'app/core/components/FilterInput/FilterInput'; +import { NavModel, DataSourcePluginMeta } from '@grafana/ui'; export interface Props { navModel: NavModel; - dataSourceTypes: Plugin[]; + dataSourceTypes: DataSourcePluginMeta[]; isLoading: boolean; addDataSource: typeof addDataSource; loadDataSourceTypes: typeof loadDataSourceTypes; @@ -23,7 +24,7 @@ class NewDataSourcePage extends PureComponent { this.props.loadDataSourceTypes(); } - onDataSourceTypeClicked = (plugin: Plugin) => { + onDataSourceTypeClicked = (plugin: DataSourcePluginMeta) => { this.props.addDataSource(plugin); }; diff --git a/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx b/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx index d4664418f0700..575311c2d1746 100644 --- a/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx +++ b/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx @@ -1,8 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { DataSourceSettingsPage, Props } from './DataSourceSettingsPage'; -import { NavModel } from 'app/types'; -import { DataSourceSettings, DataSourcePlugin, DataSourceConstructor } from '@grafana/ui'; +import { NavModel, DataSourceSettings, DataSourcePlugin, DataSourceConstructor } from '@grafana/ui'; import { getMockDataSource } from '../__mocks__/dataSourcesMocks'; import { getMockPlugin } from '../../plugins/__mocks__/pluginMocks'; import { setDataSourceName, setIsDefault } from '../state/actions'; diff --git a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx index 489ccd4234b94..fd2fa3ebf2629 100644 --- a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx +++ b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx @@ -21,8 +21,8 @@ import { getNavModel } from 'app/core/selectors/navModel'; import { getRouteParamsId } from 'app/core/selectors/location'; // Types -import { NavModel, Plugin, StoreState } from 'app/types/'; -import { DataSourceSettings, DataSourcePlugin } from '@grafana/ui/src/types/'; +import { StoreState } from 'app/types/'; +import { NavModel, DataSourceSettings, DataSourcePlugin, DataSourcePluginMeta } from '@grafana/ui'; import { getDataSourceLoadingNav } from '../state/navModel'; import PluginStateinfo from 'app/features/plugins/PluginStateInfo'; import { importDataSourcePlugin } from 'app/features/plugins/plugin_loader'; @@ -30,7 +30,7 @@ import { importDataSourcePlugin } from 'app/features/plugins/plugin_loader'; export interface Props { navModel: NavModel; dataSource: DataSourceSettings; - dataSourceMeta: Plugin; + dataSourceMeta: DataSourcePluginMeta; pageId: number; deleteDataSource: typeof deleteDataSource; loadDataSource: typeof loadDataSource; @@ -63,7 +63,7 @@ export class DataSourceSettingsPage extends PureComponent { let importedPlugin: DataSourcePlugin; try { - importedPlugin = await importDataSourcePlugin(dataSourceMeta.module); + importedPlugin = await importDataSourcePlugin(dataSourceMeta); } catch (e) { console.log('Failed to import plugin module', e); } diff --git a/public/app/features/datasources/settings/PluginSettings.tsx b/public/app/features/datasources/settings/PluginSettings.tsx index 5761af8271087..bef5b52434c18 100644 --- a/public/app/features/datasources/settings/PluginSettings.tsx +++ b/public/app/features/datasources/settings/PluginSettings.tsx @@ -1,13 +1,12 @@ import React, { PureComponent } from 'react'; import _ from 'lodash'; -import { Plugin } from 'app/types'; -import { DataSourceSettings, DataSourcePlugin } from '@grafana/ui/src/types'; +import { DataSourceSettings, DataSourcePlugin, DataSourcePluginMeta } from '@grafana/ui'; import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader'; export interface Props { plugin: DataSourcePlugin; dataSource: DataSourceSettings; - dataSourceMeta: Plugin; + dataSourceMeta: DataSourcePluginMeta; onModelChange: (dataSource: DataSourceSettings) => void; } diff --git a/public/app/features/datasources/state/actions.ts b/public/app/features/datasources/state/actions.ts index a329a781bafdc..705b28c7bcc62 100644 --- a/public/app/features/datasources/state/actions.ts +++ b/public/app/features/datasources/state/actions.ts @@ -5,8 +5,8 @@ import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; import { LayoutMode } from 'app/core/components/LayoutSelector/LayoutSelector'; import { updateLocation, updateNavIndex, UpdateNavIndexAction } from 'app/core/actions'; import { buildNavModel } from './navModel'; -import { DataSourceSettings } from '@grafana/ui/src/types'; -import { Plugin, StoreState, LocationUpdate } from 'app/types'; +import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui'; +import { StoreState, LocationUpdate } from 'app/types'; import { actionCreatorFactory } from 'app/core/redux'; import { ActionOf, noPayloadActionCreatorFactory } from 'app/core/redux/actionCreatorFactory'; import { getPluginSettings } from 'app/features/plugins/PluginSettingsCache'; @@ -15,11 +15,11 @@ export const dataSourceLoaded = actionCreatorFactory('LOAD_D export const dataSourcesLoaded = actionCreatorFactory('LOAD_DATA_SOURCES').create(); -export const dataSourceMetaLoaded = actionCreatorFactory('LOAD_DATA_SOURCE_META').create(); +export const dataSourceMetaLoaded = actionCreatorFactory('LOAD_DATA_SOURCE_META').create(); export const dataSourceTypesLoad = noPayloadActionCreatorFactory('LOAD_DATA_SOURCE_TYPES').create(); -export const dataSourceTypesLoaded = actionCreatorFactory('LOADED_DATA_SOURCE_TYPES').create(); +export const dataSourceTypesLoaded = actionCreatorFactory('LOADED_DATA_SOURCE_TYPES').create(); export const setDataSourcesSearchQuery = actionCreatorFactory('SET_DATA_SOURCES_SEARCH_QUERY').create(); @@ -35,8 +35,8 @@ export type Action = | UpdateNavIndexAction | ActionOf | ActionOf - | ActionOf - | ActionOf + | ActionOf + | ActionOf | ActionOf; type ThunkResult = ThunkAction; @@ -51,14 +51,14 @@ export function loadDataSources(): ThunkResult { export function loadDataSource(id: number): ThunkResult { return async dispatch => { const dataSource = await getBackendSrv().get(`/api/datasources/${id}`); - const pluginInfo = await getPluginSettings(dataSource.type); + const pluginInfo = (await getPluginSettings(dataSource.type)) as DataSourcePluginMeta; dispatch(dataSourceLoaded(dataSource)); dispatch(dataSourceMetaLoaded(pluginInfo)); dispatch(updateNavIndex(buildNavModel(dataSource, pluginInfo))); }; } -export function addDataSource(plugin: Plugin): ThunkResult { +export function addDataSource(plugin: DataSourcePluginMeta): ThunkResult { return async (dispatch, getStore) => { await dispatch(loadDataSources()); @@ -84,7 +84,7 @@ export function loadDataSourceTypes(): ThunkResult { return async dispatch => { dispatch(dataSourceTypesLoad()); const result = await getBackendSrv().get('/api/plugins', { enabled: 1, type: 'datasource' }); - dispatch(dataSourceTypesLoaded(result)); + dispatch(dataSourceTypesLoaded(result as DataSourcePluginMeta[])); }; } diff --git a/public/app/features/datasources/state/navModel.ts b/public/app/features/datasources/state/navModel.ts index 41f706eb97b5c..0ec10cee19e22 100644 --- a/public/app/features/datasources/state/navModel.ts +++ b/public/app/features/datasources/state/navModel.ts @@ -1,5 +1,4 @@ -import { NavModel, NavModelItem } from 'app/types'; -import { PluginMeta, DataSourceSettings, PluginType } from '@grafana/ui/src/types'; +import { PluginMeta, DataSourceSettings, PluginType, NavModel, NavModelItem } from '@grafana/ui'; import config from 'app/core/config'; export function buildNavModel(dataSource: DataSourceSettings, pluginMeta: PluginMeta): NavModelItem { diff --git a/public/app/features/datasources/state/reducers.test.ts b/public/app/features/datasources/state/reducers.test.ts index 5c396efb43cb9..cda106478a46c 100644 --- a/public/app/features/datasources/state/reducers.test.ts +++ b/public/app/features/datasources/state/reducers.test.ts @@ -14,8 +14,8 @@ import { } from './actions'; import { getMockDataSources, getMockDataSource } from '../__mocks__/dataSourcesMocks'; import { LayoutModes } from 'app/core/components/LayoutSelector/LayoutSelector'; -import { DataSourcesState, Plugin } from 'app/types'; -import { PluginMetaInfo, PluginType } from '@grafana/ui'; +import { DataSourcesState } from 'app/types'; +import { PluginMetaInfo, PluginType, PluginMeta } from '@grafana/ui'; const mockPlugin = () => ({ @@ -29,7 +29,7 @@ const mockPlugin = () => pinned: true, type: PluginType.datasource, module: 'path/to/module', - } as Plugin); + } as PluginMeta); describe('dataSourcesReducer', () => { describe('when dataSourcesLoaded is dispatched', () => { diff --git a/public/app/features/datasources/state/reducers.ts b/public/app/features/datasources/state/reducers.ts index 451e2d4650c89..3d7fae53f005b 100644 --- a/public/app/features/datasources/state/reducers.ts +++ b/public/app/features/datasources/state/reducers.ts @@ -1,5 +1,5 @@ -import { DataSourcesState, Plugin } from 'app/types'; -import { DataSourceSettings } from '@grafana/ui/src/types'; +import { DataSourcesState } from 'app/types'; +import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui'; import { dataSourceLoaded, dataSourcesLoaded, @@ -25,7 +25,7 @@ export const initialState: DataSourcesState = { dataSourceTypeSearchQuery: '', hasFetched: false, isLoadingDataSources: false, - dataSourceMeta: {} as Plugin, + dataSourceMeta: {} as DataSourcePluginMeta, }; export const dataSourcesReducer = reducerFactory(initialState) diff --git a/public/app/features/datasources/state/selectors.ts b/public/app/features/datasources/state/selectors.ts index bb95d95e59a94..c2b44076885c2 100644 --- a/public/app/features/datasources/state/selectors.ts +++ b/public/app/features/datasources/state/selectors.ts @@ -1,4 +1,4 @@ -import { DataSourceSettings } from '@grafana/ui/src/types'; +import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui/src/types'; export const getDataSources = state => { const regex = new RegExp(state.searchQuery, 'i'); @@ -23,12 +23,12 @@ export const getDataSource = (state, dataSourceId): DataSourceSettings | null => return {} as DataSourceSettings; }; -export const getDataSourceMeta = (state, type): Plugin => { +export const getDataSourceMeta = (state, type): DataSourcePluginMeta => { if (state.dataSourceMeta.id === type) { return state.dataSourceMeta; } - return {} as Plugin; + return {} as DataSourcePluginMeta; }; export const getDataSourcesSearchQuery = state => state.searchQuery; diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx index 45deefedccecc..b5863a27457ba 100644 --- a/public/app/features/explore/Explore.tsx +++ b/public/app/features/explore/Explore.tsx @@ -16,7 +16,7 @@ import GraphContainer from './GraphContainer'; import LogsContainer from './LogsContainer'; import QueryRows from './QueryRows'; import TableContainer from './TableContainer'; -import TimePicker, { parseTime } from './TimePicker'; +import TimePicker from './TimePicker'; // Actions import { @@ -31,15 +31,29 @@ import { } from './state/actions'; // Types -import { RawTimeRange, TimeRange, DataQuery, ExploreStartPageProps, ExploreDataSourceApi } from '@grafana/ui'; -import { ExploreItemState, ExploreUrlState, RangeScanner, ExploreId, ExploreUpdateState } from 'app/types/explore'; +import { RawTimeRange, DataQuery, ExploreStartPageProps, ExploreDataSourceApi } from '@grafana/ui'; +import { + ExploreItemState, + ExploreUrlState, + RangeScanner, + ExploreId, + ExploreUpdateState, + ExploreUIState, +} from 'app/types/explore'; import { StoreState } from 'app/types'; -import { LAST_USED_DATASOURCE_KEY, ensureQueries, DEFAULT_RANGE, DEFAULT_UI_STATE } from 'app/core/utils/explore'; +import { + LAST_USED_DATASOURCE_KEY, + ensureQueries, + DEFAULT_RANGE, + DEFAULT_UI_STATE, + getTimeRangeFromUrl, +} from 'app/core/utils/explore'; import { Emitter } from 'app/core/utils/emitter'; import { ExploreToolbar } from './ExploreToolbar'; import { scanStopAction } from './state/actionTypes'; import { NoDataSourceCallToAction } from './NoDataSourceCallToAction'; import { FadeIn } from 'app/core/components/Animations/FadeIn'; +import { getTimeZone } from '../profile/state/selectors'; interface ExploreProps { StartPage?: ComponentClass; @@ -53,7 +67,6 @@ interface ExploreProps { initializeExplore: typeof initializeExplore; initialized: boolean; modifyQueries: typeof modifyQueries; - range: RawTimeRange; update: ExploreUpdateState; reconnectDatasource: typeof reconnectDatasource; refreshExplore: typeof refreshExplore; @@ -69,7 +82,10 @@ interface ExploreProps { supportsLogs: boolean | null; supportsTable: boolean | null; queryKeys: string[]; - urlState: ExploreUrlState; + initialDatasource: string; + initialQueries: DataQuery[]; + initialRange: RawTimeRange; + initialUI: ExploreUIState; } /** @@ -111,12 +127,9 @@ export class Explore extends React.PureComponent { } componentDidMount() { - const { exploreId, urlState, initialized } = this.props; - const { datasource, queries, range = DEFAULT_RANGE, ui = DEFAULT_UI_STATE } = (urlState || {}) as ExploreUrlState; - const initialDatasource = datasource || store.get(LAST_USED_DATASOURCE_KEY); - const initialQueries: DataQuery[] = ensureQueries(queries); - const initialRange = { from: parseTime(range.from), to: parseTime(range.to) }; + const { initialized, exploreId, initialDatasource, initialQueries, initialRange, initialUI } = this.props; const width = this.el ? this.el.offsetWidth : 0; + // initialize the whole explore first time we mount and if browser history contains a change in datasource if (!initialized) { this.props.initializeExplore( @@ -126,7 +139,7 @@ export class Explore extends React.PureComponent { initialRange, width, this.exploreEvents, - ui + initialUI ); } } @@ -143,7 +156,7 @@ export class Explore extends React.PureComponent { this.el = el; }; - onChangeTime = (range: TimeRange, changedByScanner?: boolean) => { + onChangeTime = (range: RawTimeRange, changedByScanner?: boolean) => { if (this.props.scanning && !changedByScanner) { this.onStopScanning(); } @@ -286,6 +299,7 @@ function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) { const explore = state.explore; const { split } = explore; const item: ExploreItemState = explore[exploreId]; + const timeZone = getTimeZone(state.user); const { StartPage, datasourceError, @@ -293,7 +307,6 @@ function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) { datasourceLoading, datasourceMissing, initialized, - range, showingStartPage, supportsGraph, supportsLogs, @@ -302,6 +315,13 @@ function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) { urlState, update, } = item; + + const { datasource, queries, range: urlRange, ui } = (urlState || {}) as ExploreUrlState; + const initialDatasource = datasource || store.get(LAST_USED_DATASOURCE_KEY); + const initialQueries: DataQuery[] = ensureQueries(queries); + const initialRange = urlRange ? getTimeRangeFromUrl(urlRange, timeZone).raw : DEFAULT_RANGE; + const initialUI = ui || DEFAULT_UI_STATE; + return { StartPage, datasourceError, @@ -309,15 +329,17 @@ function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) { datasourceLoading, datasourceMissing, initialized, - range, showingStartPage, split, supportsGraph, supportsLogs, supportsTable, queryKeys, - urlState, update, + initialDatasource, + initialQueries, + initialRange, + initialUI, }; } diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx index 0ee34958f4fe1..8a9ae5c305715 100644 --- a/public/app/features/explore/ExploreToolbar.tsx +++ b/public/app/features/explore/ExploreToolbar.tsx @@ -3,7 +3,7 @@ import { connect } from 'react-redux'; import { hot } from 'react-hot-loader'; import { ExploreId } from 'app/types/explore'; -import { DataSourceSelectItem, RawTimeRange, TimeRange, ClickOutsideWrapper } from '@grafana/ui'; +import { DataSourceSelectItem, RawTimeRange, ClickOutsideWrapper, TimeZone, TimeRange } from '@grafana/ui'; import { DataSourcePicker } from 'app/core/components/Select/DataSourcePicker'; import { StoreState } from 'app/types/store'; import { @@ -15,6 +15,7 @@ import { changeRefreshInterval, } from './state/actions'; import TimePicker from './TimePicker'; +import { getTimeZone } from '../profile/state/selectors'; import { RefreshPicker, SetInterval } from '@grafana/ui'; enum IconSide { @@ -48,14 +49,15 @@ const createResponsiveButton = (options: { interface OwnProps { exploreId: ExploreId; timepickerRef: React.RefObject; - onChangeTime: (range: TimeRange, changedByScanner?: boolean) => void; + onChangeTime: (range: RawTimeRange, changedByScanner?: boolean) => void; } interface StateProps { datasourceMissing: boolean; exploreDatasources: DataSourceSelectItem[]; loading: boolean; - range: RawTimeRange; + range: TimeRange; + timeZone: TimeZone; selectedDatasource: DataSourceSelectItem; splitted: boolean; refreshInterval: string; @@ -106,6 +108,7 @@ export class UnConnectedExploreToolbar extends PureComponent { exploreId, loading, range, + timeZone, selectedDatasource, splitted, timepickerRef, @@ -159,7 +162,7 @@ export class UnConnectedExploreToolbar extends PureComponent { ) : null}
- + { const props = { size: { width: 10, height: 20 }, data: mockData().slice(0, 19), - range: { from: 'now-6h', to: 'now' }, + range: { from: 0, to: 1 }, + timeZone: DefaultTimeZone, ...propOverrides, }; diff --git a/public/app/features/explore/Graph.tsx b/public/app/features/explore/Graph.tsx index 7600d8725bc34..f9c48fc92c722 100644 --- a/public/app/features/explore/Graph.tsx +++ b/public/app/features/explore/Graph.tsx @@ -1,14 +1,12 @@ import $ from 'jquery'; import React, { PureComponent } from 'react'; -import moment from 'moment'; import 'vendor/flot/jquery.flot'; import 'vendor/flot/jquery.flot.time'; import 'vendor/flot/jquery.flot.selection'; import 'vendor/flot/jquery.flot.stack'; -import { RawTimeRange } from '@grafana/ui'; -import * as dateMath from 'app/core/utils/datemath'; +import { TimeZone, AbsoluteTimeRange } from '@grafana/ui'; import TimeSeries from 'app/core/time_series2'; import Legend from './Legend'; @@ -78,10 +76,11 @@ interface GraphProps { height?: number; width?: number; id?: string; - range: RawTimeRange; + range: AbsoluteTimeRange; + timeZone: TimeZone; split?: boolean; userOptions?: any; - onChangeTime?: (range: RawTimeRange) => void; + onChangeTime?: (range: AbsoluteTimeRange) => void; onToggleSeries?: (alias: string, hiddenSeries: Set) => void; } @@ -133,27 +132,20 @@ export class Graph extends PureComponent { } onPlotSelected = (event, ranges) => { - if (this.props.onChangeTime) { - const range = { - from: moment(ranges.xaxis.from), - to: moment(ranges.xaxis.to), - }; - this.props.onChangeTime(range); + const { onChangeTime } = this.props; + if (onChangeTime) { + this.props.onChangeTime({ + from: ranges.xaxis.from, + to: ranges.xaxis.to, + }); } }; getDynamicOptions() { - const { range, width } = this.props; + const { range, width, timeZone } = this.props; const ticks = (width || 0) / 100; - let { from, to } = range; - if (!moment.isMoment(from)) { - from = dateMath.parse(from, false); - } - if (!moment.isMoment(to)) { - to = dateMath.parse(to, true); - } - const min = from.valueOf(); - const max = to.valueOf(); + const min = range.from; + const max = range.to; return { xaxis: { mode: 'time', @@ -161,7 +153,7 @@ export class Graph extends PureComponent { max: max, label: 'Datetime', ticks: ticks, - timezone: 'browser', + timezone: timeZone.raw, timeformat: time_format(ticks, min, max), }, }; diff --git a/public/app/features/explore/GraphContainer.tsx b/public/app/features/explore/GraphContainer.tsx index 161750143d9e6..ec3f330c61610 100644 --- a/public/app/features/explore/GraphContainer.tsx +++ b/public/app/features/explore/GraphContainer.tsx @@ -1,7 +1,8 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { TimeRange, RawTimeRange } from '@grafana/ui'; +import moment from 'moment'; +import { TimeRange, TimeZone, AbsoluteTimeRange } from '@grafana/ui'; import { ExploreId, ExploreItemState } from 'app/types/explore'; import { StoreState } from 'app/types'; @@ -9,12 +10,14 @@ import { StoreState } from 'app/types'; import { toggleGraph, changeTime } from './state/actions'; import Graph from './Graph'; import Panel from './Panel'; +import { getTimeZone } from '../profile/state/selectors'; interface GraphContainerProps { exploreId: ExploreId; graphResult?: any[]; loading: boolean; - range: RawTimeRange; + range: TimeRange; + timeZone: TimeZone; showingGraph: boolean; showingTable: boolean; split: boolean; @@ -28,13 +31,20 @@ export class GraphContainer extends PureComponent { this.props.toggleGraph(this.props.exploreId, this.props.showingGraph); }; - onChangeTime = (timeRange: TimeRange) => { - this.props.changeTime(this.props.exploreId, timeRange); + onChangeTime = (absRange: AbsoluteTimeRange) => { + const { exploreId, timeZone, changeTime } = this.props; + const range = { + from: timeZone.isUtc ? moment.utc(absRange.from) : moment(absRange.from), + to: timeZone.isUtc ? moment.utc(absRange.to) : moment(absRange.to), + }; + + changeTime(exploreId, range); }; render() { - const { exploreId, graphResult, loading, showingGraph, showingTable, range, split, width } = this.props; + const { exploreId, graphResult, loading, showingGraph, showingTable, range, split, width, timeZone } = this.props; const graphHeight = showingGraph && showingTable ? 200 : 400; + const timeRange = { from: range.from.valueOf(), to: range.to.valueOf() }; if (!graphResult) { return null; @@ -47,7 +57,8 @@ export class GraphContainer extends PureComponent { height={graphHeight} id={`explore-graph-${exploreId}`} onChangeTime={this.onChangeTime} - range={range} + range={timeRange} + timeZone={timeZone} split={split} width={width} /> @@ -62,7 +73,7 @@ function mapStateToProps(state: StoreState, { exploreId }) { const item: ExploreItemState = explore[exploreId]; const { graphResult, queryTransactions, range, showingGraph, showingTable } = item; const loading = queryTransactions.some(qt => qt.resultType === 'Graph' && !qt.done); - return { graphResult, loading, range, showingGraph, showingTable, split }; + return { graphResult, loading, range, showingGraph, showingTable, split, timeZone: getTimeZone(state.user) }; } const mapDispatchToProps = { diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx index 486af10ff91b3..f67a08b31e7e6 100644 --- a/public/app/features/explore/Logs.tsx +++ b/public/app/features/explore/Logs.tsx @@ -2,7 +2,7 @@ import _ from 'lodash'; import React, { PureComponent } from 'react'; import * as rangeUtil from 'app/core/utils/rangeutil'; -import { RawTimeRange, Switch, LogLevel } from '@grafana/ui'; +import { RawTimeRange, Switch, LogLevel, TimeZone, TimeRange, AbsoluteTimeRange } from '@grafana/ui'; import TimeSeries from 'app/core/time_series2'; import { LogsDedupDescription, LogsDedupStrategy, LogsModel, LogsMetaKind } from 'app/core/logs_model'; @@ -48,12 +48,13 @@ interface Props { exploreId: string; highlighterExpressions: string[]; loading: boolean; - range?: RawTimeRange; + range: TimeRange; + timeZone: TimeZone; scanning?: boolean; scanRange?: RawTimeRange; dedupStrategy: LogsDedupStrategy; hiddenLogLevels: Set; - onChangeTime?: (range: RawTimeRange) => void; + onChangeTime?: (range: AbsoluteTimeRange) => void; onClickLabel?: (label: string, value: string) => void; onStartScanning?: () => void; onStopScanning?: () => void; @@ -156,6 +157,7 @@ export default class Logs extends PureComponent { loading = false, onClickLabel, range, + timeZone, scanning, scanRange, width, @@ -191,6 +193,10 @@ export default class Logs extends PureComponent { // React profiler becomes unusable if we pass all rows to all rows and their labels, using getter instead const getRows = () => processedRows; const timeSeries = data.series.map(series => new TimeSeries(series)); + const absRange = { + from: range.from.valueOf(), + to: range.to.valueOf(), + }; return (
@@ -199,7 +205,8 @@ export default class Logs extends PureComponent { data={timeSeries} height={100} width={width} - range={range} + range={absRange} + timeZone={timeZone} id={`explore-logs-graph-${exploreId}`} onChangeTime={this.props.onChangeTime} onToggleSeries={this.onToggleLogLevel} @@ -241,9 +248,9 @@ export default class Logs extends PureComponent {
{hasData && !deferLogs && // Only inject highlighterExpression in the first set for performance reasons - firstRows.map(row => ( + firstRows.map((row, index) => ( { {hasData && !deferLogs && renderAll && - lastRows.map(row => ( + lastRows.map((row, index) => ( void; + onChangeTime: (range: AbsoluteTimeRange) => void; onClickLabel: (key: string, value: string) => void; onStartScanning: () => void; onStopScanning: () => void; - range: RawTimeRange; + range: TimeRange; + timeZone: TimeZone; scanning?: boolean; scanRange?: RawTimeRange; showingLogs: boolean; @@ -64,6 +66,7 @@ export class LogsContainer extends PureComponent { onStartScanning, onStopScanning, range, + timeZone, showingLogs, scanning, scanRange, @@ -78,7 +81,6 @@ export class LogsContainer extends PureComponent { data={logsResult} dedupedData={dedupedResult} exploreId={exploreId} - key={logsResult && logsResult.id} highlighterExpressions={logsHighlighterExpressions} loading={loading} onChangeTime={onChangeTime} @@ -88,6 +90,7 @@ export class LogsContainer extends PureComponent { onDedupStrategyChange={this.handleDedupStrategyChange} onToggleLogLevel={this.hangleToggleLogLevel} range={range} + timeZone={timeZone} scanning={scanning} scanRange={scanRange} width={width} @@ -106,6 +109,7 @@ function mapStateToProps(state: StoreState, { exploreId }) { const { showingLogs, dedupStrategy } = exploreItemUIStateSelector(item); const hiddenLogLevels = new Set(item.hiddenLogLevels); const dedupedResult = deduplicatedLogsSelector(item); + const timeZone = getTimeZone(state.user); return { loading, @@ -115,6 +119,7 @@ function mapStateToProps(state: StoreState, { exploreId }) { scanRange, showingLogs, range, + timeZone, dedupStrategy, hiddenLogLevels, dedupedResult, diff --git a/public/app/features/explore/QueryEditor.tsx b/public/app/features/explore/QueryEditor.tsx index d158f6bb9f378..b271b0d9649b5 100644 --- a/public/app/features/explore/QueryEditor.tsx +++ b/public/app/features/explore/QueryEditor.tsx @@ -1,5 +1,6 @@ // Libraries import React, { PureComponent } from 'react'; +import moment from 'moment'; // Services import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader'; @@ -7,7 +8,7 @@ import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv'; // Types import { Emitter } from 'app/core/utils/emitter'; -import { RawTimeRange, DataQuery } from '@grafana/ui'; +import { DataQuery, TimeRange } from '@grafana/ui'; import 'app/features/plugins/plugin_loader'; interface QueryEditorProps { @@ -17,7 +18,7 @@ interface QueryEditorProps { onQueryChange?: (value: DataQuery) => void; initialQuery: DataQuery; exploreEvents: Emitter; - range: RawTimeRange; + range: TimeRange; } export default class QueryEditor extends PureComponent { @@ -62,10 +63,13 @@ export default class QueryEditor extends PureComponent { } } - initTimeSrv(range) { + initTimeSrv(range: TimeRange) { const timeSrv = getTimeSrv(); timeSrv.init({ - time: range, + time: { + from: moment(range.from), + to: moment(range.to), + }, refresh: false, getTimezone: () => 'utc', timeRangeUpdated: () => console.log('refreshDashboard!'), diff --git a/public/app/features/explore/QueryRow.tsx b/public/app/features/explore/QueryRow.tsx index ef5dda9b1da03..25c00a2b6eae2 100644 --- a/public/app/features/explore/QueryRow.tsx +++ b/public/app/features/explore/QueryRow.tsx @@ -14,14 +14,7 @@ import { changeQuery, modifyQueries, runQueries, addQueryRow } from './state/act // Types import { StoreState } from 'app/types'; -import { - RawTimeRange, - DataQuery, - ExploreDataSourceApi, - QueryHint, - QueryFixAction, - DataSourceStatus, -} from '@grafana/ui'; +import { DataQuery, ExploreDataSourceApi, QueryHint, QueryFixAction, DataSourceStatus, TimeRange } from '@grafana/ui'; import { QueryTransaction, HistoryItem, ExploreItemState, ExploreId } from 'app/types/explore'; import { Emitter } from 'app/core/utils/emitter'; import { highlightLogsExpressionAction, removeQueryRowAction } from './state/actionTypes'; @@ -48,7 +41,7 @@ interface QueryRowProps { modifyQueries: typeof modifyQueries; queryTransactions: QueryTransaction[]; exploreEvents: Emitter; - range: RawTimeRange; + range: TimeRange; removeQueryRowAction: typeof removeQueryRowAction; runQueries: typeof runQueries; } diff --git a/public/app/features/explore/TimePicker.test.tsx b/public/app/features/explore/TimePicker.test.tsx index cadcfbb668c88..09b8287673cdb 100644 --- a/public/app/features/explore/TimePicker.test.tsx +++ b/public/app/features/explore/TimePicker.test.tsx @@ -1,74 +1,238 @@ import React from 'react'; import { shallow } from 'enzyme'; import sinon from 'sinon'; +import moment from 'moment'; +import * as dateMath from 'app/core/utils/datemath'; import * as rangeUtil from 'app/core/utils/rangeutil'; -import TimePicker, { DEFAULT_RANGE, parseTime } from './TimePicker'; +import TimePicker from './TimePicker'; +import { RawTimeRange, TimeRange, TIME_FORMAT } from '@grafana/ui'; + +const DEFAULT_RANGE = { + from: 'now-6h', + to: 'now', +}; + +const fromRaw = (rawRange: RawTimeRange): TimeRange => { + const raw = { + from: moment.isMoment(rawRange.from) ? moment(rawRange.from) : rawRange.from, + to: moment.isMoment(rawRange.to) ? moment(rawRange.to) : rawRange.to, + }; + + return { + from: dateMath.parse(raw.from, false), + to: dateMath.parse(raw.to, true), + raw: rawRange, + }; +}; describe('', () => { - it('renders closed with default values', () => { - const rangeString = rangeUtil.describeTimeRange(DEFAULT_RANGE); - const wrapper = shallow(); - expect(wrapper.find('.timepicker-rangestring').text()).toBe(rangeString); - expect(wrapper.find('.gf-timepicker-dropdown').exists()).toBe(false); + it('render default values when closed and relative time range', () => { + const range = fromRaw(DEFAULT_RANGE); + const wrapper = shallow(); + expect(wrapper.state('fromRaw')).toBe(DEFAULT_RANGE.from); + expect(wrapper.state('toRaw')).toBe(DEFAULT_RANGE.to); + expect(wrapper.find('.timepicker-rangestring').text()).toBe('Last 6 hours'); + expect(wrapper.find('.gf-timepicker-dropdown').exists()).toBeFalsy(); + expect(wrapper.find('.gf-timepicker-utc').exists()).toBeFalsy(); + }); + + it('render default values when closed, utc and relative time range', () => { + const range = fromRaw(DEFAULT_RANGE); + const wrapper = shallow(); + expect(wrapper.state('fromRaw')).toBe(DEFAULT_RANGE.from); + expect(wrapper.state('toRaw')).toBe(DEFAULT_RANGE.to); + expect(wrapper.find('.timepicker-rangestring').text()).toBe('Last 6 hours'); + expect(wrapper.find('.gf-timepicker-dropdown').exists()).toBeFalsy(); + expect(wrapper.find('.gf-timepicker-utc').exists()).toBeTruthy(); + }); + + it('renders default values when open and relative range', () => { + const range = fromRaw(DEFAULT_RANGE); + const wrapper = shallow(); + expect(wrapper.state('fromRaw')).toBe(DEFAULT_RANGE.from); + expect(wrapper.state('toRaw')).toBe(DEFAULT_RANGE.to); + expect(wrapper.find('.timepicker-rangestring').text()).toBe('Last 6 hours'); + expect(wrapper.find('.gf-timepicker-dropdown').exists()).toBeTruthy(); + expect(wrapper.find('.gf-timepicker-utc').exists()).toBeFalsy(); + expect(wrapper.find('.timepicker-from').props().value).toBe(DEFAULT_RANGE.from); + expect(wrapper.find('.timepicker-to').props().value).toBe(DEFAULT_RANGE.to); + }); + + it('renders default values when open, utc and relative range', () => { + const range = fromRaw(DEFAULT_RANGE); + const wrapper = shallow(); + expect(wrapper.state('fromRaw')).toBe(DEFAULT_RANGE.from); + expect(wrapper.state('toRaw')).toBe(DEFAULT_RANGE.to); + expect(wrapper.find('.timepicker-rangestring').text()).toBe('Last 6 hours'); + expect(wrapper.find('.gf-timepicker-dropdown').exists()).toBeTruthy(); + expect(wrapper.find('.gf-timepicker-utc').exists()).toBeTruthy(); + expect(wrapper.find('.timepicker-from').props().value).toBe(DEFAULT_RANGE.from); + expect(wrapper.find('.timepicker-to').props().value).toBe(DEFAULT_RANGE.to); }); - it('renders with relative range', () => { + it('apply with absolute range and non-utc', () => { const range = { - from: 'now-7h', - to: 'now', + from: moment.utc(1), + to: moment.utc(1000), + raw: { + from: moment.utc(1), + to: moment.utc(1000), + }, }; - const rangeString = rangeUtil.describeTimeRange(range); - const wrapper = shallow(); - expect(wrapper.find('.timepicker-rangestring').text()).toBe(rangeString); - expect(wrapper.state('fromRaw')).toBe(range.from); - expect(wrapper.state('toRaw')).toBe(range.to); - expect(wrapper.find('.timepicker-from').props().value).toBe(range.from); - expect(wrapper.find('.timepicker-to').props().value).toBe(range.to); + const localRange = { + from: moment(1), + to: moment(1000), + raw: { + from: moment(1), + to: moment(1000), + }, + }; + const expectedRangeString = rangeUtil.describeTimeRange(localRange); + + const onChangeTime = sinon.spy(); + const wrapper = shallow(); + expect(wrapper.state('fromRaw')).toBe(localRange.from.format(TIME_FORMAT)); + expect(wrapper.state('toRaw')).toBe(localRange.to.format(TIME_FORMAT)); + expect(wrapper.state('initialRange')).toBe(range.raw); + expect(wrapper.find('.timepicker-rangestring').text()).toBe(expectedRangeString); + expect(wrapper.find('.timepicker-from').props().value).toBe(localRange.from.format(TIME_FORMAT)); + expect(wrapper.find('.timepicker-to').props().value).toBe(localRange.to.format(TIME_FORMAT)); + + wrapper.find('button.gf-form-btn').simulate('click'); + expect(onChangeTime.calledOnce).toBeTruthy(); + expect(onChangeTime.getCall(0).args[0].from.valueOf()).toBe(0); + expect(onChangeTime.getCall(0).args[0].to.valueOf()).toBe(1000); + + expect(wrapper.state('isOpen')).toBeFalsy(); + expect(wrapper.state('rangeString')).toBe(expectedRangeString); }); - it('renders with epoch (millies) range converted to ISO-ish', () => { + it('apply with absolute range and utc', () => { const range = { - from: '1', - to: '1000', + from: moment.utc(1), + to: moment.utc(1000), + raw: { + from: moment.utc(1), + to: moment.utc(1000), + }, }; - const rangeString = rangeUtil.describeTimeRange({ - from: parseTime(range.from, true), - to: parseTime(range.to, true), - }); - const wrapper = shallow(); + const onChangeTime = sinon.spy(); + const wrapper = shallow(); expect(wrapper.state('fromRaw')).toBe('1970-01-01 00:00:00'); expect(wrapper.state('toRaw')).toBe('1970-01-01 00:00:01'); - expect(wrapper.find('.timepicker-rangestring').text()).toBe(rangeString); + expect(wrapper.state('initialRange')).toBe(range.raw); + expect(wrapper.find('.timepicker-rangestring').text()).toBe('Jan 1, 1970 00:00:00 to Jan 1, 1970 00:00:01'); expect(wrapper.find('.timepicker-from').props().value).toBe('1970-01-01 00:00:00'); expect(wrapper.find('.timepicker-to').props().value).toBe('1970-01-01 00:00:01'); + + wrapper.find('button.gf-form-btn').simulate('click'); + expect(onChangeTime.calledOnce).toBeTruthy(); + expect(onChangeTime.getCall(0).args[0].from.valueOf()).toBe(0); + expect(onChangeTime.getCall(0).args[0].to.valueOf()).toBe(1000); + + expect(wrapper.state('isOpen')).toBeFalsy(); + expect(wrapper.state('rangeString')).toBe('Jan 1, 1970 00:00:00 to Jan 1, 1970 00:00:01'); }); - it('moves ranges forward and backward by half the range on arrow click', () => { - const range = { - from: '2000', - to: '4000', + it('moves ranges backward by half the range on left arrow click when utc', () => { + const rawRange = { + from: moment.utc(2000), + to: moment.utc(4000), + raw: { + from: moment.utc(2000), + to: moment.utc(4000), + }, }; - const rangeString = rangeUtil.describeTimeRange({ - from: parseTime(range.from, true), - to: parseTime(range.to, true), - }); + const range = fromRaw(rawRange); const onChangeTime = sinon.spy(); const wrapper = shallow(); expect(wrapper.state('fromRaw')).toBe('1970-01-01 00:00:02'); expect(wrapper.state('toRaw')).toBe('1970-01-01 00:00:04'); - expect(wrapper.find('.timepicker-rangestring').text()).toBe(rangeString); - expect(wrapper.find('.timepicker-from').props().value).toBe('1970-01-01 00:00:02'); - expect(wrapper.find('.timepicker-to').props().value).toBe('1970-01-01 00:00:04'); wrapper.find('.timepicker-left').simulate('click'); - expect(onChangeTime.calledOnce).toBe(true); + expect(onChangeTime.calledOnce).toBeTruthy(); + expect(onChangeTime.getCall(0).args[0].from.valueOf()).toBe(1000); + expect(onChangeTime.getCall(0).args[0].to.valueOf()).toBe(3000); + }); + + it('moves ranges backward by half the range on left arrow click when not utc', () => { + const range = { + from: moment.utc(2000), + to: moment.utc(4000), + raw: { + from: moment.utc(2000), + to: moment.utc(4000), + }, + }; + const localRange = { + from: moment(2000), + to: moment(4000), + raw: { + from: moment(2000), + to: moment(4000), + }, + }; + + const onChangeTime = sinon.spy(); + const wrapper = shallow(); + expect(wrapper.state('fromRaw')).toBe(localRange.from.format(TIME_FORMAT)); + expect(wrapper.state('toRaw')).toBe(localRange.to.format(TIME_FORMAT)); + + wrapper.find('.timepicker-left').simulate('click'); + expect(onChangeTime.calledOnce).toBeTruthy(); + expect(onChangeTime.getCall(0).args[0].from.valueOf()).toBe(1000); + expect(onChangeTime.getCall(0).args[0].to.valueOf()).toBe(3000); + }); + + it('moves ranges forward by half the range on right arrow click when utc', () => { + const range = { + from: moment.utc(1000), + to: moment.utc(3000), + raw: { + from: moment.utc(1000), + to: moment.utc(3000), + }, + }; + + const onChangeTime = sinon.spy(); + const wrapper = shallow(); expect(wrapper.state('fromRaw')).toBe('1970-01-01 00:00:01'); expect(wrapper.state('toRaw')).toBe('1970-01-01 00:00:03'); wrapper.find('.timepicker-right').simulate('click'); - expect(wrapper.state('fromRaw')).toBe('1970-01-01 00:00:02'); - expect(wrapper.state('toRaw')).toBe('1970-01-01 00:00:04'); + expect(onChangeTime.calledOnce).toBeTruthy(); + expect(onChangeTime.getCall(0).args[0].from.valueOf()).toBe(2000); + expect(onChangeTime.getCall(0).args[0].to.valueOf()).toBe(4000); + }); + + it('moves ranges forward by half the range on right arrow click when not utc', () => { + const range = { + from: moment.utc(1000), + to: moment.utc(3000), + raw: { + from: moment.utc(1000), + to: moment.utc(3000), + }, + }; + const localRange = { + from: moment(1000), + to: moment(3000), + raw: { + from: moment(1000), + to: moment(3000), + }, + }; + + const onChangeTime = sinon.spy(); + const wrapper = shallow(); + expect(wrapper.state('fromRaw')).toBe(localRange.from.format(TIME_FORMAT)); + expect(wrapper.state('toRaw')).toBe(localRange.to.format(TIME_FORMAT)); + + wrapper.find('.timepicker-right').simulate('click'); + expect(onChangeTime.calledOnce).toBeTruthy(); + expect(onChangeTime.getCall(0).args[0].from.valueOf()).toBe(2000); + expect(onChangeTime.getCall(0).args[0].to.valueOf()).toBe(4000); }); }); diff --git a/public/app/features/explore/TimePicker.tsx b/public/app/features/explore/TimePicker.tsx index 27e1afe43645a..b5b0ef09d6469 100644 --- a/public/app/features/explore/TimePicker.tsx +++ b/public/app/features/explore/TimePicker.tsx @@ -1,43 +1,12 @@ import React, { PureComponent } from 'react'; import moment from 'moment'; - -import * as dateMath from 'app/core/utils/datemath'; import * as rangeUtil from 'app/core/utils/rangeutil'; -import { Input, RawTimeRange, TimeRange } from '@grafana/ui'; - -const DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss'; -export const DEFAULT_RANGE = { - from: 'now-6h', - to: 'now', -}; - -/** - * Return a human-editable string of either relative (inludes "now") or absolute local time (in the shape of DATE_FORMAT). - * @param value Epoch or relative time - */ -export function parseTime(value: string | moment.Moment, isUtc = false, ensureString = false): string | moment.Moment { - if (moment.isMoment(value)) { - if (ensureString) { - return value.format(DATE_FORMAT); - } - return value; - } - if ((value as string).indexOf('now') !== -1) { - return value; - } - let time: any = value; - // Possible epoch - if (!isNaN(time)) { - time = parseInt(time, 10); - } - time = isUtc ? moment.utc(time) : moment(time); - return time.format(DATE_FORMAT); -} +import { Input, RawTimeRange, TimeRange, TIME_FORMAT } from '@grafana/ui'; interface TimePickerProps { isOpen?: boolean; isUtc?: boolean; - range?: RawTimeRange; + range: TimeRange; onChangeTime?: (range: RawTimeRange, scanning?: boolean) => void; } @@ -46,17 +15,40 @@ interface TimePickerState { isUtc: boolean; rangeString: string; refreshInterval?: string; - initialRange?: RawTimeRange; + initialRange: RawTimeRange; // Input-controlled text, keep these in a shape that is human-editable fromRaw: string; toRaw: string; } +const getRaw = (isUtc: boolean, range: any) => { + const rawRange = { + from: range.raw.from, + to: range.raw.to, + }; + + if (moment.isMoment(rawRange.from)) { + if (!isUtc) { + rawRange.from = rawRange.from.local(); + } + rawRange.from = rawRange.from.format(TIME_FORMAT); + } + + if (moment.isMoment(rawRange.to)) { + if (!isUtc) { + rawRange.to = rawRange.to.local(); + } + rawRange.to = rawRange.to.format(TIME_FORMAT); + } + + return rawRange; +}; + /** * TimePicker with dropdown menu for relative dates. * - * Initialize with a range that is either based on relative time strings, + * Initialize with a range that is either based on relative rawRange.strings, * or on Moment objects. * Internally the component needs to keep a string representation in `fromRaw` * and `toRaw` for the controlled inputs. @@ -69,89 +61,68 @@ export default class TimePicker extends PureComponent Date.now() && to.valueOf() < Date.now()) { - nextTo = Date.now(); - nextFrom = from.valueOf(); - } + to = range.to.valueOf() + timespan; + from = range.from.valueOf() + timespan; } else { - nextTo = to.valueOf(); - nextFrom = from.valueOf(); + to = range.to.valueOf(); + from = range.from.valueOf(); } - const nextRange = { - from: moment(nextFrom), - to: moment(nextTo), + const nextTimeRange = { + from: this.props.isUtc ? moment.utc(from) : moment(from), + to: this.props.isUtc ? moment.utc(to) : moment(to), }; - - const nextTimeRange: TimeRange = { - raw: nextRange, - from: nextRange.from, - to: nextRange.to, - }; - - this.setState( - { - rangeString: rangeUtil.describeTimeRange(nextRange), - fromRaw: nextRange.from.format(DATE_FORMAT), - toRaw: nextRange.to.format(DATE_FORMAT), - }, - () => { - onChangeTime(nextTimeRange, scanning); - } - ); - - return nextRange; + if (onChangeTime) { + onChangeTime(nextTimeRange); + } + return nextTimeRange; } handleChangeFrom = e => { @@ -167,16 +138,25 @@ export default class TimePicker extends PureComponent { - const { onChangeTime } = this.props; - let range; + const { onChangeTime, isUtc } = this.props; + let rawRange; this.setState( state => { const { toRaw, fromRaw } = this.state; - range = { - from: dateMath.parse(fromRaw, false), - to: dateMath.parse(toRaw, true), + rawRange = { + from: fromRaw, + to: toRaw, }; - const rangeString = rangeUtil.describeTimeRange(range); + + if (rawRange.from.indexOf('now') === -1) { + rawRange.from = isUtc ? moment.utc(rawRange.from, TIME_FORMAT) : moment(rawRange.from, TIME_FORMAT); + } + + if (rawRange.to.indexOf('now') === -1) { + rawRange.to = isUtc ? moment.utc(rawRange.to, TIME_FORMAT) : moment(rawRange.to, TIME_FORMAT); + } + + const rangeString = rangeUtil.describeTimeRange(rawRange); return { isOpen: false, rangeString, @@ -184,7 +164,7 @@ export default class TimePicker extends PureComponent { if (onChangeTime) { - onChangeTime(range); + onChangeTime(rawRange); } } ); @@ -201,16 +181,20 @@ export default class TimePicker extends PureComponent { const { onChangeTime } = this.props; const rangeString = rangeUtil.describeTimeRange(range); + const rawRange = { + from: range.from, + to: range.to, + }; this.setState( { - toRaw: range.to, - fromRaw: range.from, + toRaw: rawRange.to, + fromRaw: rawRange.from, isOpen: false, rangeString, }, () => { if (onChangeTime) { - onChangeTime(range); + onChangeTime(rawRange); } } ); diff --git a/public/app/features/explore/state/actionTypes.ts b/public/app/features/explore/state/actionTypes.ts index ccbf9426ca7a4..aec004286a8e4 100644 --- a/public/app/features/explore/state/actionTypes.ts +++ b/public/app/features/explore/state/actionTypes.ts @@ -2,12 +2,12 @@ import { Emitter } from 'app/core/core'; import { RawTimeRange, - TimeRange, DataQuery, DataSourceSelectItem, DataSourceApi, QueryFixAction, LogLevel, + TimeRange, } from '@grafana/ui/src/types'; import { ExploreId, @@ -89,7 +89,7 @@ export interface InitializeExplorePayload { containerWidth: number; eventBridge: Emitter; queries: DataQuery[]; - range: RawTimeRange; + range: TimeRange; ui: ExploreUIState; } diff --git a/public/app/features/explore/state/actions.test.ts b/public/app/features/explore/state/actions.test.ts index f0165f7269cea..64aaa9b634268 100644 --- a/public/app/features/explore/state/actions.test.ts +++ b/public/app/features/explore/state/actions.test.ts @@ -1,3 +1,4 @@ +import moment from 'moment'; import { refreshExplore, testDatasource, loadDatasource } from './actions'; import { ExploreId, ExploreUrlState, ExploreUpdateState } from 'app/types'; import { thunkTester } from 'test/core/thunk/thunkTester'; @@ -18,6 +19,7 @@ import { Emitter } from 'app/core/core'; import { ActionOf } from 'app/core/redux/actionCreatorFactory'; import { makeInitialUpdateState } from './reducers'; import { DataQuery } from '@grafana/ui/src/types/datasource'; +import { DefaultTimeZone, RawTimeRange } from '@grafana/ui'; jest.mock('app/features/plugins/datasource_srv', () => ({ getDatasourceSrv: () => ({ @@ -29,21 +31,39 @@ jest.mock('app/features/plugins/datasource_srv', () => ({ }), })); +const t = moment.utc(); +const testRange = { + from: t, + to: t, + raw: { + from: t, + to: t, + }, +}; +jest.mock('app/core/utils/explore', () => ({ + ...jest.requireActual('app/core/utils/explore'), + getTimeRangeFromUrl: (range: RawTimeRange) => testRange, +})); + const setup = (updateOverides?: Partial) => { const exploreId = ExploreId.left; const containerWidth = 1920; const eventBridge = {} as Emitter; const ui = { dedupStrategy: LogsDedupStrategy.none, showingGraph: false, showingLogs: false, showingTable: false }; - const range = { from: 'now', to: 'now' }; + const timeZone = DefaultTimeZone; + const range = testRange; const urlState: ExploreUrlState = { datasource: 'some-datasource', queries: [], - range, + range: range.raw, ui, }; const updateDefaults = makeInitialUpdateState(); const update = { ...updateDefaults, ...updateOverides }; const initialState = { + user: { + timeZone, + }, explore: { [exploreId]: { initialized: true, @@ -77,7 +97,7 @@ describe('refreshExplore', () => { describe('when explore is initialized', () => { describe('and update datasource is set', () => { it('then it should dispatch initializeExplore', async () => { - const { exploreId, ui, range, initialState, containerWidth, eventBridge } = setup({ datasource: true }); + const { exploreId, ui, initialState, containerWidth, eventBridge } = setup({ datasource: true }); const dispatchedActions = await thunkTester(initialState) .givenThunk(refreshExplore) @@ -90,7 +110,10 @@ describe('refreshExplore', () => { expect(payload.containerWidth).toEqual(containerWidth); expect(payload.eventBridge).toEqual(eventBridge); expect(payload.queries.length).toBe(1); // Queries have generated keys hard to expect on - expect(payload.range).toEqual(range); + expect(payload.range.from).toEqual(testRange.from); + expect(payload.range.to).toEqual(testRange.to); + expect(payload.range.raw.from).toEqual(testRange.raw.from); + expect(payload.range.raw.to).toEqual(testRange.raw.to); expect(payload.ui).toEqual(ui); }); }); diff --git a/public/app/features/explore/state/actions.ts b/public/app/features/explore/state/actions.ts index 5657d38ca1ea9..0a43072515510 100644 --- a/public/app/features/explore/state/actions.ts +++ b/public/app/features/explore/state/actions.ts @@ -1,5 +1,6 @@ // Libraries import _ from 'lodash'; +import moment from 'moment'; // Services & Utils import store from 'app/core/store'; @@ -16,6 +17,8 @@ import { buildQueryTransaction, serializeStateToUrlParam, parseUrlState, + getTimeRange, + getTimeRangeFromUrl, } from 'app/core/utils/explore'; // Actions @@ -26,12 +29,12 @@ import { ResultGetter } from 'app/types/explore'; import { ThunkResult } from 'app/types'; import { RawTimeRange, - TimeRange, DataSourceApi, DataQuery, DataSourceSelectItem, QueryHint, QueryFixAction, + TimeRange, } from '@grafana/ui/src/types'; import { ExploreId, @@ -83,7 +86,7 @@ import { } from './actionTypes'; import { ActionOf, ActionCreator } from 'app/core/redux/actionCreatorFactory'; import { LogsDedupStrategy } from 'app/core/logs_model'; -import { parseTime } from '../TimePicker'; +import { getTimeZone } from 'app/features/profile/state/selectors'; /** * Updates UI state and save it to the URL @@ -169,8 +172,10 @@ export function changeSize( /** * Change the time range of Explore. Usually called from the Time picker or a graph interaction. */ -export function changeTime(exploreId: ExploreId, range: TimeRange): ThunkResult { - return dispatch => { +export function changeTime(exploreId: ExploreId, rawRange: RawTimeRange): ThunkResult { + return (dispatch, getState) => { + const timeZone = getTimeZone(getState().user); + const range = getTimeRange(timeZone, rawRange); dispatch(changeTimeAction({ exploreId, range })); dispatch(runQueries(exploreId)); }; @@ -235,12 +240,14 @@ export function initializeExplore( exploreId: ExploreId, datasourceName: string, queries: DataQuery[], - range: RawTimeRange, + rawRange: RawTimeRange, containerWidth: number, eventBridge: Emitter, ui: ExploreUIState ): ThunkResult { - return async dispatch => { + return async (dispatch, getState) => { + const timeZone = getTimeZone(getState().user); + const range = getTimeRange(timeZone, rawRange); dispatch(loadExploreDatasourcesAndSetDatasource(exploreId, datasourceName)); dispatch( initializeExploreAction({ @@ -723,6 +730,23 @@ export function splitOpen(): ThunkResult { }; } +const toRawTimeRange = (range: TimeRange): RawTimeRange => { + let from = range.raw.from; + if (moment.isMoment(from)) { + from = from.valueOf().toString(10); + } + + let to = range.raw.to; + if (moment.isMoment(to)) { + to = to.valueOf().toString(10); + } + + return { + from, + to, + }; +}; + /** * Saves Explore state to URL using the `left` and `right` parameters. * If split view is not active, `right` will not be set. @@ -734,7 +758,7 @@ export function stateSave(): ThunkResult { const leftUrlState: ExploreUrlState = { datasource: left.datasourceInstance.name, queries: left.queries.map(clearQueryKeys), - range: left.range, + range: toRawTimeRange(left.range), ui: { showingGraph: left.showingGraph, showingLogs: left.showingLogs, @@ -747,7 +771,7 @@ export function stateSave(): ThunkResult { const rightUrlState: ExploreUrlState = { datasource: right.datasourceInstance.name, queries: right.queries.map(clearQueryKeys), - range: right.range, + range: toRawTimeRange(right.range), ui: { showingGraph: right.showingGraph, showingLogs: right.showingLogs, @@ -830,19 +854,20 @@ export function refreshExplore(exploreId: ExploreId): ThunkResult { } const { urlState, update, containerWidth, eventBridge } = itemState; - const { datasource, queries, range, ui } = urlState; + const { datasource, queries, range: urlRange, ui } = urlState; const refreshQueries = queries.map(q => ({ ...q, ...generateEmptyQuery(itemState.queries) })); - const refreshRange = { from: parseTime(range.from), to: parseTime(range.to) }; + const timeZone = getTimeZone(getState().user); + const range = getTimeRangeFromUrl(urlRange, timeZone); + // need to refresh datasource if (update.datasource) { const initialQueries = ensureQueries(queries); - const initialRange = { from: parseTime(range.from), to: parseTime(range.to) }; - dispatch(initializeExplore(exploreId, datasource, initialQueries, initialRange, containerWidth, eventBridge, ui)); + dispatch(initializeExplore(exploreId, datasource, initialQueries, range, containerWidth, eventBridge, ui)); return; } if (update.range) { - dispatch(changeTimeAction({ exploreId, range: refreshRange as TimeRange })); + dispatch(changeTimeAction({ exploreId, range })); } // need to refresh ui state diff --git a/public/app/features/explore/state/reducers.ts b/public/app/features/explore/state/reducers.ts index 9ae21076ff00b..c63b5fe4a1cf8 100644 --- a/public/app/features/explore/state/reducers.ts +++ b/public/app/features/explore/state/reducers.ts @@ -86,7 +86,11 @@ export const makeExploreItemState = (): ExploreItemState => ({ initialized: false, queryTransactions: [], queryIntervals: { interval: '15s', intervalMs: DEFAULT_GRAPH_INTERVAL }, - range: DEFAULT_RANGE, + range: { + from: null, + to: null, + raw: DEFAULT_RANGE, + }, scanning: false, scanRange: null, showingGraph: true, diff --git a/public/app/features/folders/FolderPermissions.tsx b/public/app/features/folders/FolderPermissions.tsx index 705bb8f7848a7..0f9670efd967c 100644 --- a/public/app/features/folders/FolderPermissions.tsx +++ b/public/app/features/folders/FolderPermissions.tsx @@ -2,10 +2,10 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; import Page from 'app/core/components/Page/Page'; -import { Tooltip } from '@grafana/ui'; +import { Tooltip, NavModel } from '@grafana/ui'; import { SlideDown } from 'app/core/components/Animations/SlideDown'; import { getNavModel } from 'app/core/selectors/navModel'; -import { NavModel, StoreState, FolderState } from 'app/types'; +import { StoreState, FolderState } from 'app/types'; import { DashboardAcl, PermissionLevel, NewDashboardAclItem } from 'app/types/acl'; import { getFolderByUid, diff --git a/public/app/features/folders/FolderSettingsPage.test.tsx b/public/app/features/folders/FolderSettingsPage.test.tsx index 5d889ea59c4af..4f56c44fae7d4 100644 --- a/public/app/features/folders/FolderSettingsPage.test.tsx +++ b/public/app/features/folders/FolderSettingsPage.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { FolderSettingsPage, Props } from './FolderSettingsPage'; -import { NavModel } from 'app/types'; import { shallow } from 'enzyme'; +import { NavModel } from '@grafana/ui'; const setup = (propOverrides?: object) => { const props: Props = { diff --git a/public/app/features/folders/FolderSettingsPage.tsx b/public/app/features/folders/FolderSettingsPage.tsx index 1be6139e6b21d..5ca647cdd5aaa 100644 --- a/public/app/features/folders/FolderSettingsPage.tsx +++ b/public/app/features/folders/FolderSettingsPage.tsx @@ -1,11 +1,11 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { Input } from '@grafana/ui'; +import { Input, NavModel } from '@grafana/ui'; import Page from 'app/core/components/Page/Page'; import appEvents from 'app/core/app_events'; import { getNavModel } from 'app/core/selectors/navModel'; -import { NavModel, StoreState, FolderState } from 'app/types'; +import { StoreState, FolderState } from 'app/types'; import { getFolderByUid, setFolderTitle, saveFolder, deleteFolder } from './state/actions'; import { getLoadingNav } from './state/navModel'; diff --git a/public/app/features/folders/state/navModel.ts b/public/app/features/folders/state/navModel.ts index 345201f353a97..480f40dad5f18 100644 --- a/public/app/features/folders/state/navModel.ts +++ b/public/app/features/folders/state/navModel.ts @@ -1,4 +1,5 @@ -import { FolderDTO, NavModelItem, NavModel } from 'app/types'; +import { FolderDTO } from 'app/types'; +import { NavModelItem, NavModel } from '@grafana/ui'; export function buildNavModel(folder: FolderDTO): NavModelItem { return { diff --git a/public/app/features/org/OrgDetailsPage.test.tsx b/public/app/features/org/OrgDetailsPage.test.tsx index e7c2b65163291..71c059593c744 100644 --- a/public/app/features/org/OrgDetailsPage.test.tsx +++ b/public/app/features/org/OrgDetailsPage.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; import { shallow } from 'enzyme'; import { OrgDetailsPage, Props } from './OrgDetailsPage'; -import { NavModel, Organization } from '../../types'; +import { Organization } from '../../types'; +import { NavModel } from '@grafana/ui'; const setup = (propOverrides?: object) => { const props: Props = { diff --git a/public/app/features/org/OrgDetailsPage.tsx b/public/app/features/org/OrgDetailsPage.tsx index d1bcfbc926876..853af49977a41 100644 --- a/public/app/features/org/OrgDetailsPage.tsx +++ b/public/app/features/org/OrgDetailsPage.tsx @@ -5,8 +5,9 @@ import Page from 'app/core/components/Page/Page'; import OrgProfile from './OrgProfile'; import SharedPreferences from 'app/core/components/SharedPreferences/SharedPreferences'; import { loadOrganization, setOrganizationName, updateOrganization } from './state/actions'; -import { NavModel, Organization, StoreState } from 'app/types'; +import { Organization, StoreState } from 'app/types'; import { getNavModel } from 'app/core/selectors/navModel'; +import { NavModel } from '@grafana/ui'; export interface Props { navModel: NavModel; diff --git a/public/app/features/plugins/PluginList.tsx b/public/app/features/plugins/PluginList.tsx index bf970c373921b..eb630b34a727f 100644 --- a/public/app/features/plugins/PluginList.tsx +++ b/public/app/features/plugins/PluginList.tsx @@ -1,11 +1,11 @@ import React, { FC } from 'react'; import classNames from 'classnames'; import PluginListItem from './PluginListItem'; -import { Plugin } from 'app/types'; +import { PluginMeta } from '@grafana/ui'; import { LayoutMode, LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector'; interface Props { - plugins: Plugin[]; + plugins: PluginMeta[]; layoutMode: LayoutMode; } diff --git a/public/app/features/plugins/PluginListItem.tsx b/public/app/features/plugins/PluginListItem.tsx index fa6e46c784570..a5b22c25d74a4 100644 --- a/public/app/features/plugins/PluginListItem.tsx +++ b/public/app/features/plugins/PluginListItem.tsx @@ -1,8 +1,8 @@ import React, { FC } from 'react'; -import { Plugin } from 'app/types'; +import { PluginMeta } from '@grafana/ui'; interface Props { - plugin: Plugin; + plugin: PluginMeta; } const PluginListItem: FC = props => { diff --git a/public/app/features/plugins/PluginListPage.test.tsx b/public/app/features/plugins/PluginListPage.test.tsx index 01c7f338cd545..10617d4c0bd95 100644 --- a/public/app/features/plugins/PluginListPage.test.tsx +++ b/public/app/features/plugins/PluginListPage.test.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { shallow } from 'enzyme'; import { PluginListPage, Props } from './PluginListPage'; -import { NavModel, Plugin } from '../../types'; import { LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector'; +import { PluginMeta, NavModel } from '@grafana/ui'; const setup = (propOverrides?: object) => { const props: Props = { @@ -14,7 +14,7 @@ const setup = (propOverrides?: object) => { text: 'Plugins', }, } as NavModel, - plugins: [] as Plugin[], + plugins: [] as PluginMeta[], searchQuery: '', setPluginsSearchQuery: jest.fn(), setPluginsLayoutMode: jest.fn(), diff --git a/public/app/features/plugins/PluginListPage.tsx b/public/app/features/plugins/PluginListPage.tsx index cf8969f291f21..03d383fdec0ca 100644 --- a/public/app/features/plugins/PluginListPage.tsx +++ b/public/app/features/plugins/PluginListPage.tsx @@ -4,15 +4,15 @@ import { connect } from 'react-redux'; import Page from 'app/core/components/Page/Page'; import OrgActionBar from 'app/core/components/OrgActionBar/OrgActionBar'; import PluginList from './PluginList'; -import { NavModel, Plugin } from 'app/types'; import { loadPlugins, setPluginsLayoutMode, setPluginsSearchQuery } from './state/actions'; import { getNavModel } from 'app/core/selectors/navModel'; import { getLayoutMode, getPlugins, getPluginsSearchQuery } from './state/selectors'; import { LayoutMode } from 'app/core/components/LayoutSelector/LayoutSelector'; +import { PluginMeta, NavModel } from '@grafana/ui'; export interface Props { navModel: NavModel; - plugins: Plugin[]; + plugins: PluginMeta[]; layoutMode: LayoutMode; searchQuery: string; hasFetched: boolean; diff --git a/public/app/features/plugins/PluginSettingsCache.ts b/public/app/features/plugins/PluginSettingsCache.ts index 21161c5cacfa9..4187e757dc996 100644 --- a/public/app/features/plugins/PluginSettingsCache.ts +++ b/public/app/features/plugins/PluginSettingsCache.ts @@ -1,13 +1,13 @@ import { getBackendSrv } from 'app/core/services/backend_srv'; -import { Plugin } from 'app/types'; +import { PluginMeta } from '@grafana/ui'; type PluginCache = { - [key: string]: Plugin; + [key: string]: PluginMeta; }; const pluginInfoCache: PluginCache = {}; -export function getPluginSettings(pluginId: string): Promise { +export function getPluginSettings(pluginId: string): Promise { const v = pluginInfoCache[pluginId]; if (v) { return Promise.resolve(v); diff --git a/public/app/features/plugins/__mocks__/pluginMocks.ts b/public/app/features/plugins/__mocks__/pluginMocks.ts index 089a39ff4953b..7106af6f0710d 100644 --- a/public/app/features/plugins/__mocks__/pluginMocks.ts +++ b/public/app/features/plugins/__mocks__/pluginMocks.ts @@ -1,7 +1,7 @@ -import { Plugin, PanelPluginMeta, PanelDataFormat } from 'app/types'; -import { PluginType } from '@grafana/ui'; +import { PanelPluginMeta, PluginMeta, PluginType, PanelDataFormat, PanelPlugin, PanelProps } from '@grafana/ui'; +import { ComponentType } from 'enzyme'; -export const getMockPlugins = (amount: number): Plugin[] => { +export const getMockPlugins = (amount: number): PluginMeta[] => { const plugins = []; for (let i = 0; i <= amount; i++) { @@ -34,8 +34,14 @@ export const getMockPlugins = (amount: number): Plugin[] => { return plugins; }; -export const getPanelPlugin = (options: Partial): PanelPluginMeta => { - return { +export const getPanelPlugin = ( + options: Partial, + reactPanel?: ComponentType, + angularPanel?: any +): PanelPlugin => { + const plugin = new PanelPlugin(reactPanel); + plugin.angularPanelCtrl = angularPanel; + plugin.meta = { id: options.id, type: PluginType.panel, name: options.id, @@ -58,9 +64,8 @@ export const getPanelPlugin = (options: Partial): PanelPluginMe hideFromList: options.hideFromList === true, module: '', baseUrl: '', - vizPlugin: options.vizPlugin, - angularPlugin: options.angularPlugin, }; + return plugin; }; export const getMockPlugin = () => { @@ -87,5 +92,5 @@ export const getMockPlugin = () => { pinned: false, type: PluginType.panel, module: 'path/to/module', - } as Plugin; + } as PluginMeta; }; diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts index a6222c77e3218..d9c891ca8bafa 100644 --- a/public/app/features/plugins/datasource_srv.ts +++ b/public/app/features/plugins/datasource_srv.ts @@ -53,7 +53,7 @@ export class DatasourceSrv { const deferred = this.$q.defer(); - importDataSourcePlugin(dsConfig.meta.module) + importDataSourcePlugin(dsConfig.meta) .then(dsPlugin => { // check if its in cache now if (this.datasources[name]) { diff --git a/public/app/features/plugins/plugin_component.ts b/public/app/features/plugins/plugin_component.ts index 690d423197a6e..6f6679886ddbe 100644 --- a/public/app/features/plugins/plugin_component.ts +++ b/public/app/features/plugins/plugin_component.ts @@ -4,7 +4,7 @@ import _ from 'lodash'; import config from 'app/core/config'; import coreModule from 'app/core/core_module'; -import { AngularPanelPlugin, DataSourceApi } from '@grafana/ui/src/types'; +import { DataSourceApi } from '@grafana/ui/src/types'; import { importPanelPlugin, importDataSourcePlugin, importAppPlugin } from './plugin_loader'; /** @ngInject */ @@ -22,7 +22,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $ }); } - function relativeTemplateUrlToAbs(templateUrl, baseUrl) { + function relativeTemplateUrlToAbs(templateUrl: string, baseUrl: string) { if (!templateUrl) { return undefined; } @@ -69,9 +69,8 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $ }; const panelInfo = config.panels[scope.panel.type]; - return importPanelPlugin(panelInfo.module).then(panelPlugin => { - const angularPanelPlugin = panelPlugin as AngularPanelPlugin; - const PanelCtrl = angularPanelPlugin.components.PanelCtrl; + return importPanelPlugin(panelInfo.id).then(panelPlugin => { + const PanelCtrl = panelPlugin.angularPanelCtrl; componentInfo.Component = PanelCtrl; if (!PanelCtrl || PanelCtrl.registered) { @@ -118,7 +117,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $ } // Annotations case 'annotations-query-ctrl': { - return importDataSourcePlugin(scope.ctrl.currentDatasource.meta.module).then(dsPlugin => { + return importDataSourcePlugin(scope.ctrl.currentDatasource.meta).then(dsPlugin => { return { baseUrl: scope.ctrl.currentDatasource.meta.baseUrl, name: 'annotations-query-ctrl-' + scope.ctrl.currentDatasource.meta.id, @@ -134,7 +133,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $ // Datasource ConfigCtrl case 'datasource-config-ctrl': { const dsMeta = scope.ctrl.datasourceMeta; - return importDataSourcePlugin(dsMeta.module).then(dsPlugin => { + return importDataSourcePlugin(dsMeta).then(dsPlugin => { scope.$watch( 'ctrl.current', () => { diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/plugin_loader.ts index 756724ace9d06..3bef9c936215d 100644 --- a/public/app/features/plugins/plugin_loader.ts +++ b/public/app/features/plugins/plugin_loader.ts @@ -18,7 +18,7 @@ import config from 'app/core/config'; import TimeSeries from 'app/core/time_series2'; import TableModel from 'app/core/table_model'; import { coreModule, appEvents, contextSrv } from 'app/core/core'; -import { DataSourcePlugin, AppPlugin, PanelPlugin, AngularPanelPlugin, PluginMeta } from '@grafana/ui/src/types'; +import { DataSourcePlugin, AppPlugin, PanelPlugin, PluginMeta, DataSourcePluginMeta } from '@grafana/ui/src/types'; import * as datemath from 'app/core/utils/datemath'; import * as fileExport from 'app/core/utils/file_export'; import * as flatten from 'app/core/utils/flatten'; @@ -160,15 +160,18 @@ export function importPluginModule(path: string): Promise { return System.import(path); } -export function importDataSourcePlugin(path: string): Promise> { - return importPluginModule(path).then(pluginExports => { +export function importDataSourcePlugin(meta: DataSourcePluginMeta): Promise> { + return importPluginModule(meta.module).then(pluginExports => { if (pluginExports.plugin) { - return pluginExports.plugin as DataSourcePlugin; + const dsPlugin = pluginExports.plugin as DataSourcePlugin; + dsPlugin.meta = meta; + return dsPlugin; } if (pluginExports.Datasource) { const dsPlugin = new DataSourcePlugin(pluginExports.Datasource); dsPlugin.setComponentsFromLegacyExports(pluginExports); + dsPlugin.meta = meta; return dsPlugin; } @@ -178,18 +181,50 @@ export function importDataSourcePlugin(path: string): Promise { return importPluginModule(meta.module).then(pluginExports => { - return new AppPlugin(meta, pluginExports); + const plugin = pluginExports.plugin ? (pluginExports.plugin as AppPlugin) : new AppPlugin(); + plugin.meta = meta; + plugin.setComponentsFromLegacyExports(pluginExports); + return plugin; }); } -export function importPanelPlugin(path: string): Promise { - return importPluginModule(path).then(pluginExports => { - if (pluginExports.plugin) { - return pluginExports.plugin as PanelPlugin; - } else { - return new AngularPanelPlugin(pluginExports.PanelCtrl); - } - }); +import { getPanelPluginNotFound } from '../dashboard/dashgrid/PanelPluginNotFound'; + +interface PanelCache { + [key: string]: PanelPlugin; +} +const panelCache: PanelCache = {}; + +export function importPanelPlugin(id: string): Promise { + const loaded = panelCache[id]; + if (loaded) { + return Promise.resolve(loaded); + } + const meta = config.panels[id]; + if (!meta) { + return Promise.resolve(getPanelPluginNotFound(id)); + } + + return importPluginModule(meta.module) + .then(pluginExports => { + if (pluginExports.plugin) { + return pluginExports.plugin as PanelPlugin; + } else if (pluginExports.PanelCtrl) { + const plugin = new PanelPlugin(null); + plugin.angularPanelCtrl = pluginExports.PanelCtrl; + return plugin; + } + throw new Error('missing export: plugin or PanelCtrl'); + }) + .then(plugin => { + plugin.meta = meta; + return (panelCache[meta.id] = plugin); + }) + .catch(err => { + // TODO, maybe a different error plugin + console.log('Error loading panel plugin', err); + return getPanelPluginNotFound(id); + }); } export function loadPluginCss(options) { diff --git a/public/app/features/plugins/specs/datasource_srv.test.ts b/public/app/features/plugins/specs/datasource_srv.test.ts index 614be9c23d81f..424bae457a055 100644 --- a/public/app/features/plugins/specs/datasource_srv.test.ts +++ b/public/app/features/plugins/specs/datasource_srv.test.ts @@ -1,7 +1,7 @@ import config from 'app/core/config'; import 'app/features/plugins/datasource_srv'; import { DatasourceSrv } from 'app/features/plugins/datasource_srv'; -import { PluginMeta } from '@grafana/ui/src/types'; +import { PluginMeta, DataSourcePluginMeta } from '@grafana/ui/src/types'; // Datasource variable $datasource with current value 'BBB' const templateSrv = { @@ -26,14 +26,14 @@ describe('datasource_srv', () => { id: 1, type: 'b', name: 'buildIn', - meta: { builtIn: true } as PluginMeta, + meta: { builtIn: true } as DataSourcePluginMeta, jsonData: {}, }, nonBuildIn: { id: 2, type: 'e', name: 'external1', - meta: { builtIn: false } as PluginMeta, + meta: { builtIn: false } as DataSourcePluginMeta, jsonData: {}, }, nonExplore: { diff --git a/public/app/features/plugins/state/actions.ts b/public/app/features/plugins/state/actions.ts index 1b79789774b22..9a1dbde7bffc9 100644 --- a/public/app/features/plugins/state/actions.ts +++ b/public/app/features/plugins/state/actions.ts @@ -1,8 +1,9 @@ -import { Plugin, StoreState } from 'app/types'; +import { StoreState } from 'app/types'; import { ThunkAction } from 'redux-thunk'; import { getBackendSrv } from '../../../core/services/backend_srv'; import { LayoutMode } from '../../../core/components/LayoutSelector/LayoutSelector'; import { PluginDashboard } from '../../../types/plugins'; +import { PluginMeta } from '@grafana/ui'; export enum ActionTypes { LoadPlugins = 'LOAD_PLUGINS', @@ -14,7 +15,7 @@ export enum ActionTypes { export interface LoadPluginsAction { type: ActionTypes.LoadPlugins; - payload: Plugin[]; + payload: PluginMeta[]; } export interface LoadPluginDashboardsAction { @@ -46,7 +47,7 @@ export const setPluginsSearchQuery = (query: string): SetPluginsSearchQueryActio payload: query, }); -const pluginsLoaded = (plugins: Plugin[]): LoadPluginsAction => ({ +const pluginsLoaded = (plugins: PluginMeta[]): LoadPluginsAction => ({ type: ActionTypes.LoadPlugins, payload: plugins, }); diff --git a/public/app/features/plugins/state/navModel.ts b/public/app/features/plugins/state/navModel.ts index 19ce6dd905dc2..6b759bba99e7b 100644 --- a/public/app/features/plugins/state/navModel.ts +++ b/public/app/features/plugins/state/navModel.ts @@ -5,8 +5,7 @@ import _ from 'lodash'; import config from 'app/core/config'; // Types -import { NavModel } from 'app/types'; -import { PluginMeta, DataSourceSettings } from '@grafana/ui/src/types'; +import { NavModel, PluginMeta, DataSourceSettings } from '@grafana/ui'; export function buildNavModel(ds: DataSourceSettings, plugin: PluginMeta, currentPage: string): NavModel { let title = 'New'; diff --git a/public/app/features/plugins/state/reducers.ts b/public/app/features/plugins/state/reducers.ts index 3baf47d60cbe1..054b32f636dd0 100644 --- a/public/app/features/plugins/state/reducers.ts +++ b/public/app/features/plugins/state/reducers.ts @@ -1,10 +1,11 @@ import { Action, ActionTypes } from './actions'; -import { Plugin, PluginsState } from 'app/types'; +import { PluginsState } from 'app/types'; import { LayoutModes } from '../../../core/components/LayoutSelector/LayoutSelector'; import { PluginDashboard } from '../../../types/plugins'; +import { PluginMeta } from '@grafana/ui'; export const initialState: PluginsState = { - plugins: [] as Plugin[], + plugins: [] as PluginMeta[], searchQuery: '', layoutMode: LayoutModes.Grid, hasFetched: false, diff --git a/public/app/features/plugins/variableQueryEditorLoader.tsx b/public/app/features/plugins/variableQueryEditorLoader.tsx index beb5e99898f26..92d6bfcad28e7 100644 --- a/public/app/features/plugins/variableQueryEditorLoader.tsx +++ b/public/app/features/plugins/variableQueryEditorLoader.tsx @@ -3,9 +3,11 @@ import { importDataSourcePlugin } from './plugin_loader'; import React from 'react'; import ReactDOM from 'react-dom'; import DefaultVariableQueryEditor from '../templating/DefaultVariableQueryEditor'; +import { DataSourcePluginMeta } from '@grafana/ui'; +import { TemplateSrv } from '../templating/template_srv'; -async function loadComponent(module) { - const dsPlugin = await importDataSourcePlugin(module); +async function loadComponent(meta: DataSourcePluginMeta) { + const dsPlugin = await importDataSourcePlugin(meta); if (dsPlugin.components.VariableQueryEditor) { return dsPlugin.components.VariableQueryEditor; } else { @@ -14,11 +16,11 @@ async function loadComponent(module) { } /** @ngInject */ -function variableQueryEditorLoader(templateSrv) { +function variableQueryEditorLoader(templateSrv: TemplateSrv) { return { restrict: 'E', link: async (scope, elem) => { - const Component = await loadComponent(scope.currentDatasource.meta.module); + const Component = await loadComponent(scope.currentDatasource.meta); const props = { datasource: scope.currentDatasource, query: scope.current.query, diff --git a/public/app/features/profile/state/reducers.ts b/public/app/features/profile/state/reducers.ts index dc6e841449ebb..b2236387ab8bd 100644 --- a/public/app/features/profile/state/reducers.ts +++ b/public/app/features/profile/state/reducers.ts @@ -3,6 +3,7 @@ import config from 'app/core/config'; export const initialState: UserState = { orgId: config.bootData.user.orgId, + timeZone: config.bootData.user.timezone, }; export const userReducer = (state = initialState, action: any): UserState => { diff --git a/public/app/features/profile/state/selectors.ts b/public/app/features/profile/state/selectors.ts new file mode 100644 index 0000000000000..83279093fc4ab --- /dev/null +++ b/public/app/features/profile/state/selectors.ts @@ -0,0 +1,4 @@ +import { UserState } from 'app/types'; +import { parseTimeZone } from '@grafana/ui'; + +export const getTimeZone = (state: UserState) => parseTimeZone(state.timeZone); diff --git a/public/app/features/teams/TeamList.test.tsx b/public/app/features/teams/TeamList.test.tsx index da5afb5879680..38373c0eab321 100644 --- a/public/app/features/teams/TeamList.test.tsx +++ b/public/app/features/teams/TeamList.test.tsx @@ -1,9 +1,10 @@ import React from 'react'; import { shallow } from 'enzyme'; import { Props, TeamList } from './TeamList'; -import { NavModel, Team, OrgRole } from '../../types'; +import { Team, OrgRole } from '../../types'; import { getMockTeam, getMultipleMockTeams } from './__mocks__/teamMocks'; import { User } from 'app/core/services/context_srv'; +import { NavModel } from '@grafana/ui'; const setup = (propOverrides?: object) => { const props: Props = { diff --git a/public/app/features/teams/TeamList.tsx b/public/app/features/teams/TeamList.tsx index 60d71e56f492e..c9c0c41f4d97b 100644 --- a/public/app/features/teams/TeamList.tsx +++ b/public/app/features/teams/TeamList.tsx @@ -2,9 +2,9 @@ import React, { PureComponent } from 'react'; import { connect } from 'react-redux'; import { hot } from 'react-hot-loader'; import Page from 'app/core/components/Page/Page'; -import { DeleteButton } from '@grafana/ui'; +import { DeleteButton, NavModel } from '@grafana/ui'; import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA'; -import { NavModel, Team, OrgRole } from 'app/types'; +import { Team, OrgRole } from 'app/types'; import { loadTeams, deleteTeam, setSearchQuery } from './state/actions'; import { getSearchQuery, getTeams, getTeamsCount, isPermissionTeamAdmin } from './state/selectors'; import { getNavModel } from 'app/core/selectors/navModel'; diff --git a/public/app/features/teams/TeamPages.test.tsx b/public/app/features/teams/TeamPages.test.tsx index c49be9f550b19..7e5c4994bdad5 100644 --- a/public/app/features/teams/TeamPages.test.tsx +++ b/public/app/features/teams/TeamPages.test.tsx @@ -1,9 +1,10 @@ import React from 'react'; import { shallow } from 'enzyme'; import { TeamPages, Props } from './TeamPages'; -import { NavModel, Team, TeamMember, OrgRole } from '../../types'; +import { Team, TeamMember, OrgRole } from '../../types'; import { getMockTeam } from './__mocks__/teamMocks'; import { User } from 'app/core/services/context_srv'; +import { NavModel } from '@grafana/ui'; jest.mock('app/core/config', () => ({ buildInfo: { isEnterprise: true }, diff --git a/public/app/features/teams/TeamPages.tsx b/public/app/features/teams/TeamPages.tsx index ae346aaaa97f2..bca045c0973d7 100644 --- a/public/app/features/teams/TeamPages.tsx +++ b/public/app/features/teams/TeamPages.tsx @@ -7,13 +7,14 @@ import Page from 'app/core/components/Page/Page'; import TeamMembers from './TeamMembers'; import TeamSettings from './TeamSettings'; import TeamGroupSync from './TeamGroupSync'; -import { NavModel, Team, TeamMember } from 'app/types'; +import { Team, TeamMember } from 'app/types'; import { loadTeam, loadTeamMembers } from './state/actions'; import { getTeam, getTeamMembers, isSignedInUserTeamAdmin } from './state/selectors'; import { getTeamLoadingNav } from './state/navModel'; import { getNavModel } from 'app/core/selectors/navModel'; import { getRouteParamsId, getRouteParamsPage } from '../../core/selectors/location'; import { contextSrv, User } from 'app/core/services/context_srv'; +import { NavModel } from '@grafana/ui'; export interface Props { team: Team; diff --git a/public/app/features/teams/state/navModel.ts b/public/app/features/teams/state/navModel.ts index aeb6b85f91e58..aacdeb4066b75 100644 --- a/public/app/features/teams/state/navModel.ts +++ b/public/app/features/teams/state/navModel.ts @@ -1,5 +1,6 @@ -import { Team, NavModelItem, NavModel, TeamPermissionLevel } from 'app/types'; +import { Team, TeamPermissionLevel } from 'app/types'; import config from 'app/core/config'; +import { NavModelItem, NavModel } from '@grafana/ui'; export function buildNavModel(team: Team): NavModelItem { const navModel = { diff --git a/public/app/features/users/UsersListPage.test.tsx b/public/app/features/users/UsersListPage.test.tsx index f9192568aef31..a5c826641746e 100644 --- a/public/app/features/users/UsersListPage.test.tsx +++ b/public/app/features/users/UsersListPage.test.tsx @@ -1,9 +1,10 @@ import React from 'react'; import { shallow } from 'enzyme'; import { UsersListPage, Props } from './UsersListPage'; -import { Invitee, NavModel, OrgUser } from 'app/types'; +import { Invitee, OrgUser } from 'app/types'; import { getMockUser } from './__mocks__/userMocks'; import appEvents from '../../core/app_events'; +import { NavModel } from '@grafana/ui'; jest.mock('../../core/app_events', () => ({ emit: jest.fn(), diff --git a/public/app/features/users/UsersListPage.tsx b/public/app/features/users/UsersListPage.tsx index cb8fdf52790f3..23dd9c9582cf2 100644 --- a/public/app/features/users/UsersListPage.tsx +++ b/public/app/features/users/UsersListPage.tsx @@ -6,11 +6,12 @@ import Page from 'app/core/components/Page/Page'; import UsersActionBar from './UsersActionBar'; import UsersTable from './UsersTable'; import InviteesTable from './InviteesTable'; -import { Invitee, NavModel, OrgUser } from 'app/types'; +import { Invitee, OrgUser } from 'app/types'; import appEvents from 'app/core/app_events'; import { loadUsers, loadInvitees, setUsersSearchQuery, updateUser, removeUser } from './state/actions'; import { getNavModel } from 'app/core/selectors/navModel'; import { getInvitees, getUsers, getUsersSearchQuery } from './state/selectors'; +import { NavModel } from '@grafana/ui'; export interface Props { navModel: NavModel; diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts index c32a46cb1b047..a8c3ce27500cd 100644 --- a/public/app/plugins/datasource/loki/datasource.test.ts +++ b/public/app/plugins/datasource/loki/datasource.test.ts @@ -1,6 +1,7 @@ import LokiDatasource from './datasource'; import { LokiQuery } from './types'; import { getQueryOptions } from 'test/helpers/getQueryOptions'; +import { SeriesData } from '@grafana/ui'; describe('LokiDatasource', () => { const instanceSettings: any = { @@ -50,8 +51,10 @@ describe('LokiDatasource', () => { expect(backendSrvMock.datasourceRequest.mock.calls[0][0].url).toContain('limit=20'); }); - test('should return log streams when resultFormat is undefined', async done => { - const ds = new LokiDatasource(instanceSettings, backendSrvMock, templateSrvMock); + test('should return series data', async done => { + const customData = { ...(instanceSettings.jsonData || {}), maxLines: 20 }; + const customSettings = { ...instanceSettings, jsonData: customData }; + const ds = new LokiDatasource(customSettings, backendSrvMock, templateSrvMock); backendSrvMock.datasourceRequest = jest.fn(() => Promise.resolve(testResp)); const options = getQueryOptions({ @@ -60,21 +63,10 @@ describe('LokiDatasource', () => { const res = await ds.query(options); - expect(res.data[0].entries[0].line).toBe('hello'); - done(); - }); - - test('should return time series when resultFormat is time_series', async done => { - const ds = new LokiDatasource(instanceSettings, backendSrvMock, templateSrvMock); - backendSrvMock.datasourceRequest = jest.fn(() => Promise.resolve(testResp)); - - const options = getQueryOptions({ - targets: [{ expr: 'foo', refId: 'B', resultFormat: 'time_series' }], - }); - - const res = await ds.query(options); - - expect(res.data[0].datapoints).toBeDefined(); + const seriesData = res.data[0] as SeriesData; + expect(seriesData.rows[0][1]).toBe('hello'); + expect(seriesData.meta.limit).toBe(20); + expect(seriesData.meta.search).toBe('(?i)foo'); done(); }); }); diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index 33e3bf3e96019..8a30a714c217a 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -5,13 +5,11 @@ import _ from 'lodash'; import * as dateMath from 'app/core/utils/datemath'; import { addLabelToSelector } from 'app/plugins/datasource/prometheus/add_label_to_query'; import LanguageProvider from './language_provider'; -import { mergeStreamsToLogs } from './result_transformer'; +import { logStreamToSeriesData } from './result_transformer'; import { formatQuery, parseQuery } from './query_utils'; -import { makeSeriesForLogs } from 'app/core/logs_model'; // Types -import { LogsStream, LogsModel } from 'app/core/logs_model'; -import { PluginMeta, DataQueryRequest } from '@grafana/ui/src/types'; +import { PluginMeta, DataQueryRequest, SeriesData } from '@grafana/ui/src/types'; import { LokiQuery } from './types'; export const DEFAULT_MAX_LINES = 1000; @@ -54,12 +52,6 @@ export class LokiDatasource { return this.backendSrv.datasourceRequest(req); } - mergeStreams(streams: LogsStream[], intervalMs: number): LogsModel { - const logs = mergeStreamsToLogs(streams, this.maxLines); - logs.series = makeSeriesForLogs(logs.rows, intervalMs); - return logs; - } - prepareQueryTarget(target, options) { const interpolated = this.templateSrv.replace(target.expr); const start = this.getTime(options.range.from, false); @@ -85,29 +77,23 @@ export class LokiDatasource { const queries = queryTargets.map(target => this._request('/api/prom/query', target)); return Promise.all(queries).then((results: any[]) => { - const allStreams: LogsStream[] = []; + const series: SeriesData[] = []; for (let i = 0; i < results.length; i++) { const result = results[i]; - const query = queryTargets[i]; - - // add search term to stream & add to array if (result.data) { for (const stream of result.data.streams || []) { - stream.search = query.regexp; - allStreams.push(stream); + const seriesData = logStreamToSeriesData(stream); + seriesData.meta = { + search: queryTargets[i].regexp, + limit: this.maxLines, + }; + series.push(seriesData); } } } - // check resultType - if (options.targets[0].resultFormat === 'time_series') { - const logs = mergeStreamsToLogs(allStreams, this.maxLines); - logs.series = makeSeriesForLogs(logs.rows, options.intervalMs); - return { data: logs.series }; - } else { - return { data: allStreams }; - } + return { data: series }; }); } diff --git a/public/app/plugins/datasource/loki/result_transformer.test.ts b/public/app/plugins/datasource/loki/result_transformer.test.ts index 7f9c9186ea644..b714bd9a53859 100644 --- a/public/app/plugins/datasource/loki/result_transformer.test.ts +++ b/public/app/plugins/datasource/loki/result_transformer.test.ts @@ -1,122 +1,6 @@ -import { LogsStream } from 'app/core/logs_model'; +import { logStreamToSeriesData } from './result_transformer'; -import { mergeStreamsToLogs, logStreamToSeriesData, seriesDataToLogStream } from './result_transformer'; - -describe('mergeStreamsToLogs()', () => { - it('returns empty logs given no streams', () => { - expect(mergeStreamsToLogs([]).rows).toEqual([]); - }); - - it('returns processed logs from single stream', () => { - const stream1: LogsStream = { - labels: '{foo="bar"}', - entries: [ - { - line: 'WARN boooo', - ts: '1970-01-01T00:00:00Z', - }, - ], - }; - expect(mergeStreamsToLogs([stream1]).rows).toMatchObject([ - { - entry: 'WARN boooo', - labels: { foo: 'bar' }, - key: 'EK1970-01-01T00:00:00Z{foo="bar"}', - logLevel: 'warning', - uniqueLabels: {}, - }, - ]); - }); - - it('returns merged logs from multiple streams sorted by time and with unique labels', () => { - const stream1: LogsStream = { - labels: '{foo="bar", baz="1"}', - entries: [ - { - line: 'WARN boooo', - ts: '1970-01-01T00:00:01Z', - }, - ], - }; - const stream2: LogsStream = { - labels: '{foo="bar", baz="2"}', - entries: [ - { - line: 'INFO 1', - ts: '1970-01-01T00:00:00Z', - }, - { - line: 'INFO 2', - ts: '1970-01-01T00:00:02Z', - }, - ], - }; - expect(mergeStreamsToLogs([stream1, stream2]).rows).toMatchObject([ - { - entry: 'INFO 2', - labels: { foo: 'bar', baz: '2' }, - logLevel: 'info', - uniqueLabels: { baz: '2' }, - }, - { - entry: 'WARN boooo', - labels: { foo: 'bar', baz: '1' }, - logLevel: 'warning', - uniqueLabels: { baz: '1' }, - }, - { - entry: 'INFO 1', - labels: { foo: 'bar', baz: '2' }, - logLevel: 'info', - uniqueLabels: { baz: '2' }, - }, - ]); - }); - - it('detects ANSI codes', () => { - expect( - mergeStreamsToLogs([ - { - labels: '{foo="bar"}', - entries: [ - { - line: "foo: 'bar'", - ts: '1970-01-01T00:00:00Z', - }, - ], - }, - { - labels: '{bar="foo"}', - entries: [ - { - line: "bar: 'foo'", - ts: '1970-01-01T00:00:00Z', - }, - ], - }, - ]).rows - ).toMatchObject([ - { - entry: "bar: 'foo'", - hasAnsi: false, - key: 'EK1970-01-01T00:00:00Z{bar="foo"}', - labels: { bar: 'foo' }, - logLevel: 'unknown', - raw: "bar: 'foo'", - }, - { - entry: "foo: 'bar'", - hasAnsi: true, - key: 'EK1970-01-01T00:00:00Z{foo="bar"}', - labels: { foo: 'bar' }, - logLevel: 'unknown', - raw: "foo: 'bar'", - }, - ]); - }); -}); - -describe('convert SeriesData to/from LogStream', () => { +describe('convert loki response to SeriesData', () => { const streams = [ { labels: '{foo="bar"}', @@ -143,9 +27,8 @@ describe('convert SeriesData to/from LogStream', () => { expect(data.length).toBe(2); expect(data[0].labels['foo']).toEqual('bar'); expect(data[0].rows[0][0]).toEqual(streams[0].entries[0].ts); - - const roundtrip = data.map(series => seriesDataToLogStream(series)); - expect(roundtrip.length).toBe(2); - expect(roundtrip[0].labels).toEqual(streams[0].labels); + expect(data[0].rows[0][1]).toEqual(streams[0].entries[0].line); + expect(data[1].rows[0][0]).toEqual(streams[1].entries[0].ts); + expect(data[1].rows[0][1]).toEqual(streams[1].entries[0].line); }); }); diff --git a/public/app/plugins/datasource/loki/result_transformer.ts b/public/app/plugins/datasource/loki/result_transformer.ts index 4e450b51751a8..7cebe52f1e56e 100644 --- a/public/app/plugins/datasource/loki/result_transformer.ts +++ b/public/app/plugins/datasource/loki/result_transformer.ts @@ -1,115 +1,7 @@ -import ansicolor from 'vendor/ansicolor/ansicolor'; -import _ from 'lodash'; -import moment from 'moment'; +import { LokiLogsStream } from './types'; +import { SeriesData, parseLabels, FieldType, Labels } from '@grafana/ui'; -import { LogsMetaItem, LogsModel, LogRowModel, LogsStream, LogsStreamEntry, LogsMetaKind } from 'app/core/logs_model'; -import { hasAnsiCodes } from 'app/core/utils/text'; -import { DEFAULT_MAX_LINES } from './datasource'; - -import { - parseLabels, - SeriesData, - findUniqueLabels, - Labels, - findCommonLabels, - getLogLevel, - FieldType, - formatLabels, - guessFieldTypeFromSeries, -} from '@grafana/ui'; - -export function processEntry( - entry: LogsStreamEntry, - labels: string, - parsedLabels: Labels, - uniqueLabels: Labels, - search: string -): LogRowModel { - const { line } = entry; - const ts = entry.ts || entry.timestamp; - // Assumes unique-ness, needs nanosec precision for timestamp - const key = `EK${ts}${labels}`; - const time = moment(ts); - const timeEpochMs = time.valueOf(); - const timeFromNow = time.fromNow(); - const timeLocal = time.format('YYYY-MM-DD HH:mm:ss'); - const logLevel = getLogLevel(line); - const hasAnsi = hasAnsiCodes(line); - - return { - key, - logLevel, - timeFromNow, - timeEpochMs, - timeLocal, - uniqueLabels, - hasAnsi, - entry: hasAnsi ? ansicolor.strip(line) : line, - raw: line, - labels: parsedLabels, - searchWords: search ? [search] : [], - timestamp: ts, - }; -} - -export function mergeStreamsToLogs(streams: LogsStream[], limit = DEFAULT_MAX_LINES): LogsModel { - // Unique model identifier - const id = streams.map(stream => stream.labels).join(); - - // Find unique labels for each stream - streams = streams.map(stream => ({ - ...stream, - parsedLabels: parseLabels(stream.labels), - })); - const commonLabels = findCommonLabels(streams.map(model => model.parsedLabels)); - streams = streams.map(stream => ({ - ...stream, - uniqueLabels: findUniqueLabels(stream.parsedLabels, commonLabels), - })); - - // Merge stream entries into single list of log rows - const sortedRows: LogRowModel[] = _.chain(streams) - .reduce( - (acc: LogRowModel[], stream: LogsStream) => [ - ...acc, - ...stream.entries.map(entry => - processEntry(entry, stream.labels, stream.parsedLabels, stream.uniqueLabels, stream.search) - ), - ], - [] - ) - .sortBy('timestamp') - .reverse() - .value(); - - const hasUniqueLabels = sortedRows && sortedRows.some(row => Object.keys(row.uniqueLabels).length > 0); - - // Meta data to display in status - const meta: LogsMetaItem[] = []; - if (_.size(commonLabels) > 0) { - meta.push({ - label: 'Common labels', - value: commonLabels, - kind: LogsMetaKind.LabelsMap, - }); - } - if (limit) { - meta.push({ - label: 'Limit', - value: `${limit} (${sortedRows.length} returned)`, - kind: LogsMetaKind.String, - }); - } - - return { - id, - hasUniqueLabels, - meta, - rows: sortedRows, - }; -} - -export function logStreamToSeriesData(stream: LogsStream): SeriesData { +export function logStreamToSeriesData(stream: LokiLogsStream): SeriesData { let labels: Labels = stream.parsedLabels; if (!labels && stream.labels) { labels = parseLabels(stream.labels); @@ -122,34 +14,3 @@ export function logStreamToSeriesData(stream: LogsStream): SeriesData { }), }; } - -export function seriesDataToLogStream(series: SeriesData): LogsStream { - let timeIndex = -1; - let lineIndex = -1; - for (let i = 0; i < series.fields.length; i++) { - const field = series.fields[i]; - const type = field.type || guessFieldTypeFromSeries(series, i); - if (timeIndex < 0 && type === FieldType.time) { - timeIndex = i; - } - if (lineIndex < 0 && type === FieldType.string) { - lineIndex = i; - } - } - if (timeIndex < 0) { - throw new Error('Series does not have a time field'); - } - if (lineIndex < 0) { - throw new Error('Series does not have a line field'); - } - return { - labels: formatLabels(series.labels), - parsedLabels: series.labels, - entries: series.rows.map(row => { - return { - line: row[lineIndex], - ts: row[timeIndex], - }; - }), - }; -} diff --git a/public/app/plugins/datasource/loki/types.ts b/public/app/plugins/datasource/loki/types.ts index fabbc7169e292..6376f67b6943d 100644 --- a/public/app/plugins/datasource/loki/types.ts +++ b/public/app/plugins/datasource/loki/types.ts @@ -1,8 +1,20 @@ -import { DataQuery } from '@grafana/ui/src/types'; +import { DataQuery, Labels } from '@grafana/ui/src/types'; export interface LokiQuery extends DataQuery { expr: string; - resultFormat?: LokiQueryResultFormats; } -export type LokiQueryResultFormats = 'time_series' | 'logs'; +export interface LokiLogsStream { + labels: string; + entries: LokiLogsStreamEntry[]; + search?: string; + parsedLabels?: Labels; + uniqueLabels?: Labels; +} + +export interface LokiLogsStreamEntry { + line: string; + ts: string; + // Legacy, was renamed to ts + timestamp?: string; +} diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts index 575b74b2dc5c5..9ac535c089ee4 100644 --- a/public/app/plugins/datasource/prometheus/datasource.ts +++ b/public/app/plugins/datasource/prometheus/datasource.ts @@ -59,10 +59,20 @@ export class PrometheusDatasource implements DataSourceApi { return query.expr; } + _addTracingHeaders(httpOptions: any, options: any) { + httpOptions.headers = options.headers || {}; + const proxyMode = !this.url.match(/^http/); + if (proxyMode) { + httpOptions.headers['X-Dashboard-Id'] = options.dashboardId; + httpOptions.headers['X-Panel-Id'] = options.panelId; + } + } + _request(url, data?, options?: any) { options = _.defaults(options || {}, { url: this.url + url, method: this.httpMethod, + headers: {}, }); if (options.method === 'GET') { @@ -75,9 +85,7 @@ export class PrometheusDatasource implements DataSourceApi { }).join('&'); } } else { - options.headers = { - 'Content-Type': 'application/x-www-form-urlencoded', - }; + options.headers['Content-Type'] = 'application/x-www-form-urlencoded'; options.transformRequest = data => { return $.param(data); }; @@ -89,9 +97,7 @@ export class PrometheusDatasource implements DataSourceApi { } if (this.basicAuth) { - options.headers = { - Authorization: this.basicAuth, - }; + options.headers.Authorization = this.basicAuth; } return this.backendSrv.datasourceRequest(options); @@ -233,6 +239,7 @@ export class PrometheusDatasource implements DataSourceApi { const adjusted = alignRange(start, end, query.step); query.start = adjusted.start; query.end = adjusted.end; + this._addTracingHeaders(query, options); return query; } @@ -261,7 +268,7 @@ export class PrometheusDatasource implements DataSourceApi { if (this.queryTimeout) { data['timeout'] = this.queryTimeout; } - return this._request(url, data, { requestId: query.requestId }); + return this._request(url, data, { requestId: query.requestId, headers: query.headers }); } performInstantQuery(query, time) { @@ -273,7 +280,7 @@ export class PrometheusDatasource implements DataSourceApi { if (this.queryTimeout) { data['timeout'] = this.queryTimeout; } - return this._request(url, data, { requestId: query.requestId }); + return this._request(url, data, { requestId: query.requestId, headers: query.headers }); } performSuggestQuery(query, cache = false) { diff --git a/public/app/plugins/datasource/prometheus/language_provider.ts b/public/app/plugins/datasource/prometheus/language_provider.ts index 71ff5bf5f72a1..9acc7a33f2141 100644 --- a/public/app/plugins/datasource/prometheus/language_provider.ts +++ b/public/app/plugins/datasource/prometheus/language_provider.ts @@ -9,12 +9,11 @@ import { TypeaheadOutput, } from 'app/types/explore'; -import { parseSelector, processLabels } from './language_utils'; +import { parseSelector, processLabels, processHistogramLabels } from './language_utils'; import PromqlSyntax, { FUNCTIONS, RATE_RANGES } from './promql'; const DEFAULT_KEYS = ['job', 'instance']; const EMPTY_SELECTOR = '{}'; -const HISTOGRAM_SELECTOR = '{le!=""}'; // Returns all timeseries for histograms const HISTORY_ITEM_COUNT = 5; const HISTORY_COUNT_CUTOFF = 1000 * 60 * 60 * 24; // 24h @@ -66,8 +65,17 @@ export default class PromQlLanguageProvider extends LanguageProvider { return PromqlSyntax; } - request = (url: string) => { - return this.datasource.metadataRequest(url); + request = async (url: string) => { + try { + const res = await this.datasource.metadataRequest(url); + const body = await (res.data || res.json()); + + return body.data; + } catch (error) { + console.error(error); + } + + return []; }; start = () => { @@ -78,7 +86,22 @@ export default class PromQlLanguageProvider extends LanguageProvider { }; fetchMetrics = async () => { - return this.fetchMetricNames().then(() => [this.fetchHistogramMetrics()]); + this.metrics = await this.fetchMetricNames(); + this.processHistogramMetrics(this.metrics); + + return Promise.resolve([]); + }; + + fetchMetricNames = async (): Promise => { + return this.request('/api/v1/label/__name__/values'); + }; + + processHistogramMetrics = (data: string[]) => { + const { values } = processHistogramLabels(data); + + if (values && values['__name__']) { + this.histogramMetrics = values['__name__'].slice().sort(); + } }; // Keep this DOM-free for testing @@ -293,60 +316,28 @@ export default class PromQlLanguageProvider extends LanguageProvider { return { context, refresher, suggestions }; } - async fetchMetricNames() { - const url = '/api/v1/label/__name__/values'; + fetchLabelValues = async (key: string) => { try { - const res = await this.request(url); - const body = await (res.data || res.json()); - this.metrics = body.data; - } catch (error) { - console.error(error); - } - } - - async fetchHistogramMetrics() { - await this.fetchSeriesLabels(HISTOGRAM_SELECTOR, true); - const histogramSeries = this.labelValues[HISTOGRAM_SELECTOR]; - if (histogramSeries && histogramSeries['__name__']) { - this.histogramMetrics = histogramSeries['__name__'].slice().sort(); - } - } - - async fetchLabelValues(key: string) { - const url = `/api/v1/label/${key}/values`; - try { - const res = await this.request(url); - const body = await (res.data || res.json()); - const exisingValues = this.labelValues[EMPTY_SELECTOR]; + const data = await this.request(`/api/v1/label/${key}/values`); + const existingValues = this.labelValues[EMPTY_SELECTOR]; const values = { - ...exisingValues, - [key]: body.data, - }; - this.labelValues = { - ...this.labelValues, - [EMPTY_SELECTOR]: values, + ...existingValues, + [key]: data, }; + this.labelValues[EMPTY_SELECTOR] = values; } catch (e) { console.error(e); } - } + }; - async fetchSeriesLabels(name: string, withName?: boolean) { - const url = `/api/v1/series?match[]=${name}`; + fetchSeriesLabels = async (name: string, withName?: boolean) => { try { - const res = await this.request(url); - const body = await (res.data || res.json()); - const { keys, values } = processLabels(body.data, withName); - this.labelKeys = { - ...this.labelKeys, - [name]: keys, - }; - this.labelValues = { - ...this.labelValues, - [name]: values, - }; + const data = await this.request(`/api/v1/series?match[]=${name}`); + const { keys, values } = processLabels(data, withName); + this.labelKeys[name] = keys; + this.labelValues[name] = values; } catch (e) { console.error(e); } - } + }; } diff --git a/public/app/plugins/datasource/prometheus/language_utils.ts b/public/app/plugins/datasource/prometheus/language_utils.ts index 6332da2614979..f10d9eed42248 100644 --- a/public/app/plugins/datasource/prometheus/language_utils.ts +++ b/public/app/plugins/datasource/prometheus/language_utils.ts @@ -1,8 +1,24 @@ export const RATE_RANGES = ['1m', '5m', '10m', '30m', '1h']; -export function processLabels(labels, withName = false) { - const values = {}; - labels.forEach(l => { +export const processHistogramLabels = (labels: string[]) => { + const result = []; + const regexp = new RegExp('_bucket($|:)'); + for (let index = 0; index < labels.length; index++) { + const label = labels[index]; + const isHistogramValue = regexp.test(label); + if (isHistogramValue) { + if (result.indexOf(label) === -1) { + result.push(label); + } + } + } + + return { values: { __name__: result } }; +}; + +export function processLabels(labels: any, withName = false) { + const values: { [key: string]: string[] } = {}; + labels.forEach((l: any) => { const { __name__, ...rest } = l; if (withName) { values['__name__'] = values['__name__'] || []; @@ -62,7 +78,7 @@ export function parseSelector(query: string, cursorOffset = 1): { labelKeys: any // Extract clean labels to form clean selector, incomplete labels are dropped const selector = query.slice(prefixOpen, suffixClose); - const labels = {}; + const labels: { [key: string]: { value: string; operator: string } } = {}; selector.replace(labelRegexp, (_, key, operator, value) => { labels[key] = { value, operator }; return ''; diff --git a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts index 5c747eae74f0f..05808464115c6 100644 --- a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts +++ b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts @@ -1232,4 +1232,27 @@ describe('PrometheusDatasource for POST', () => { expect(results.data[0].target).toBe('test{job="testjob"}'); }); }); + + describe('When querying prometheus via check headers X-Dashboard-Id and X-Panel-Id', () => { + const options = { dashboardId: 1, panelId: 2 }; + + const httpOptions = { + headers: {}, + }; + + it('with proxy access tracing headers should be added', () => { + ctx.ds = new PrometheusDatasource(instanceSettings, q, backendSrv as any, templateSrv, timeSrv); + ctx.ds._addTracingHeaders(httpOptions, options); + expect(httpOptions.headers['X-Dashboard-Id']).toBe(1); + expect(httpOptions.headers['X-Panel-Id']).toBe(2); + }); + + it('with direct access tracing headers should not be added', () => { + instanceSettings.url = 'http://127.0.0.1:8000'; + ctx.ds = new PrometheusDatasource(instanceSettings, q, backendSrv as any, templateSrv, timeSrv); + ctx.ds._addTracingHeaders(httpOptions, options); + expect(httpOptions.headers['X-Dashboard-Id']).toBe(undefined); + expect(httpOptions.headers['X-Panel-Id']).toBe(undefined); + }); + }); }); diff --git a/public/app/plugins/datasource/prometheus/specs/metric_find_query.test.ts b/public/app/plugins/datasource/prometheus/specs/metric_find_query.test.ts index 5e45f56303a3d..2ca7c97876237 100644 --- a/public/app/plugins/datasource/prometheus/specs/metric_find_query.test.ts +++ b/public/app/plugins/datasource/prometheus/specs/metric_find_query.test.ts @@ -57,6 +57,7 @@ describe('PrometheusMetricFindQuery', () => { method: 'GET', url: 'proxied/api/v1/labels', silent: true, + headers: {}, }); }); @@ -75,6 +76,7 @@ describe('PrometheusMetricFindQuery', () => { method: 'GET', url: 'proxied/api/v1/label/resource/values', silent: true, + headers: {}, }); }); @@ -97,6 +99,7 @@ describe('PrometheusMetricFindQuery', () => { method: 'GET', url: `proxied/api/v1/series?match[]=metric&start=${raw.from.unix()}&end=${raw.to.unix()}`, silent: true, + headers: {}, }); }); @@ -121,6 +124,7 @@ describe('PrometheusMetricFindQuery', () => { 'metric{label1="foo", label2="bar", label3="baz"}' )}&start=${raw.from.unix()}&end=${raw.to.unix()}`, silent: true, + headers: {}, }); }); @@ -145,6 +149,7 @@ describe('PrometheusMetricFindQuery', () => { method: 'GET', url: `proxied/api/v1/series?match[]=metric&start=${raw.from.unix()}&end=${raw.to.unix()}`, silent: true, + headers: {}, }); }); @@ -163,6 +168,7 @@ describe('PrometheusMetricFindQuery', () => { method: 'GET', url: 'proxied/api/v1/label/__name__/values', silent: true, + headers: {}, }); }); @@ -190,6 +196,7 @@ describe('PrometheusMetricFindQuery', () => { method: 'GET', url: `proxied/api/v1/query?query=metric&time=${raw.to.unix()}`, requestId: undefined, + headers: {}, }); }); @@ -217,6 +224,7 @@ describe('PrometheusMetricFindQuery', () => { 'up{job="job1"}' )}&start=${raw.from.unix()}&end=${raw.to.unix()}`, silent: true, + headers: {}, }); }); }); diff --git a/public/app/plugins/datasource/testdata/StreamHandler.ts b/public/app/plugins/datasource/testdata/StreamHandler.ts index 02159a72a65ed..11ede1346bd8a 100644 --- a/public/app/plugins/datasource/testdata/StreamHandler.ts +++ b/public/app/plugins/datasource/testdata/StreamHandler.ts @@ -8,6 +8,7 @@ import { DataStreamObserver, DataStreamState, LoadingState, + LogLevel, } from '@grafana/ui'; import { TestDataQuery, StreamingQuery } from './types'; @@ -218,21 +219,44 @@ export class LogsWorker extends StreamWorker { }, 10); } + getRandomLogLevel(): LogLevel { + const v = Math.random(); + if (v > 0.9) { + return LogLevel.critical; + } + if (v > 0.8) { + return LogLevel.error; + } + if (v > 0.7) { + return LogLevel.warning; + } + if (v > 0.4) { + return LogLevel.info; + } + if (v > 0.3) { + return LogLevel.debug; + } + if (v > 0.1) { + return LogLevel.trace; + } + return LogLevel.unknown; + } + getNextWord() { this.index = (this.index + Math.floor(Math.random() * 5)) % words.length; return words[this.index]; } - getRandomLine() { + getRandomLine(length = 60) { let line = this.getNextWord(); - while (line.length < 80) { + while (line.length < length) { line += ' ' + this.getNextWord(); } return line; } nextRow = (time: number) => { - return [time, this.getRandomLine()]; + return [time, '[' + this.getRandomLogLevel() + '] ' + this.getRandomLine()]; }; initBuffer(refId: string): SeriesData { @@ -270,9 +294,10 @@ export class LogsWorker extends StreamWorker { if (query.speed < 5) { query.speed = 5; } + const variance = query.speed * 0.2 * (Math.random() - 0.5); // +-10% this.appendRows([this.nextRow(Date.now())]); - this.timeoutId = window.setTimeout(this.looper, query.speed); + this.timeoutId = window.setTimeout(this.looper, query.speed + variance); }; } diff --git a/public/app/plugins/datasource/testdata/partials/query.editor.html b/public/app/plugins/datasource/testdata/partials/query.editor.html index 78fd3b44f89c7..bd54f503a5ec5 100644 --- a/public/app/plugins/datasource/testdata/partials/query.editor.html +++ b/public/app/plugins/datasource/testdata/partials/query.editor.html @@ -58,7 +58,7 @@ step="10" ng-change="ctrl.streamChanged()" />
-
+
-
+
0) { - const seriesStats = calculateStats({ series, stats: legendOptions.stats, fieldIndex: i }); - let statsDisplayValues; + const numberFields = fieldCache.getFields(FieldType.number); + for (let i = 0; i < numberFields.length; i++) { + const field = numberFields[i]; + // Use external calculator just to make sure it works :) + const points = getFlotPairs({ + series, + xIndex: timeColumn.index, + yIndex: field.index, + nullValueMode: NullValueMode.Null, + }); - if (legendOptions.stats) { - statsDisplayValues = legendOptions.stats.map(stat => { - const statDisplayValue = displayProcessor(seriesStats[stat]); + if (points.length > 0) { + const seriesStats = calculateStats({ series, stats: legendOptions.stats, fieldIndex: field.index }); + let statsDisplayValues; - return { - ...statDisplayValue, - text: statDisplayValue.text, - title: stat, - }; - }); - } + if (legendOptions.stats) { + statsDisplayValues = legendOptions.stats.map(stat => { + const statDisplayValue = displayProcessor(seriesStats[stat]); - const seriesColor = - seriesOptions[field.name] && seriesOptions[field.name].color - ? getColorFromHexRgbOrName(seriesOptions[field.name].color) - : colors[graphs.length % colors.length]; - - graphs.push({ - label: field.name, - data: points, - color: seriesColor, - info: statsDisplayValues, - isVisible: true, - yAxis: (seriesOptions[field.name] && seriesOptions[field.name].yAxis) || 1, + return { + ...statDisplayValue, + text: statDisplayValue.text, + title: stat, + }; }); } + + const seriesColor = + seriesOptions[field.name] && seriesOptions[field.name].color + ? getColorFromHexRgbOrName(seriesOptions[field.name].color) + : colors[graphs.length % colors.length]; + + graphs.push({ + label: field.name, + data: points, + color: seriesColor, + info: statsDisplayValues, + isVisible: true, + yAxis: (seriesOptions[field.name] && seriesOptions[field.name].yAxis) || 1, + }); } } } diff --git a/public/app/plugins/panel/singlestat2/SingleStatPanel.tsx b/public/app/plugins/panel/singlestat2/SingleStatPanel.tsx index fe5bc4d96f030..f83f00a07c8aa 100644 --- a/public/app/plugins/panel/singlestat2/SingleStatPanel.tsx +++ b/public/app/plugins/panel/singlestat2/SingleStatPanel.tsx @@ -16,9 +16,9 @@ import { PanelProps, getDisplayProcessor, NullValueMode, - FieldType, calculateStats, - getFirstTimeField, + FieldCache, + FieldType, } from '@grafana/ui'; interface SingleStatDisplay { @@ -51,73 +51,71 @@ export class SingleStatPanel extends PureComponent const values: SingleStatDisplay[] = []; for (const series of data.series) { - const timeColumn = sparkline.show ? getFirstTimeField(series) : -1; + const fieldCache = new FieldCache(series.fields); + const timeColumn = sparkline.show ? fieldCache.getFirstFieldOfType(FieldType.time) : null; + const numberFields = fieldCache.getFields(FieldType.number); + + for (let i = 0; i < numberFields.length; i++) { + const field = numberFields[i]; + const stats = calculateStats({ + series, + fieldIndex: field.index, + stats: [stat], // The stats to calculate + nullValueMode: NullValueMode.Null, + }); + + const v: SingleStatDisplay = { + value: display(stats[stat]), + }; + v.value.title = replaceVariables(field.name); + + const color = v.value.color; + if (!colorValue) { + delete v.value.color; + } + + if (colorBackground) { + v.backgroundColor = color; + } + + if (options.valueFontSize) { + v.value.fontSize = options.valueFontSize; + } - for (let i = 0; i < series.fields.length; i++) { - const field = series.fields[i]; + if (valueOptions.prefix) { + v.prefix = { + text: replaceVariables(valueOptions.prefix), + numeric: NaN, + color: colorPrefix ? color : null, + fontSize: options.prefixFontSize, + }; + } + if (valueOptions.suffix) { + v.suffix = { + text: replaceVariables(valueOptions.suffix), + numeric: NaN, + color: colorPostfix ? color : null, + fontSize: options.postfixFontSize, + }; + } - // Show all fields that are not 'time' - if (field.type === FieldType.number) { - const stats = calculateStats({ + if (sparkline.show && timeColumn) { + const points = getFlotPairs({ series, - fieldIndex: i, - stats: [stat], // The stats to calculate + xIndex: timeColumn.index, + yIndex: field.index, nullValueMode: NullValueMode.Null, }); - const v: SingleStatDisplay = { - value: display(stats[stat]), + v.sparkline = { + ...sparkline, + data: points, + minX: timeRange.from.valueOf(), + maxX: timeRange.to.valueOf(), }; - v.value.title = replaceVariables(field.name); - - const color = v.value.color; - if (!colorValue) { - delete v.value.color; - } - - if (colorBackground) { - v.backgroundColor = color; - } - - if (options.valueFontSize) { - v.value.fontSize = options.valueFontSize; - } - - if (valueOptions.prefix) { - v.prefix = { - text: replaceVariables(valueOptions.prefix), - numeric: NaN, - color: colorPrefix ? color : null, - fontSize: options.prefixFontSize, - }; - } - if (valueOptions.suffix) { - v.suffix = { - text: replaceVariables(valueOptions.suffix), - numeric: NaN, - color: colorPostfix ? color : null, - fontSize: options.postfixFontSize, - }; - } - - if (sparkline.show && timeColumn >= 0) { - const points = getFlotPairs({ - series, - xIndex: timeColumn, - yIndex: i, - nullValueMode: NullValueMode.Null, - }); - - v.sparkline = { - ...sparkline, - data: points, - minX: timeRange.from.valueOf(), - maxX: timeRange.to.valueOf(), - }; - } - - values.push(v); } + + values.push(v); } } diff --git a/public/app/types/dashboard.ts b/public/app/types/dashboard.ts index c78678579e570..67a1baef3c0a6 100644 --- a/public/app/types/dashboard.ts +++ b/public/app/types/dashboard.ts @@ -26,6 +26,7 @@ export interface DashboardMeta { canMakeEditable?: boolean; submenuEnabled?: boolean; provisioned?: boolean; + provisionedExternalId?: string; focusPanelId?: number; isStarred?: boolean; showSettings?: boolean; diff --git a/public/app/types/datasources.ts b/public/app/types/datasources.ts index da81a3023b781..12fd607521af1 100644 --- a/public/app/types/datasources.ts +++ b/public/app/types/datasources.ts @@ -1,6 +1,5 @@ import { LayoutMode } from '../core/components/LayoutSelector/LayoutSelector'; -import { Plugin } from './plugins'; -import { DataSourceSettings } from '@grafana/ui/src/types'; +import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui/src/types'; export interface DataSourcesState { dataSources: DataSourceSettings[]; @@ -8,9 +7,9 @@ export interface DataSourcesState { dataSourceTypeSearchQuery: string; layoutMode: LayoutMode; dataSourcesCount: number; - dataSourceTypes: Plugin[]; + dataSourceTypes: DataSourcePluginMeta[]; dataSource: DataSourceSettings; - dataSourceMeta: Plugin; + dataSourceMeta: DataSourcePluginMeta; hasFetched: boolean; isLoadingDataSources: boolean; } diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts index 28fe642bdca06..c057785bb9019 100644 --- a/public/app/types/explore.ts +++ b/public/app/types/explore.ts @@ -2,7 +2,6 @@ import { ComponentClass } from 'react'; import { Value } from 'slate'; import { RawTimeRange, - TimeRange, DataQuery, DataQueryResponseData, DataSourceSelectItem, @@ -10,6 +9,7 @@ import { QueryHint, ExploreStartPageProps, LogLevel, + TimeRange, } from '@grafana/ui'; import { Emitter, TimeSeries } from 'app/core/core'; @@ -189,7 +189,7 @@ export interface ExploreItemState { /** * Time range for this Explore. Managed by the time picker and used by all query runs. */ - range: TimeRange | RawTimeRange; + range: TimeRange; /** * Scanner function that calculates a new range, triggers a query run, and returns the new range. */ diff --git a/public/app/types/index.ts b/public/app/types/index.ts index 3bf76aeb3c32d..6da9d859f5c7a 100644 --- a/public/app/types/index.ts +++ b/public/app/types/index.ts @@ -1,7 +1,6 @@ export * from './teams'; export * from './alerting'; export * from './location'; -export * from './navModel'; export * from './folders'; export * from './dashboard'; export * from './acl'; diff --git a/public/app/types/plugins.ts b/public/app/types/plugins.ts index e1225a387421e..d640ebc50049a 100644 --- a/public/app/types/plugins.ts +++ b/public/app/types/plugins.ts @@ -1,28 +1,4 @@ -import { AngularPanelPlugin, PanelPlugin, PluginMeta } from '@grafana/ui/src/types'; - -export interface PanelPluginMeta extends PluginMeta { - hideFromList?: boolean; - sort: number; - angularPlugin: AngularPanelPlugin | null; - vizPlugin: PanelPlugin | null; - hasBeenImported?: boolean; - dataFormats: PanelDataFormat[]; -} - -export enum PanelDataFormat { - Table = 'table', - TimeSeries = 'time_series', -} - -/** - * Values we don't want in the public API - */ -export interface Plugin extends PluginMeta { - defaultNavUrl: string; - hasUpdate: boolean; - latestVersion: string; - pinned: boolean; -} +import { PluginMeta } from '@grafana/ui'; export interface PluginDashboard { dashboardId: number; @@ -41,7 +17,7 @@ export interface PluginDashboard { } export interface PluginsState { - plugins: Plugin[]; + plugins: PluginMeta[]; searchQuery: string; layoutMode: string; hasFetched: boolean; diff --git a/public/app/types/store.ts b/public/app/types/store.ts index 72a8cf066f1e1..975cd40ae71c6 100644 --- a/public/app/types/store.ts +++ b/public/app/types/store.ts @@ -1,7 +1,6 @@ import { ThunkAction, ThunkDispatch as GenericThunkDispatch } from 'redux-thunk'; import { ActionOf } from 'app/core/redux'; -import { NavIndex } from './navModel'; import { LocationState } from './location'; import { AlertRulesState } from './alerting'; import { TeamsState, TeamState } from './teams'; @@ -13,6 +12,7 @@ import { UsersState, UserState } from './user'; import { OrganizationState } from './organization'; import { AppNotificationsState } from './appNotifications'; import { PluginsState } from './plugins'; +import { NavIndex } from '@grafana/ui'; export interface StoreState { navIndex: NavIndex; diff --git a/public/app/types/user.ts b/public/app/types/user.ts index 7691558ce902e..535a6a3cc05ad 100644 --- a/public/app/types/user.ts +++ b/public/app/types/user.ts @@ -46,4 +46,5 @@ export interface UsersState { export interface UserState { orgId: number; + timeZone: string; } diff --git a/public/test/mocks/common.ts b/public/test/mocks/common.ts index 385f72621a9dc..023c653de26dc 100644 --- a/public/test/mocks/common.ts +++ b/public/test/mocks/common.ts @@ -1,4 +1,4 @@ -import { NavModel, NavModelItem } from 'app/types'; +import { NavModel, NavModelItem } from '@grafana/ui'; export const backendSrv = { get: jest.fn(), diff --git a/public/test/specs/helpers.ts b/public/test/specs/helpers.ts index 9c56c65288465..8b38f95f03e19 100644 --- a/public/test/specs/helpers.ts +++ b/public/test/specs/helpers.ts @@ -3,8 +3,7 @@ import config from 'app/core/config'; import * as dateMath from 'app/core/utils/datemath'; import { angularMocks, sinon } from '../lib/common'; import { PanelModel } from 'app/features/dashboard/state/PanelModel'; -import { PanelPluginMeta } from 'app/types'; -import { RawTimeRange } from '@grafana/ui/src/types'; +import { PanelPluginMeta, RawTimeRange } from '@grafana/ui'; export function ControllerTestContext(this: any) { const self = this; diff --git a/scripts/backend-lint.sh b/scripts/backend-lint.sh index 304f91550e0c3..064b8626fb2c7 100755 --- a/scripts/backend-lint.sh +++ b/scripts/backend-lint.sh @@ -39,4 +39,7 @@ exit_if_fail go vet ./pkg/... exit_if_fail revive -formatter stylish -config ./scripts/revive.toml # TODO recheck the rules and leave only necessary exclusions -#exit_if_fail gosec -quiet -exclude=G104,G107,G201,G202,G204,G301,G302,G304,G402,G501,G505,G401 ./pkg/... +# exit_if_fail gosec -quiet \ +# -exclude=G104,G107,G201,G202,G204,G301,G304,G401,G402,G501 \ +# -conf=./scripts/gosec.json \ +# ./pkg/... diff --git a/scripts/build/build.sh b/scripts/build/build.sh index f55a5f6ed92c1..b6bbbccedaf07 100755 --- a/scripts/build/build.sh +++ b/scripts/build/build.sh @@ -1,20 +1,58 @@ #!/bin/bash - # # This script is executed from within the container. # - set -e -EXTRA_OPTS="$@" - +########## CCARMV6=/opt/rpi-tools/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc CCARMV7=arm-linux-gnueabihf-gcc CCARM64=aarch64-linux-gnu-gcc CCX64=/tmp/x86_64-centos6-linux-gnu/bin/x86_64-centos6-linux-gnu-gcc - +########## GOPATH=/go REPO_PATH=$GOPATH/src/github.com/grafana/grafana +########## + +BUILD_FAST=0 +BUILD_BACKEND=1 +BUILD_FRONTEND=1 +BUILD_PACKAGE=1 + +while [ "$1" != "" ]; do + case "$1" in + "--fast") + BUILD_FAST=1 + echo "Fast build enabled" + shift + ;; + "--backend-only") + BUILD_FRONTEND=0 + BUILD_PACKAGE=0 + echo "Building only backend" + shift + ;; + "--frontend-only") + BUILD_BACKEND=0 + BUILD_PACKAGE=0 + echo "Building only frontend" + shift + ;; + "--package-only") + BUILD_BACKEND=0 + BUILD_FRONTEND=0 + echo "Building only packaging" + shift + ;; + * ) + # unknown param causes args to be passed through to $@ + break + ;; + esac +done + +EXTRA_OPTS="$@" + cd /go/src/github.com/grafana/grafana echo "current dir: $(pwd)" @@ -31,31 +69,77 @@ fi echo "Build arguments: $OPT" echo "current dir: $(pwd)" -go run build.go -goarch armv6 -cc ${CCARMV6} ${OPT} build -go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build -go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build - -CC=${CCX64} go run build.go ${OPT} build - -yarn install --pure-lockfile --no-progress - -echo "Building frontend" -go run build.go ${OPT} build-frontend - -if [ -d "dist" ]; then - rm -rf dist +function build_backend_linux_amd64() { + if [ ! -d "dist" ]; then + mkdir dist + fi + CC=${CCX64} go run build.go ${OPT} build +} + +function build_backend() { + if [ ! -d "dist" ]; then + mkdir dist + fi + + go run build.go -goarch armv6 -cc ${CCARMV6} ${OPT} build + go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build + go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build + build_backend_linux_amd64 +} + +function build_frontend() { + if [ ! -d "dist" ]; then + mkdir dist + fi + yarn install --pure-lockfile --no-progress + echo "Building frontend" + go run build.go ${OPT} build-frontend + echo "FRONTEND: finished" +} + +function package_linux_amd64() { + echo "Packaging Linux AMD64" + go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only + go run build.go latest + echo "PACKAGE LINUX AMD64: finished" +} + +function package_all() { + echo "Packaging ALL" + go run build.go -goos linux -pkg-arch armv6 ${OPT} -skipRpm package-only + go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only + go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only + package_linux_amd64 + echo "PACKAGE ALL: finished" +} + +function package_setup() { + echo "Packaging: Setup environment" + if [ -d "dist" ]; then + rm -rf dist + fi + mkdir dist + go run build.go -gen-version ${OPT} > dist/grafana.version + # Load ruby, needed for packing with fpm + source /etc/profile.d/rvm.sh +} + +if [ $BUILD_FAST = "0" ]; then + build_backend + build_frontend + package_setup + package_all +else + if [ $BUILD_BACKEND = "1" ]; then + build_backend_linux_amd64 + fi + if [ $BUILD_FRONTEND = "1" ]; then + build_frontend + fi + if [ $BUILD_PACKAGE = "1" ]; then + package_setup + package_linux_amd64 + # last step + #go run build.go latest + fi fi - -mkdir dist -go run build.go -gen-version ${OPT} > dist/grafana.version - -# Load ruby, needed for packing with fpm -source /etc/profile.d/rvm.sh - -echo "Packaging" -go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only -go run build.go -goos linux -pkg-arch armv6 ${OPT} -skipRpm package-only -go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only -go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only - -go run build.go latest diff --git a/scripts/ci-frontend-metrics.sh b/scripts/ci-frontend-metrics.sh index d9e5fcb82dcae..42f57fcf3c699 100755 --- a/scripts/ci-frontend-metrics.sh +++ b/scripts/ci-frontend-metrics.sh @@ -2,7 +2,7 @@ echo -e "Collecting code stats (typescript errors & more)" -ERROR_COUNT_LIMIT=5946 +ERROR_COUNT_LIMIT=5668 DIRECTIVES_LIMIT=175 CONTROLLERS_LIMIT=140 diff --git a/scripts/gosec.json b/scripts/gosec.json new file mode 100644 index 0000000000000..19c4500d53a90 --- /dev/null +++ b/scripts/gosec.json @@ -0,0 +1,4 @@ +{ + "G302": "0660", + "G301": "0755" +}