From e3cad8725fabf4d0012e2d0285b5b4807f9eaa85 Mon Sep 17 00:00:00 2001 From: ntap-fge <117348352+ntap-fge@users.noreply.github.com> Date: Thu, 10 Nov 2022 14:35:50 +0100 Subject: [PATCH] Rebrand to Plutono --- .bra.toml | 4 +- .circleci/config.yml | 2 +- .drone.yml | 948 +++--- .eslintrc | 2 +- .github/CODEOWNERS | 44 +- .github/ISSUE_TEMPLATE/1-bug_report.md | 8 +- .github/ISSUE_TEMPLATE/2-feature_request.md | 2 +- .github/ISSUE_TEMPLATE/3-accessibility.md | 6 +- ...component.md => 4-plutono_ui_component.md} | 14 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/bot.md | 8 +- .github/commands.json | 8 +- .gitignore | 16 +- .prettierrc.js | 2 +- CONTRIBUTING.md | 26 +- Dockerfile | 30 +- Dockerfile.ubuntu | 30 +- GOVERNANCE.md | 42 +- ISSUE_TRIAGE.md | 40 +- Makefile | 12 +- PLUGIN_DEV.md | 22 +- README.md | 26 +- SECURITY.md | 2 +- SUPPORT.md | 8 +- UPGRADING_DEPENDENCIES.md | 18 +- WORKFLOW.md | 6 +- build.go | 32 +- conf/defaults.ini | 112 +- conf/ldap.toml | 24 +- conf/ldap_multiple.toml | 18 +- conf/provisioning/dashboards/sample.yaml | 2 +- conf/provisioning/plugins/sample.yaml | 2 +- conf/sample.ini | 114 +- contribute/README.md | 8 +- contribute/architecture/README.md | 2 +- contribute/architecture/communication.md | 2 +- contribute/architecture/database.md | 12 +- .../architecture/frontend-data-requests.md | 30 +- contribute/architecture/services.md | 16 +- contribute/create-pull-request.md | 8 +- contribute/developer-guide.md | 50 +- contribute/documentation.md | 10 +- contribute/engineering/terminology.md | 4 +- contribute/style-guides/backend.md | 8 +- contribute/style-guides/code-comments.md | 4 +- .../documentation-markdown-guide.md | 4 +- .../style-guides/documentation-style-guide.md | 42 +- contribute/style-guides/e2e-core.md | 14 +- contribute/style-guides/e2e-plugins.md | 4 +- contribute/style-guides/e2e.md | 12 +- contribute/style-guides/frontend.md | 8 +- contribute/style-guides/redux.md | 2 +- contribute/style-guides/storybook.md | 2 +- contribute/style-guides/styling.md | 16 +- contribute/style-guides/themes.md | 42 +- contribute/templates/README.md | 4 +- contribute/templates/doc-concept-template.md | 8 +- .../templates/doc-reference-template.md | 4 +- contribute/templates/doc-task-template.md | 8 +- contribute/triage-issues.md | 2 +- dashboard-schemas/Dashboard.cue | 2 +- dashboard-schemas/README.md | 4 +- dashboard-schemas/panels/Graph.cue | 2 +- devenv/README.md | 18 +- devenv/bulk-dashboards/bulkdash.jsonnet | 2 +- devenv/create_docker_compose.sh | 14 +- devenv/datasources.yaml | 38 +- devenv/datasources_docker.yaml | 34 +- .../panel_tests_graph.json | 2 +- .../panel_tests_graph_time_regions.json | 2 +- .../panel_tests_polystat.json | 8 +- .../alerting/testdata_alerts.json | 2 +- .../elasticsearch_compare.json | 2 +- .../elasticsearch_v2.json | 4 +- .../elasticsearch_v5.json | 4 +- .../elasticsearch_v6.json | 4 +- .../elasticsearch_v6_filebeat.json | 6 +- .../elasticsearch_v7.json | 4 +- .../elasticsearch_v7_filebeat.json | 6 +- .../datasource-influxdb/influxdb-logs.json | 2 +- .../influxdb-templated.json | 2 +- .../datasource-mssql/mssql_fakedata.json | 24 +- .../datasource-mssql/mssql_unittest.json | 2 +- .../datasource-mysql/mysql_fakedata.json | 24 +- .../datasource-mysql/mysql_unittest.json | 2 +- .../datasource-opentsdb/opentsdb.json | 2 +- .../postgres_fakedata.json | 24 +- .../postgres_unittest.json | 2 +- .../datasource-testdata/bar-gauge-demo2.json | 2 +- .../datasource-testdata/demo1.json | 2 +- .../new_features_in_v62.json | 4 +- .../new_features_in_v74.json | 4 +- .../global-variables-and-interpolation.json | 2 +- ...plating-dashboard-links-and-variables.json | 4 +- .../templating-textbox-e2e-scenarios.json | 8 +- .../testdata-datalinks.json | 2 +- .../testdata-nested-variables-drilldown.json | 2 +- .../testdata-nested-variables.json | 2 +- .../testdata-repeating.json | 2 +- .../testdata-variables-textbox.json | 2 +- ...-variables-that-update-on-time-change.json | 2 +- devenv/dev-dashboards/home.json | 4 +- .../panel-bargauge/bar_gauge_demo.json | 2 +- .../panel-bargauge/panel_tests_bar_gauge.json | 2 +- .../panel_tests_bar_gauge2.json | 2 +- .../panel-common/auto_decimals.json | 2 +- .../panel-common/color_modes.json | 2 +- .../panel-common/lazy_loading.json | 2 +- .../panel-common/linked-viz.json | 2 +- .../panel-common/panels_without_title.json | 2 +- .../panel-common/shared_queries.json | 2 +- .../panel-gauge/gauge-multi-series.json | 2 +- .../panel-gauge/gauge_tests.json | 2 +- .../graph-gradient-area-fills.json | 2 +- .../panel-graph/graph-ng-gradient-area.json | 2 +- .../panel-graph/graph-ng-hue-gradients.json | 2 +- .../panel-graph/graph-ng-nulls.json | 2 +- .../panel-graph/graph-ng-soft-limits.json | 2 +- .../panel-graph/graph-ng-time.json | 2 +- .../panel-graph/graph-ng-yaxis-ticks.json | 2 +- .../dev-dashboards/panel-graph/graph-ng.json | 2 +- .../panel-graph/graph-time-regions.json | 2 +- .../panel-graph/graph_tests.json | 2 +- .../panel-graph/graph_y_axis.json | 2 +- .../panel-library/panel-library.json | 2 +- .../panel-piechart/panel_test_piechart.json | 2 +- .../panel-polystat/polystat_test.json | 8 +- .../panel-singlestat/singlestat_test.json | 2 +- .../panel-stat/panel-stat-tests.json | 2 +- .../panel-table/table_tests.json | 2 +- .../panel-table/table_tests_new.json | 2 +- .../slow_queries_and_annotations.json | 4 +- .../scenarios/time_zone_support.json | 2 +- .../blocks/apache_proxy/docker-compose.yaml | 8 +- devenv/docker/blocks/apache_proxy/proxy.conf | 4 +- .../apache_proxy_mac/docker-compose.yaml | 8 +- .../docker/blocks/apache_proxy_mac/proxy.conf | 4 +- .../docker/blocks/elastic/docker-compose.yaml | 2 +- .../blocks/elastic5/docker-compose.yaml | 2 +- .../blocks/elastic6/docker-compose.yaml | 4 +- devenv/docker/blocks/elastic6/filebeat.yml | 16 +- .../blocks/elastic7/docker-compose.yaml | 4 +- devenv/docker/blocks/elastic7/filebeat.yml | 16 +- .../docker/blocks/freeipa/ldap_freeipa.toml | 6 +- devenv/docker/blocks/freeipa/notes.md | 8 +- devenv/docker/blocks/grafana/.env | 1 - .../docker/blocks/grafana/docker-compose.yaml | 14 - .../blocks/graphite/docker-compose.yaml | 2 +- .../docker/blocks/graphite/files/my_htpasswd | 2 +- .../blocks/graphite1/big-dashboard.json | 8 +- .../blocks/graphite1/docker-compose.yaml | 2 +- .../blocks/graphite11/big-dashboard.json | 8 +- .../blocks/graphite11/docker-compose.yaml | 2 +- .../blocks/influxdb/docker-compose.yaml | 8 +- devenv/docker/blocks/influxdb/telegraf.conf | 8 +- .../blocks/influxdb2/docker-compose.yaml | 6 +- devenv/docker/blocks/influxdb2/telegraf.conf | 8 +- .../docker/blocks/jaeger/docker-compose.yaml | 6 +- devenv/docker/blocks/loki/config.yaml | 6 +- devenv/docker/blocks/loki/docker-compose.yaml | 6 +- .../docker/blocks/mssql/docker-compose.yaml | 6 +- .../blocks/mssql_tests/docker-compose.yaml | 4 +- .../admins-ldap-server.Dockerfile | 2 +- .../prepopulate/1_units.ldif | 4 +- .../prepopulate/2_users.ldif | 8 +- .../prepopulate/3_groups.ldif | 6 +- .../multiple-openldap/docker-compose.yaml | 8 +- .../multiple-openldap/ldap-server.Dockerfile | 2 +- .../ldap-server/prepopulate/1_units.ldif | 4 +- .../ldap-server/prepopulate/2_users.ldif | 24 +- .../ldap-server/prepopulate/3_groups.ldif | 22 +- .../blocks/multiple-openldap/ldap_dev.toml | 20 +- .../docker/blocks/multiple-openldap/notes.md | 4 +- .../blocks/multiple-openldap/prepopulate.sh | 4 +- .../docker/blocks/mysql/docker-compose.yaml | 6 +- .../docker/blocks/mysql_opendata/Dockerfile | 2 +- .../blocks/mysql_opendata/docker-compose.yaml | 2 +- .../blocks/mysql_tests/docker-compose.yaml | 4 +- devenv/docker/blocks/mysql_tests/setup.sql | 4 +- .../blocks/nginx_proxy/docker-compose.yaml | 8 +- devenv/docker/blocks/nginx_proxy/nginx.conf | 4 +- .../blocks/nginx_proxy/nginx_login_only.conf | 6 +- .../nginx_proxy_mac/docker-compose.yaml | 8 +- .../docker/blocks/nginx_proxy_mac/nginx.conf | 4 +- .../nginx_proxy_mac/nginx_login_only.conf | 6 +- devenv/docker/blocks/openldap/Dockerfile | 2 +- .../blocks/openldap/docker-compose.yaml | 4 +- devenv/docker/blocks/openldap/ldap.conf | 2 +- devenv/docker/blocks/openldap/ldap_dev.toml | 18 +- .../blocks/openldap/ldap_posix_dev.toml | 20 +- devenv/docker/blocks/openldap/notes.md | 4 +- devenv/docker/blocks/openldap/prepopulate.sh | 4 +- .../blocks/openldap/prepopulate/1_units.ldif | 4 +- .../blocks/openldap/prepopulate/2_users.ldif | 40 +- .../blocks/openldap/prepopulate/3_groups.ldif | 30 +- .../blocks/opentsdb/docker-compose.yaml | 2 +- devenv/docker/blocks/plutono/.env | 1 + .../docker/blocks/plutono/docker-compose.yaml | 14 + .../blocks/postgres/docker-compose.yaml | 6 +- .../blocks/postgres_tests/docker-compose.yaml | 4 +- devenv/docker/blocks/postgres_tests/setup.sql | 6 +- .../blocks/prometheus/docker-compose.yaml | 2 +- .../docker/blocks/prometheus/prometheus.yml | 4 +- .../blocks/prometheus2/docker-compose.yaml | 2 +- .../docker/blocks/prometheus2/prometheus.yml | 2 +- devenv/docker/blocks/saml/docker-compose.yaml | 2 +- devenv/docker/blocks/saml/users.php | 6 +- .../traefik/configs/subpath_no_rewrite.yml | 10 +- .../docker/blocks/traefik/docker-compose.yml | 8 +- devenv/docker/buildcontainer/Dockerfile | 2 +- devenv/docker/buildcontainer/build.sh | 4 +- devenv/docker/buildcontainer/build_circle.sh | 4 +- devenv/docker/buildcontainer/run_circle.sh | 2 +- devenv/docker/debtest/build.sh | 4 +- devenv/docker/ha_test/.gitignore | 2 +- devenv/docker/ha_test/README.md | 34 +- devenv/docker/ha_test/alerts.sh | 4 +- devenv/docker/ha_test/docker-compose.yaml | 34 +- devenv/docker/ha_test/fluentd/fluentd.conf | 6 +- .../provisioning/alerts.jsonnet | 0 .../dashboards/alerts/overview.json | 12 +- .../provisioning/dashboards/dashboards.yaml | 4 +- .../dashboards/mysql/overview.json | 4 +- .../provisioning/datasources/datasources.yaml | 0 .../docker/ha_test/prometheus/prometheus.yml | 4 +- devenv/docker/loadtest/README.md | 8 +- .../loadtest/annotations_by_tag_test.js | 4 +- devenv/docker/loadtest/auth_key_test.js | 2 +- devenv/docker/loadtest/auth_proxy_test.js | 4 +- .../docker/loadtest/auth_token_slow_test.js | 4 +- devenv/docker/loadtest/auth_token_test.js | 4 +- devenv/docker/loadtest/modules/client.js | 10 +- devenv/docker/loadtest/modules/util.js | 2 +- devenv/docker/rpmtest/build.sh | 4 +- .../conf/nginx/sites-enabled/verdaccio-conf | 2 +- docs/Makefile | 6 +- docs/README.md | 10 +- docs/sources/_index.md | 22 +- docs/sources/administration/_index.md | 2 +- docs/sources/administration/cli.md | 96 +- docs/sources/administration/configuration.md | 238 +- .../administration/configure-docker.md | 64 +- .../sources/administration/image_rendering.md | 68 +- .../administration/jaeger-instrumentation.md | 8 +- .../administration/preferences/_index.md | 10 +- .../preferences/change-home-dashboard.md | 16 +- ...grafana-name.md => change-plutono-name.md} | 16 +- ...afana-theme.md => change-plutono-theme.md} | 12 +- ...timezone.md => change-plutono-timezone.md} | 10 +- docs/sources/administration/provisioning.md | 92 +- docs/sources/administration/security.md | 20 +- .../set-up-for-high-availability.md | 22 +- .../administration/view-server/_index.md | 2 +- .../view-server/internal-metrics.md | 46 +- .../view-server/view-server-settings.md | 14 +- .../view-server/view-server-stats.md | 12 +- docs/sources/alerting/_index.md | 16 +- .../alerting/add-notification-template.md | 2 +- docs/sources/alerting/create-alerts.md | 16 +- docs/sources/alerting/notifications.md | 54 +- docs/sources/alerting/pause-an-alert-rule.md | 4 +- docs/sources/alerting/troubleshoot-alerts.md | 6 +- docs/sources/alerting/view-alerts.md | 8 +- docs/sources/auth/_index.md | 6 +- docs/sources/auth/auth-proxy.md | 70 +- docs/sources/auth/azuread.md | 38 +- docs/sources/auth/enhanced_ldap.md | 6 +- docs/sources/auth/generic-oauth.md | 60 +- docs/sources/auth/github.md | 24 +- docs/sources/auth/gitlab.md | 26 +- docs/sources/auth/google.md | 20 +- docs/sources/auth/jwt.md | 8 +- docs/sources/auth/ldap.md | 94 +- docs/sources/auth/okta.md | 22 +- docs/sources/auth/overview.md | 30 +- docs/sources/auth/{grafana.md => plutono.md} | 32 +- docs/sources/auth/saml.md | 10 +- docs/sources/auth/team-sync.md | 18 +- docs/sources/basics/_index.md | 12 +- docs/sources/basics/exemplars.md | 4 +- docs/sources/basics/glossary.md | 28 +- docs/sources/basics/intro-histograms.md | 6 +- docs/sources/basics/timeseries-dimensions.md | 12 +- docs/sources/basics/timeseries.md | 4 +- docs/sources/best-practices/_index.md | 4 +- .../best-practices-for-creating-dashboards.md | 10 +- .../best-practices-for-managing-dashboards.md | 4 +- .../common-observability-strategies.md | 6 +- .../dashboard-management-maturity-levels.md | 4 +- docs/sources/dashboards/_index.md | 8 +- docs/sources/dashboards/annotations.md | 12 +- docs/sources/dashboards/dashboard_folders.md | 8 +- docs/sources/dashboards/dashboard_history.md | 4 +- docs/sources/dashboards/export-import.md | 26 +- docs/sources/dashboards/json-model.md | 8 +- docs/sources/dashboards/playlist.md | 20 +- docs/sources/dashboards/reporting.md | 6 +- .../sources/dashboards/scripted-dashboards.md | 10 +- docs/sources/dashboards/search.md | 6 +- docs/sources/dashboards/shortcuts.md | 2 +- .../sources/dashboards/time-range-controls.md | 16 +- docs/sources/datasources/_index.md | 14 +- docs/sources/datasources/add-a-data-source.md | 6 +- docs/sources/datasources/azuremonitor.md | 66 +- docs/sources/datasources/cloudwatch.md | 66 +- docs/sources/datasources/elasticsearch.md | 30 +- .../google-cloud-monitoring/_index.md | 60 +- .../preconfig-cloud-monitoring-dashboards.md | 8 +- docs/sources/datasources/graphite.md | 38 +- docs/sources/datasources/influxdb.md | 44 +- docs/sources/datasources/influxdb/_index.md | 18 +- .../datasources/influxdb/influxdb-flux.md | 18 +- .../influxdb/influxdb-templates.md | 4 +- .../influxdb/provision-influxdb.md | 6 +- docs/sources/datasources/jaeger.md | 14 +- docs/sources/datasources/loki.md | 28 +- docs/sources/datasources/mssql.md | 52 +- docs/sources/datasources/mysql.md | 74 +- docs/sources/datasources/opentsdb.md | 14 +- docs/sources/datasources/postgres.md | 74 +- docs/sources/datasources/prometheus.md | 42 +- docs/sources/datasources/tempo.md | 8 +- docs/sources/datasources/testdata.md | 8 +- docs/sources/datasources/zipkin.md | 10 +- docs/sources/developers/_index.md | 4 +- docs/sources/developers/cla.md | 2 +- docs/sources/developers/contribute.md | 36 +- docs/sources/developers/plugins/_index.md | 18 +- ...-authentication-for-data-source-plugins.md | 16 +- .../plugins/add-query-editor-help.md | 4 +- .../plugins/add-support-for-annotations.md | 6 +- .../add-support-for-explore-queries.md | 6 +- .../plugins/add-support-for-variables.md | 14 +- .../developers/plugins/backend/_index.md | 36 +- .../plugins/backend/plugin-protocol.md | 14 +- ...for-go.md => plutono-plugin-sdk-for-go.md} | 10 +- .../build-a-logs-data-source-plugin.md | 14 +- .../build-a-streaming-data-source-plugin.md | 8 +- .../plugins/custom-panel-option-editors.md | 8 +- .../sources/developers/plugins/data-frames.md | 18 +- .../developers/plugins/error-handling.md | 4 +- .../developers/plugins/legacy/_index.md | 56 +- .../sources/developers/plugins/legacy/apps.md | 8 +- .../developers/plugins/legacy/data-sources.md | 10 +- .../legacy/defaults-and-editor-mode.md | 20 +- .../developers/plugins/legacy/panels.md | 8 +- .../plugins/legacy/review-guidelines.md | 32 +- .../plugins/legacy/snapshot-mode.md | 18 +- .../developers/plugins/legacy/style-guide.md | 24 +- docs/sources/developers/plugins/metadata.md | 20 +- .../developers/plugins/metadata.md.tpl | 4 +- .../developers/plugins/migration-guide.md | 56 +- .../developers/plugins/package-a-plugin.md | 10 +- .../developers/plugins/plugin.schema.json | 20 +- .../developers/plugins/sign-a-plugin.md | 40 +- .../plugins/working-with-data-frames.md | 4 +- docs/sources/enterprise/_index.md | 68 +- docs/sources/enterprise/auditing.md | 28 +- .../enterprise/datasource_permissions.md | 6 +- docs/sources/enterprise/enhanced_ldap.md | 24 +- .../enterprise/enterprise-configuration.md | 36 +- docs/sources/enterprise/export-pdf.md | 6 +- docs/sources/enterprise/license/_index.md | 8 +- .../enterprise/license/activate-license.md | 44 +- .../enterprise/license/license-expiration.md | 20 +- .../license/license-restrictions.md | 24 +- docs/sources/enterprise/query-caching.md | 10 +- docs/sources/enterprise/reporting.md | 32 +- docs/sources/enterprise/request-security.md | 12 +- docs/sources/enterprise/saml.md | 134 +- docs/sources/enterprise/team-sync.md | 22 +- .../enterprise/usage-insights/_index.md | 8 +- .../dashboard-datasource-insights.md | 8 +- .../enterprise/usage-insights/export-logs.md | 22 +- .../usage-insights/improved-search.md | 6 +- .../usage-insights/presence-indicator.md | 6 +- docs/sources/enterprise/vault.md | 40 +- docs/sources/enterprise/white-labeling.md | 28 +- docs/sources/explore/_index.md | 8 +- docs/sources/explore/logs-integration.md | 10 +- docs/sources/explore/query-management.md | 2 +- docs/sources/explore/trace-integration.md | 6 +- docs/sources/getting-started/_index.md | 34 +- .../getting-started-influxdb.md | 36 +- .../getting-started-prometheus.md | 22 +- .../getting-started/getting-started-sql.md | 26 +- .../getting-started/getting-started.md | 32 +- docs/sources/getting-started/glossary.md | 28 +- .../getting-started/intro-histograms.md | 4 +- .../getting-started/timeseries-dimensions.md | 12 +- docs/sources/getting-started/timeseries.md | 6 +- docs/sources/http_api/_index.md | 10 +- docs/sources/http_api/admin.md | 58 +- docs/sources/http_api/alerting.md | 6 +- .../alerting_notification_channels.md | 12 +- docs/sources/http_api/annotations.md | 16 +- docs/sources/http_api/auth.md | 14 +- .../http_api/create-api-tokens-for-org.md | 20 +- docs/sources/http_api/curl-examples.md | 6 +- docs/sources/http_api/dashboard.md | 24 +- .../sources/http_api/dashboard_permissions.md | 6 +- docs/sources/http_api/dashboard_versions.md | 6 +- docs/sources/http_api/data_source.md | 18 +- .../http_api/datasource_permissions.md | 6 +- docs/sources/http_api/external_group_sync.md | 14 +- docs/sources/http_api/folder.md | 10 +- .../http_api/folder_dashboard_search.md | 14 +- docs/sources/http_api/folder_permissions.md | 6 +- docs/sources/http_api/licensing.md | 20 +- docs/sources/http_api/org.md | 10 +- docs/sources/http_api/other.md | 24 +- docs/sources/http_api/playlist.md | 4 +- docs/sources/http_api/preferences.md | 6 +- docs/sources/http_api/reporting.md | 12 +- docs/sources/http_api/short_url.md | 8 +- docs/sources/http_api/snapshot.md | 8 +- docs/sources/http_api/team.md | 6 +- docs/sources/http_api/user.md | 30 +- docs/sources/installation/_index.md | 18 +- docs/sources/installation/debian.md | 90 +- docs/sources/installation/docker.md | 144 +- docs/sources/installation/kubernetes.md | 114 +- docs/sources/installation/mac.md | 36 +- docs/sources/installation/requirements.md | 32 +- ...{restart-grafana.md => restart-plutono.md} | 64 +- docs/sources/installation/rpm.md | 102 +- docs/sources/installation/upgrading.md | 120 +- docs/sources/installation/windows.md | 24 +- docs/sources/linking/_index.md | 4 +- docs/sources/linking/dashboard-links.md | 20 +- docs/sources/linking/data-link-variables.md | 6 +- docs/sources/linking/data-links.md | 4 +- docs/sources/linking/linking-overview.md | 8 +- docs/sources/linking/panel-links.md | 6 +- docs/sources/manage-users/_index.md | 10 +- .../manage-users/manage-teams/index.md | 8 +- docs/sources/manage-users/org-admin/index.md | 18 +- .../manage-users/server-admin/_index.md | 6 +- .../server-admin/server-admin-manage-orgs.md | 20 +- .../server-admin/server-admin-manage-users.md | 38 +- .../sources/manage-users/user-admin/_index.md | 4 +- .../user-admin/change-your-password.md | 14 +- .../manage-users/user-admin/switch-org.md | 2 +- .../manage-users/user-admin/user-profile.md | 22 +- docs/sources/panels/_index.md | 4 +- docs/sources/panels/add-a-panel.md | 6 +- docs/sources/panels/calculations-list.md | 2 +- docs/sources/panels/expressions.md | 6 +- docs/sources/panels/field-options/_index.md | 10 +- .../field-options/configure-all-fields.md | 2 +- .../configure-specific-fields.md | 2 +- .../field-options/standard-field-options.md | 20 +- docs/sources/panels/inspect-panel.md | 14 +- docs/sources/panels/panel-editor.md | 2 +- docs/sources/panels/queries.md | 22 +- docs/sources/panels/share-query-results.md | 6 +- docs/sources/panels/thresholds.md | 8 +- docs/sources/panels/transformations/_index.md | 8 +- .../transformations/apply-transformations.md | 4 +- .../panels/transformations/types-options.md | 26 +- docs/sources/panels/visualizations/_index.md | 2 +- .../panels/visualizations/alert-list-panel.md | 4 +- .../panels/visualizations/bar-gauge-panel.md | 12 +- .../visualizations/dashboard-list-panel.md | 4 +- .../panels/visualizations/gauge-panel.md | 8 +- .../panels/visualizations/graph-panel.md | 18 +- docs/sources/panels/visualizations/heatmap.md | 14 +- .../panels/visualizations/logs-panel.md | 8 +- .../panels/visualizations/news-panel.md | 2 +- .../panels/visualizations/node-graph.md | 6 +- .../panels/visualizations/pie-chart-panel.md | 2 +- .../panels/visualizations/stat-panel.md | 14 +- .../panels/visualizations/table/_index.md | 6 +- .../table/filter-table-columns.md | 8 +- .../table/table-field-options.md | 14 +- .../panels/visualizations/text-panel.md | 6 +- .../visualizations/time-series/_index.md | 10 +- .../time-series/change-axis-display.md | 10 +- .../time-series/graph-time-series-as-bars.md | 4 +- .../time-series/graph-time-series-as-lines.md | 6 +- .../graph-time-series-as-points.md | 2 +- docs/sources/permissions/_index.md | 26 +- .../dashboard-folder-permissions.md | 10 +- .../permissions/datasource_permissions.md | 6 +- .../sources/permissions/organization_roles.md | 14 +- .../sources/permissions/restricting-access.md | 2 +- docs/sources/plugins/_index.md | 12 +- docs/sources/plugins/installation.md | 20 +- docs/sources/plugins/plugin-signatures.md | 20 +- .../release-notes/release-notes-7-3-0.md | 8 +- .../release-notes/release-notes-7-3-1.md | 4 +- .../release-notes/release-notes-7-3-10.md | 4 +- .../release-notes/release-notes-7-3-2.md | 4 +- .../release-notes/release-notes-7-3-3.md | 4 +- .../release-notes/release-notes-7-3-4.md | 4 +- .../release-notes/release-notes-7-3-5.md | 4 +- .../release-notes/release-notes-7-3-6.md | 6 +- .../release-notes/release-notes-7-3-7.md | 4 +- .../release-notes/release-notes-7-4-0.md | 12 +- .../release-notes/release-notes-7-4-1.md | 4 +- .../release-notes/release-notes-7-4-2.md | 6 +- .../release-notes/release-notes-7-4-3.md | 4 +- .../release-notes/release-notes-7-4-5.md | 4 +- .../release-notes-7-5-0-beta1.md | 4 +- .../release-notes-7-5-0-beta2.md | 8 +- .../release-notes/release-notes-7-5-0.md | 4 +- .../release-notes/release-notes-7-5-1.md | 4 +- .../release-notes/release-notes-7-5-10.md | 4 +- .../release-notes/release-notes-7-5-11.md | 6 +- .../release-notes/release-notes-7-5-2.md | 4 +- .../release-notes/release-notes-7-5-3.md | 4 +- .../release-notes/release-notes-7-5-4.md | 4 +- .../release-notes/release-notes-7-5-5.md | 4 +- .../release-notes/release-notes-7-5-6.md | 4 +- .../release-notes/release-notes-7-5-7.md | 4 +- .../release-notes/release-notes-7-5-8.md | 4 +- .../release-notes/release-notes-7-5-9.md | 4 +- docs/sources/shared/basics/grafana-cloud.md | 9 - .../shared/basics/grafana-enterprise.md | 11 - docs/sources/shared/basics/plutono-cloud.md | 9 + .../shared/basics/plutono-enterprise.md | 11 + ...{what-is-grafana.md => what-is-plutono.md} | 6 +- .../shared/getting-started/first-step.md | 10 +- .../shared/manage-users/view-team-list.md | 2 +- .../preferences/select-timezone-list.md | 2 +- docs/sources/sharing/_index.md | 6 +- docs/sources/sharing/playlists.md | 18 +- docs/sources/sharing/share-dashboard.md | 16 +- docs/sources/sharing/share-panel.md | 20 +- docs/sources/troubleshooting/_index.md | 14 +- docs/sources/troubleshooting/diagnostics.md | 12 +- .../troubleshoot-dashboards.md | 14 +- .../troubleshooting/troubleshoot-queries.md | 6 +- docs/sources/variables/_index.md | 2 +- .../advanced-variable-format-options.md | 4 +- .../variables/filter-variables-with-regex.md | 4 +- .../formatting-multi-value-variables.md | 6 +- docs/sources/variables/inspect-variable.md | 6 +- docs/sources/variables/manage-variable.md | 4 +- .../variables/repeat-panels-or-rows.md | 18 +- docs/sources/variables/syntax.md | 6 +- docs/sources/variables/variable-examples.md | 24 +- .../variables/variable-selection-options.md | 2 +- .../variables/variable-types/_index.md | 2 +- .../variable-types/add-ad-hoc-filters.md | 2 +- .../variable-types/add-constant-variable.md | 4 +- .../variable-types/add-custom-variable.md | 6 +- .../add-data-source-variable.md | 4 +- .../variable-types/add-interval-variable.md | 8 +- .../variable-types/add-query-variable.md | 6 +- .../variable-types/add-text-box-variable.md | 6 +- .../variable-types/chained-variables.md | 20 +- .../variable-types/global-variables.md | 18 +- docs/sources/variables/variable-value-tags.md | 6 +- docs/sources/whatsnew/_index.md | 12 +- docs/sources/whatsnew/whats-new-in-v2-0.md | 64 +- docs/sources/whatsnew/whats-new-in-v2-1.md | 40 +- docs/sources/whatsnew/whats-new-in-v2-5.md | 24 +- docs/sources/whatsnew/whats-new-in-v2-6.md | 18 +- docs/sources/whatsnew/whats-new-in-v3-0.md | 78 +- docs/sources/whatsnew/whats-new-in-v3-1.md | 22 +- docs/sources/whatsnew/whats-new-in-v4-0.md | 40 +- docs/sources/whatsnew/whats-new-in-v4-1.md | 24 +- docs/sources/whatsnew/whats-new-in-v4-2.md | 28 +- docs/sources/whatsnew/whats-new-in-v4-3.md | 34 +- docs/sources/whatsnew/whats-new-in-v4-4.md | 14 +- docs/sources/whatsnew/whats-new-in-v4-5.md | 12 +- docs/sources/whatsnew/whats-new-in-v4-6.md | 22 +- docs/sources/whatsnew/whats-new-in-v5-0.md | 32 +- docs/sources/whatsnew/whats-new-in-v5-1.md | 40 +- docs/sources/whatsnew/whats-new-in-v5-2.md | 36 +- docs/sources/whatsnew/whats-new-in-v5-3.md | 36 +- docs/sources/whatsnew/whats-new-in-v5-4.md | 32 +- docs/sources/whatsnew/whats-new-in-v6-0.md | 56 +- docs/sources/whatsnew/whats-new-in-v6-1.md | 24 +- docs/sources/whatsnew/whats-new-in-v6-2.md | 28 +- docs/sources/whatsnew/whats-new-in-v6-3.md | 32 +- docs/sources/whatsnew/whats-new-in-v6-4.md | 44 +- docs/sources/whatsnew/whats-new-in-v6-5.md | 60 +- docs/sources/whatsnew/whats-new-in-v6-6.md | 56 +- docs/sources/whatsnew/whats-new-in-v6-7.md | 30 +- docs/sources/whatsnew/whats-new-in-v7-0.md | 84 +- docs/sources/whatsnew/whats-new-in-v7-1.md | 36 +- docs/sources/whatsnew/whats-new-in-v7-2.md | 34 +- docs/sources/whatsnew/whats-new-in-v7-3.md | 54 +- docs/sources/whatsnew/whats-new-in-v7-4.md | 54 +- docs/sources/whatsnew/whats-new-in-v7-5.md | 46 +- e2e/kill-server | 2 +- e2e/run-suite | 2 +- e2e/shared/smokeTestScenario.ts | 2 +- e2e/start-and-run-suite | 2 +- e2e/start-server | 12 +- e2e/suite1/specs/1-smoketests.spec.ts | 2 +- e2e/suite1/specs/bar-gauge.spec.ts | 4 +- e2e/suite1/specs/dashboard-templating.spec.ts | 2 +- e2e/suite1/specs/dashboard-time-zone.spec.ts | 2 +- e2e/suite1/specs/explore.spec.ts | 2 +- e2e/suite1/specs/gauge.spec.ts | 2 +- e2e/suite1/specs/inspect-drawer.spec.ts | 2 +- e2e/suite1/specs/panelEdit_base.spec.ts | 2 +- e2e/suite1/specs/panelEdit_queries.spec.ts | 2 +- e2e/suite1/specs/panelEdit_transforms.spec.ts | 2 +- e2e/suite1/specs/query-editor.spec.ts | 2 +- e2e/suite1/specs/select-focus.spec.ts | 2 +- e2e/suite1/specs/solo-route.spec.ts | 2 +- ...emplating-dashboard-links-and-variables.ts | 2 +- e2e/suite1/specs/trace-view-scrolling.spec.ts | 2 +- .../specs/variables/load-options-from-url.ts | 2 +- .../specs/variables/new-query-variable.ts | 2 +- .../specs/variables/set-options-from-ui.ts | 2 +- .../specs/variables/textbox-variables.ts | 2 +- e2e/suite1/tsconfig.json | 2 +- e2e/variables | 2 +- e2e/verify/specs/smoketests.spec.ts | 2 +- e2e/verify/tsconfig.json | 2 +- e2e/{wait-for-grafana => wait-for-plutono} | 2 +- emails/package.json | 4 +- emails/templates/invited_to_org.html | 2 +- emails/templates/layouts/default.html | 2 +- emails/templates/new_user_invite.html | 4 +- emails/templates/reset_password.html | 2 +- emails/templates/signup_started.html | 2 +- emails/templates/welcome_on_signup.html | 6 +- go.mod | 4 +- package.json | 28 +- packages/README.md | 38 +- packages/grafana-data/.eslintrc | 13 - packages/grafana-data/README.md | 5 - .../src/utils/testdata/testTheme.ts | 12 - packages/grafana-e2e-selectors/README.md | 3 - packages/grafana-e2e/README.md | 5 - packages/grafana-runtime/.eslintrc | 5 - packages/grafana-runtime/README.md | 5 - .../docker/grafana-plugin-ci-alpine/build.sh | 22 - .../docker/grafana-plugin-ci-alpine/common.sh | 7 - .../src/config/prettier.plugin.rc.js | 3 - packages/grafana-ui/README.md | 23 - .../src/themes/selectThemeVariant.ts | 10 - packages/grafana-ui/src/types/theme.ts | 5 - packages/jaeger-ui-components/package.json | 4 +- .../TraceTimelineViewer/SpanDetail/index.tsx | 2 +- .../TimelineHeaderRow/TimelineCollapser.tsx | 2 +- packages/plutono-data/grafana-data/.eslintrc | 13 + .../grafana-data/CHANGELOG.md | 0 packages/plutono-data/grafana-data/README.md | 5 + .../grafana-data/api-extractor.json | 0 .../{ => plutono-data}/grafana-data/index.js | 0 .../grafana-data/package.json | 10 +- .../grafana-data/rollup.config.ts | 2 +- .../src/dataframe/ArrayDataFrame.test.ts | 0 .../src/dataframe/ArrayDataFrame.ts | 0 .../src/dataframe/ArrowDataFrame.test.ts | 10 +- .../src/dataframe/ArrowDataFrame.ts | 4 +- .../src/dataframe/CircularDataFrame.ts | 0 .../src/dataframe/DataFrameView.test.ts | 0 .../src/dataframe/DataFrameView.ts | 0 .../src/dataframe/FieldCache.test.ts | 0 .../grafana-data/src/dataframe/FieldCache.ts | 0 .../src/dataframe/MutableDataFrame.test.ts | 0 .../src/dataframe/MutableDataFrame.ts | 0 .../__snapshots__/ArrowDataFrame.test.ts.snap | 4 +- .../__snapshots__/all_types.golden.arrow | Bin .../grafana-data/src/dataframe/dimensions.ts | 0 .../src/dataframe/frameComparisons.test.ts | 0 .../src/dataframe/frameComparisons.ts | 0 .../grafana-data/src/dataframe/index.ts | 0 .../src/dataframe/processDataFrame.test.ts | 0 .../src/dataframe/processDataFrame.ts | 0 .../grafana-data/src/dataframe/utils.ts | 0 .../grafana-data/src/datetime/common.ts | 2 +- .../src/datetime/datemath.test.ts | 0 .../grafana-data/src/datetime/datemath.ts | 0 .../grafana-data/src/datetime/formats.test.ts | 0 .../grafana-data/src/datetime/formats.ts | 0 .../src/datetime/formatter.test.ts | 0 .../grafana-data/src/datetime/formatter.ts | 2 +- .../grafana-data/src/datetime/index.ts | 0 .../src/datetime/moment_wrapper.ts | 0 .../grafana-data/src/datetime/parser.test.ts | 0 .../grafana-data/src/datetime/parser.ts | 4 +- .../src/datetime/rangeutil.test.ts | 0 .../grafana-data/src/datetime/rangeutil.ts | 2 +- .../src/datetime/timezones.test.ts | 0 .../grafana-data/src/datetime/timezones.ts | 0 .../grafana-data/src/events/EventBus.test.ts | 0 .../grafana-data/src/events/EventBus.ts | 0 .../grafana-data/src/events/eventFactory.ts | 0 .../grafana-data/src/events/index.ts | 0 .../grafana-data/src/events/types.ts | 0 .../src/field/FieldConfigOptionsRegistry.tsx | 0 .../src/field/displayProcessor.test.ts | 0 .../src/field/displayProcessor.ts | 4 +- .../grafana-data/src/field/fieldColor.test.ts | 0 .../grafana-data/src/field/fieldColor.ts | 12 +- .../grafana-data/src/field/fieldComparers.ts | 0 .../src/field/fieldDisplay.test.ts | 4 +- .../grafana-data/src/field/fieldDisplay.ts | 4 +- .../src/field/fieldOverrides.test.ts | 0 .../grafana-data/src/field/fieldOverrides.ts | 4 +- .../grafana-data/src/field/fieldState.test.ts | 0 .../grafana-data/src/field/fieldState.ts | 0 .../field/getFieldDisplayValuesProxy.test.tsx | 8 +- .../src/field/getFieldDisplayValuesProxy.ts | 4 +- .../grafana-data/src/field/index.ts | 0 .../src/field/overrides/processors.ts | 4 +- .../grafana-data/src/field/scale.test.ts | 0 .../grafana-data/src/field/scale.ts | 4 +- .../standardFieldConfigEditorRegistry.ts | 0 .../src/field/templateProxies.test.ts | 0 .../grafana-data/src/field/templateProxies.ts | 0 .../grafana-data/src/field/thresholds.test.ts | 0 .../grafana-data/src/field/thresholds.ts | 0 .../grafana-data/src/index.ts | 2 +- .../src/panel/PanelPlugin.test.tsx | 0 .../grafana-data/src/panel/PanelPlugin.ts | 4 +- .../src/panel/registryFactories.ts | 0 .../grafana-data/src/text/index.ts | 0 .../grafana-data/src/text/markdown.test.ts | 0 .../grafana-data/src/text/markdown.ts | 0 .../grafana-data/src/text/sanitize.ts | 0 .../grafana-data/src/text/string.test.ts | 0 .../grafana-data/src/text/string.ts | 0 .../grafana-data/src/text/text.test.ts | 0 .../grafana-data/src/text/text.ts | 0 .../src/transformations/fieldReducer.test.ts | 0 .../src/transformations/fieldReducer.ts | 0 .../grafana-data/src/transformations/index.ts | 0 .../src/transformations/matchers.ts | 0 .../matchers/fieldTypeMatcher.test.ts | 0 .../matchers/fieldTypeMatcher.ts | 0 .../src/transformations/matchers/ids.ts | 0 .../transformations/matchers/matchers.test.ts | 0 .../matchers/nameMatcher.test.ts | 0 .../transformations/matchers/nameMatcher.ts | 0 .../matchers/predicates.test.ts | 0 .../transformations/matchers/predicates.ts | 0 .../transformations/matchers/refIdMatcher.ts | 0 .../matchers/simpleFieldMatcher.ts | 0 .../valueMatchers/equalMatchers.test.ts | 0 .../matchers/valueMatchers/equalMatchers.ts | 0 .../valueMatchers/nullMatchers.test.ts | 0 .../matchers/valueMatchers/nullMatchers.ts | 0 .../valueMatchers/numericMatchers.test.ts | 0 .../matchers/valueMatchers/numericMatchers.ts | 0 .../valueMatchers/rangeMatchers.test.ts | 0 .../matchers/valueMatchers/rangeMatchers.ts | 0 .../valueMatchers/regexMatchers.test.ts | 0 .../matchers/valueMatchers/regexMatchers.ts | 0 .../matchers/valueMatchers/types.ts | 0 .../standardTransformersRegistry.ts | 0 .../src/transformations/transformDataFrame.ts | 0 .../src/transformations/transformers.ts | 0 .../transformers/calculateField.test.ts | 0 .../transformers/calculateField.ts | 0 .../transformers/concat.test.ts | 0 .../transformations/transformers/concat.ts | 0 .../transformers/ensureColumns.test.ts | 0 .../transformers/ensureColumns.ts | 0 .../transformers/filter.test.ts | 0 .../transformations/transformers/filter.ts | 0 .../transformers/filterByName.test.ts | 0 .../transformers/filterByName.ts | 0 .../transformers/filterByRefId.test.ts | 0 .../transformers/filterByRefId.ts | 0 .../transformers/filterByValue.test.ts | 0 .../transformers/filterByValue.ts | 0 .../transformers/groupBy.test.ts | 2 +- .../transformations/transformers/groupBy.ts | 0 .../src/transformations/transformers/ids.ts | 0 .../transformers/joinDataFrames.test.ts | 0 .../transformers/joinDataFrames.ts | 0 .../transformers/labelsToFields.test.ts | 0 .../transformers/labelsToFields.ts | 0 .../transformers/merge.test.ts | 0 .../src/transformations/transformers/merge.ts | 0 .../src/transformations/transformers/noop.ts | 0 .../transformers/order.test.ts | 2 +- .../src/transformations/transformers/order.ts | 0 .../transformers/organize.test.ts | 2 +- .../transformations/transformers/organize.ts | 0 .../transformers/reduce.test.ts | 0 .../transformations/transformers/reduce.ts | 0 .../transformers/rename.test.ts | 2 +- .../transformations/transformers/rename.ts | 0 .../transformers/renameByRegex.test.ts | 2 +- .../transformers/renameByRegex.ts | 0 .../transformers/seriesToColumns.test.ts | 2 +- .../transformers/seriesToColumns.ts | 0 .../transformers/seriesToRows.test.ts | 0 .../transformers/seriesToRows.ts | 0 .../transformers/sortBy.test.ts | 2 +- .../transformations/transformers/sortBy.ts | 0 .../src/types/OptionsUIRegistryBuilder.ts | 0 .../grafana-data/src/types/ScopedVars.ts | 0 .../grafana-data/src/types/annotations.ts | 2 +- .../grafana-data/src/types/app.ts | 4 +- .../grafana-data/src/types/config.ts | 24 +- .../grafana-data/src/types/data.ts | 2 +- .../grafana-data/src/types/dataFrame.ts | 0 .../grafana-data/src/types/dataLink.ts | 2 +- .../grafana-data/src/types/datasource.ts | 6 +- .../grafana-data/src/types/displayValue.ts | 0 .../grafana-data/src/types/explore.ts | 0 .../grafana-data/src/types/fieldColor.ts | 0 .../grafana-data/src/types/fieldOverrides.ts | 6 +- .../grafana-data/src/types/flot.ts | 0 .../grafana-data/src/types/geometry.ts | 0 .../grafana-data/src/types/graph.ts | 0 .../grafana-data/src/types/index.ts | 2 +- .../grafana-data/src/types/legacyEvents.ts | 0 .../grafana-data/src/types/live.ts | 2 +- .../grafana-data/src/types/logs.ts | 0 .../grafana-data/src/types/navModel.ts | 0 .../grafana-data/src/types/options.ts | 0 .../grafana-data/src/types/orgs.ts | 0 .../grafana-data/src/types/panel.ts | 0 .../grafana-data/src/types/plugin.ts | 10 +- .../grafana-data/src/types/select.ts | 0 .../grafana-data/src/types/templateVars.ts | 0 .../grafana-data/src/types/theme.ts | 8 +- .../grafana-data/src/types/thresholds.ts | 0 .../grafana-data/src/types/time.ts | 0 .../grafana-data/src/types/trace.ts | 0 .../grafana-data/src/types/transformations.ts | 2 +- .../grafana-data/src/types/valueMapping.ts | 0 .../grafana-data/src/types/variables.ts | 0 .../grafana-data/src/types/vector.ts | 0 .../src/utils/OptionsUIBuilders.ts | 0 .../grafana-data/src/utils/Registry.test.ts | 0 .../grafana-data/src/utils/Registry.ts | 0 .../src/utils/__snapshots__/csv.test.ts.snap | 0 .../grafana-data/src/utils/binaryOperators.ts | 0 .../grafana-data/src/utils/csv.test.ts | 0 .../grafana-data/src/utils/csv.ts | 0 .../grafana-data/src/utils/dataLinks.test.ts | 0 .../grafana-data/src/utils/dataLinks.ts | 2 +- .../grafana-data/src/utils/datasource.ts | 0 .../src/utils/deprecationWarning.test.ts | 0 .../src/utils/deprecationWarning.ts | 0 .../grafana-data/src/utils/docs.ts | 0 .../grafana-data/src/utils/fieldParser.ts | 0 .../grafana-data/src/utils/flotPairs.test.ts | 0 .../grafana-data/src/utils/flotPairs.ts | 2 +- .../grafana-data/src/utils/index.ts | 0 .../grafana-data/src/utils/labels.test.ts | 0 .../grafana-data/src/utils/labels.ts | 0 .../grafana-data/src/utils/location.test.ts | 4 +- .../grafana-data/src/utils/location.ts | 14 +- .../grafana-data/src/utils/logs.test.ts | 0 .../grafana-data/src/utils/logs.ts | 0 .../src/utils/namedColorsPalette.test.ts | 4 +- .../src/utils/namedColorsPalette.ts | 20 +- .../grafana-data/src/utils/object.ts | 0 .../grafana-data/src/utils/series.test.ts | 0 .../grafana-data/src/utils/series.ts | 0 .../src/utils/testdata/roundtrip.csv | 0 .../src/utils/testdata/simple.csv | 0 .../src/utils/testdata/testTheme.ts | 12 + .../src/utils/testdata/withHeaders.csv | 0 .../src/utils/tests/mockStandardProperties.ts | 0 .../tests/mockTransformationsRegistry.ts | 0 .../grafana-data/src/utils/url.test.ts | 0 .../grafana-data/src/utils/url.ts | 0 .../src/utils/valueMappings.test.ts | 0 .../grafana-data/src/utils/valueMappings.ts | 0 .../valueFormats/arithmeticFormatters.test.ts | 0 .../src/valueFormats/arithmeticFormatters.ts | 0 .../src/valueFormats/categories.ts | 0 .../valueFormats/dateTimeFormatters.test.ts | 0 .../src/valueFormats/dateTimeFormatters.ts | 0 .../grafana-data/src/valueFormats/index.ts | 0 .../src/valueFormats/symbolFormatters.test.ts | 0 .../src/valueFormats/symbolFormatters.ts | 0 .../src/valueFormats/valueFormats.test.ts | 0 .../src/valueFormats/valueFormats.ts | 0 .../src/vector/AppendedVectors.test.ts | 0 .../src/vector/AppendedVectors.ts | 0 .../grafana-data/src/vector/ArrayVector.ts | 0 .../grafana-data/src/vector/AsNumberVector.ts | 0 .../src/vector/BinaryOperationVector.test.ts | 0 .../src/vector/BinaryOperationVector.ts | 0 .../src/vector/CircularVector.test.ts | 0 .../grafana-data/src/vector/CircularVector.ts | 0 .../src/vector/ConstantVector.test.ts | 0 .../grafana-data/src/vector/ConstantVector.ts | 0 .../src/vector/FormattedVector.ts | 0 .../src/vector/FunctionalVector.ts | 0 .../grafana-data/src/vector/IndexVector.ts | 0 .../grafana-data/src/vector/RowVector.ts | 0 .../grafana-data/src/vector/SortedVector.ts | 0 .../grafana-data/src/vector/index.ts | 0 .../grafana-data/src/vector/vectorToArray.ts | 0 .../grafana-data/tsconfig.build.json | 0 .../grafana-data/tsconfig.json | 0 .../grafana-data/typings/jest/index.d.ts | 0 .../grafana-e2e-selectors/CHANGELOG.md | 0 .../grafana-e2e-selectors/README.md | 3 + .../grafana-e2e-selectors/api-extractor.json | 0 .../grafana-e2e-selectors/index.js | 0 .../grafana-e2e-selectors/package.json | 12 +- .../grafana-e2e-selectors/rollup.config.ts | 0 .../grafana-e2e-selectors/src/index.ts | 2 +- .../src/selectors/components.ts | 0 .../src/selectors/index.ts | 0 .../src/selectors/pages.ts | 0 .../grafana-e2e-selectors/src/types/index.ts | 0 .../src/types/selectors.ts | 0 .../grafana-e2e-selectors/tsconfig.build.json | 0 .../grafana-e2e-selectors/tsconfig.json | 0 .../{ => plutono-e2e}/grafana-e2e/.gitignore | 0 .../grafana-e2e/CHANGELOG.md | 0 packages/plutono-e2e/grafana-e2e/README.md | 5 + .../grafana-e2e/api-extractor.json | 0 .../grafana-e2e/bin/plutono-e2e.js} | 0 packages/{ => plutono-e2e}/grafana-e2e/cli.js | 0 .../grafana-e2e/cypress.json | 0 .../grafana-e2e/cypress/fixtures/example.json | 0 .../cypress/fixtures/long-trace-response.json | 0 .../cypress/plugins/compareScreenshots.js | 0 .../cypress/plugins/extendConfig.js | 2 +- .../grafana-e2e/cypress/plugins/index.js | 0 .../cypress/plugins/readProvisions.js | 0 .../cypress/plugins/typescriptPreprocessor.js | 0 .../grafana-e2e/cypress/support/commands.ts | 0 .../grafana-e2e/cypress/support/index.d.ts | 0 .../grafana-e2e/cypress/support/index.ts | 2 +- .../grafana-e2e/cypress/tsconfig.json | 0 .../{ => plutono-e2e}/grafana-e2e/index.js | 0 .../grafana-e2e/package.json | 18 +- .../grafana-e2e/rollup.config.ts | 2 +- .../grafana-e2e/src/components/index.ts | 0 .../grafana-e2e/src/flows/addDashboard.ts | 0 .../grafana-e2e/src/flows/addDataSource.ts | 0 .../grafana-e2e/src/flows/addPanel.ts | 0 .../src/flows/assertSuccessNotification.ts | 0 .../grafana-e2e/src/flows/configurePanel.ts | 4 +- .../grafana-e2e/src/flows/deleteDashboard.ts | 0 .../grafana-e2e/src/flows/deleteDataSource.ts | 0 .../grafana-e2e/src/flows/editPanel.ts | 0 .../grafana-e2e/src/flows/explore.ts | 0 .../grafana-e2e/src/flows/index.ts | 0 .../grafana-e2e/src/flows/login.ts | 0 .../grafana-e2e/src/flows/openDashboard.ts | 0 .../src/flows/openPanelMenuItem.ts | 0 .../grafana-e2e/src/flows/revertAllChanges.ts | 0 .../grafana-e2e/src/flows/saveDashboard.ts | 0 .../grafana-e2e/src/flows/selectOption.ts | 0 .../src/flows/setDashboardTimeRange.ts | 0 .../grafana-e2e/src/flows/setTimeRange.ts | 0 .../grafana-e2e/src/index.ts | 4 +- .../grafana-e2e/src/support/index.ts | 0 .../grafana-e2e/src/support/localStorage.ts | 0 .../grafana-e2e/src/support/scenario.ts | 2 +- .../src/support/scenarioContext.ts | 0 .../grafana-e2e/src/support/selector.ts | 0 .../grafana-e2e/src/support/types.ts | 2 +- .../grafana-e2e/src/support/url.ts | 0 .../grafana-e2e/src/typings/index.ts | 0 .../grafana-e2e/src/typings/undo.ts | 0 .../test/cypress/integration/0.cli.ts | 0 .../test/cypress/integration/1.api.ts | 0 .../grafana-e2e/test/cypress/tsconfig.json | 2 +- .../grafana-e2e/tsconfig.build.json | 0 .../grafana-e2e/tsconfig.json | 0 .../plutono-runtime/grafana-runtime/.eslintrc | 5 + .../grafana-runtime/CHANGELOG.md | 0 .../plutono-runtime/grafana-runtime/README.md | 5 + .../grafana-runtime/api-extractor.json | 0 .../grafana-runtime/index.js | 0 .../grafana-runtime/package.json | 16 +- .../grafana-runtime/rollup.config.ts | 2 +- .../grafana-runtime/src/config.ts | 26 +- .../grafana-runtime/src/index.ts | 2 +- .../src/measurement/collector.test.ts | 0 .../src/measurement/collector.ts | 2 +- .../grafana-runtime/src/measurement/index.ts | 0 .../grafana-runtime/src/measurement/query.ts | 10 +- .../grafana-runtime/src/measurement/types.ts | 2 +- .../src/services/AngularLoader.ts | 2 +- .../grafana-runtime/src/services/EchoSrv.ts | 8 +- .../src/services/LocationSrv.ts | 6 +- .../src/services/backendSrv.ts | 10 +- .../src/services/dataSourceSrv.ts | 6 +- .../grafana-runtime/src/services/index.ts | 0 .../src/services/legacyAngularInjector.ts | 2 +- .../grafana-runtime/src/services/live.ts | 16 +- .../src/services/templateSrv.ts | 4 +- .../grafana-runtime/src/types/analytics.ts | 0 .../grafana-runtime/src/types/index.ts | 0 .../src/utils/DataSourceWithBackend.test.ts | 2 +- .../src/utils/DataSourceWithBackend.ts | 4 +- .../grafana-runtime/src/utils/analytics.ts | 0 .../grafana-runtime/src/utils/logging.ts | 0 .../grafana-runtime/src/utils/plugin.ts | 2 +- .../src/utils/queryResponse.test.ts | 2 +- .../src/utils/queryResponse.ts | 2 +- .../grafana-runtime/tsconfig.build.json | 0 .../grafana-runtime/tsconfig.json | 0 .../grafana-toolkit/.eslintrc | 2 +- .../grafana-toolkit/CHANGELOG.md | 16 +- .../grafana-toolkit/README.md | 138 +- .../grafana-toolkit/bin/plutono-toolkit.js} | 6 +- .../config/circleci/config.yml | 38 +- .../plutono-plugin-ci-alpine}/Dockerfile | 0 .../plutono-plugin-ci-alpine}/README.md | 22 +- .../docker/plutono-plugin-ci-alpine/build.sh | 22 + .../docker/plutono-plugin-ci-alpine/common.sh | 7 + .../plutono-plugin-ci-alpine}/install/bin/cp | 0 .../install/bin/ginstall | 18 +- .../install/bin/githubRelease.js | 0 .../scripts/deploy-common.sh | 0 .../scripts/deploy-user.sh | 0 .../scripts/deploy.sh | 8 +- .../test/docker-compose.yml | 6 +- .../plutono-plugin-ci-alpine}/test/start.sh | 0 .../docker/plutono-plugin-ci-e2e}/Dockerfile | 0 .../docker/plutono-plugin-ci-e2e}/README.md | 20 +- .../docker/plutono-plugin-ci-e2e}/build.sh | 14 +- .../docker/plutono-plugin-ci-e2e}/common.sh | 2 +- .../plutono-plugin-ci-e2e}/install/ginstall | 18 +- .../scripts/deploy-common.sh | 0 .../scripts/deploy-slim.sh | 0 .../scripts/deploy-user.sh | 0 .../plutono-plugin-ci-e2e}/scripts/deploy.sh | 2 +- .../test/docker-compose.yml | 6 +- .../plutono-plugin-ci-e2e}/test/start.sh | 0 .../docker/plutono-plugin-ci}/Dockerfile | 0 .../docker/plutono-plugin-ci}/README.md | 20 +- .../docker/plutono-plugin-ci}/build.sh | 0 .../docker/plutono-plugin-ci}/common.sh | 2 +- .../docker/plutono-plugin-ci}/install/gget | 10 +- .../scripts/deploy-common.sh | 0 .../plutono-plugin-ci}/scripts/deploy-user.sh | 0 .../plutono-plugin-ci}/scripts/deploy.sh | 2 +- .../test/docker-compose.yml | 2 +- .../docker/plutono-plugin-ci}/test/start.sh | 0 .../grafana-toolkit/package.json | 18 +- .../grafana-toolkit/src/cli/index.d.ts | 0 .../grafana-toolkit/src/cli/index.ts | 10 +- .../src/cli/tasks/changelog.ts | 18 +- .../src/cli/tasks/cherrypick.ts | 0 .../src/cli/tasks/closeMilestone.ts | 0 .../src/cli/tasks/component.create.ts | 0 .../src/cli/tasks/core.start.ts | 2 +- .../src/cli/tasks/nodeVersionChecker.ts | 0 .../src/cli/tasks/package.build.ts | 16 +- .../src/cli/tasks/plugin.build.ts | 10 +- .../src/cli/tasks/plugin.ci.ts | 30 +- .../src/cli/tasks/plugin.create.ts | 6 +- .../src/cli/tasks/plugin.dev.ts | 6 +- .../src/cli/tasks/plugin.sign.ts | 0 .../src/cli/tasks/plugin.tests.ts | 0 .../src/cli/tasks/plugin.update.ts | 2 +- .../src/cli/tasks/plugin.utils.ts | 0 .../src/cli/tasks/plugin/bundle.managed.ts | 0 .../src/cli/tasks/plugin/bundle.ts | 2 +- .../src/cli/tasks/plugin/create.ts | 10 +- .../test_exclude_image_suffix_in_manifest.png | 0 .../src/cli/tasks/plugin/tests.ts | 0 .../src/cli/tasks/searchTestDataSetup.ts | 0 .../grafana-toolkit/src/cli/tasks/task.ts | 0 .../grafana-toolkit/src/cli/tasks/template.ts | 0 .../src/cli/tasks/toolkit.build.ts | 6 +- .../templates/component.test.tsx.template.ts | 0 .../cli/templates/component.tsx.template.ts | 0 .../src/cli/templates/docs.mdx.template.ts | 2 +- .../src/cli/templates/index.ts | 0 .../src/cli/templates/story.tsx.template.ts | 2 +- .../grafana-toolkit/src/cli/tsconfig.json | 0 .../grafana-toolkit/src/cli/utils/execTask.ts | 0 .../src/cli/utils/githubClient.test.ts | 16 +- .../src/cli/utils/githubClient.ts | 8 +- .../src/cli/utils/githubRelease.test.ts | 0 .../src/cli/utils/githubRelease.ts | 0 .../src/cli/utils/pascalCase.ts | 0 .../grafana-toolkit/src/cli/utils/prompt.ts | 0 .../grafana-toolkit/src/cli/utils/rmdir.ts | 0 .../src/cli/utils/useSpinner.ts | 0 .../src/config/eslint.plugin.json | 0 .../grafana-toolkit/src/config/index.ts | 0 .../src/config/jest.plugin.config.local.js | 2 +- .../src/config/jest.plugin.config.test.ts | 0 .../src/config/jest.plugin.config.ts | 4 +- .../mocks/jestSetup/noOverrides/package.json | 0 .../mocks/jestSetup/overrides/package.json | 0 .../unsupportedOverrides/package.json | 0 .../duplicates/src/styles/dark.css | 0 .../duplicates/src/styles/dark.scss | 0 .../duplicates/src/styles/light.css | 0 .../missing-theme-file/src/styles/light.css | 0 .../no-theme-files/src/styles/whatever.css | 0 .../stylesheetsSupport/ok/src/styles/dark.css | 0 .../ok/src/styles/light.css | 0 .../mocks/webpack/noOverride/package.json | 0 .../mocks/webpack/overrides/package.json | 0 .../mocks/webpack/overrides/webpack.config.js | 0 .../webpack/overridesNamedExport/package.json | 0 .../overridesNamedExport/webpack.config.js | 0 .../webpack/unsupportedOverride/package.json | 0 .../unsupportedOverride/webpack.config.js | 0 .../src/config/prettier.plugin.config.json | 0 .../src/config/prettier.plugin.rc.js | 3 + .../grafana-toolkit/src/config/styles.mock.js | 0 .../src/config/tsconfig.plugin.json | 0 .../src/config/tsconfig.plugin.local.json | 2 +- .../src/config/utils/getPluginId.ts | 0 .../src/config/utils/pluginValidation.test.ts | 0 .../src/config/utils/pluginValidation.ts | 2 +- .../src/config/webpack.plugin.config.test.ts | 0 .../src/config/webpack.plugin.config.ts | 8 +- .../src/config/webpack/loaders.test.ts | 0 .../src/config/webpack/loaders.ts | 0 .../grafana-toolkit/src/plugins/env.ts | 4 +- .../grafana-toolkit/src/plugins/index.ts | 0 .../grafana-toolkit/src/plugins/manifest.ts | 12 +- .../grafana-toolkit/src/plugins/types.ts | 6 +- .../grafana-toolkit/src/plugins/utils.ts | 4 +- .../grafana-toolkit/src/plugins/workflow.ts | 0 .../grafana-toolkit/tsconfig.json | 0 .../{ => plutono-ui}/grafana-ui/.eslintrc | 2 +- .../grafana-ui/.storybook/main.ts | 2 +- .../grafana-ui/.storybook/manager-head.html | 0 .../grafana-ui/.storybook/preview.ts | 14 +- .../grafana-ui/.storybook/static/fav32.png | Bin .../.storybook/static/plutono_icon.svg} | 0 .../grafana-ui/.storybook/storybookTheme.ts | 14 +- .../grafana-ui/.storybook/tsconfig.json | 0 .../{ => plutono-ui}/grafana-ui/CHANGELOG.md | 42 +- packages/plutono-ui/grafana-ui/README.md | 23 + .../grafana-ui/api-extractor.json | 0 packages/{ => plutono-ui}/grafana-ui/index.js | 0 .../{ => plutono-ui}/grafana-ui/package.json | 18 +- .../grafana-ui/rollup.config.ts | 6 +- .../grafana-ui/src/Intro.story.mdx | 22 +- .../grafana-ui/src/components/Alert/Alert.mdx | 0 .../src/components/Alert/Alert.story.tsx | 2 +- .../grafana-ui/src/components/Alert/Alert.tsx | 6 +- .../components/AlphaNotice/AlphaNotice.mdx | 0 .../AlphaNotice/AlphaNotice.story.tsx | 2 +- .../components/AlphaNotice/AlphaNotice.tsx | 2 +- .../grafana-ui/src/components/Badge/Badge.mdx | 0 .../src/components/Badge/Badge.story.tsx | 2 +- .../grafana-ui/src/components/Badge/Badge.tsx | 4 +- .../components/BarChart/BarChart.story.tsx | 2 +- .../src/components/BarChart/BarChart.tsx | 2 +- .../BarChart/__snapshots__/utils.test.ts.snap | 0 .../src/components/BarChart/bars.ts | 0 .../src/components/BarChart/distribute.ts | 0 .../src/components/BarChart/quadtree.ts | 0 .../src/components/BarChart/types.ts | 2 +- .../src/components/BarChart/utils.test.ts | 8 +- .../src/components/BarChart/utils.ts | 6 +- .../src/components/BarGauge/BarGauge.mdx | 4 +- .../components/BarGauge/BarGauge.story.tsx | 4 +- .../src/components/BarGauge/BarGauge.test.tsx | 2 +- .../src/components/BarGauge/BarGauge.tsx | 4 +- .../__snapshots__/BarGauge.test.tsx.snap | 0 .../src/components/BigValue/BigValue.mdx | 4 +- .../components/BigValue/BigValue.story.tsx | 2 +- .../src/components/BigValue/BigValue.test.tsx | 0 .../src/components/BigValue/BigValue.tsx | 2 +- .../BigValue/BigValueLayout.test.tsx | 2 +- .../components/BigValue/BigValueLayout.tsx | 2 +- .../__snapshots__/BigValue.test.tsx.snap | 0 .../src/components/Button/Button.mdx | 0 .../src/components/Button/Button.story.tsx | 0 .../src/components/Button/Button.tsx | 8 +- .../src/components/Button/ButtonGroup.tsx | 4 +- .../Button/FullWidthButtonContainer.tsx | 0 .../components/Button/ToolbarButton.story.tsx | 4 +- .../src/components/Button/ToolbarButton.tsx | 6 +- .../components/Button/ToolbarButtonRow.tsx | 4 +- .../grafana-ui/src/components/Button/index.ts | 0 .../ButtonCascader/ButtonCascader.story.tsx | 2 +- .../ButtonCascader/ButtonCascader.tsx | 4 +- .../ButtonCascader/_ButtonCascader.scss | 0 .../CallToActionCard.story.internal.tsx | 0 .../CallToActionCard.test.tsx | 0 .../CallToActionCard/CallToActionCard.tsx | 4 +- .../CallToActionCard.test.tsx.snap | 0 .../grafana-ui/src/components/Card/Card.mdx | 74 +- .../src/components/Card/Card.story.tsx | 14 +- .../src/components/Card/Card.test.tsx | 0 .../grafana-ui/src/components/Card/Card.tsx | 6 +- .../src/components/Cascader/Cascader.mdx | 0 .../components/Cascader/Cascader.story.tsx | 2 +- .../src/components/Cascader/Cascader.test.tsx | 0 .../src/components/Cascader/Cascader.tsx | 2 +- .../src/components/Cascader/optionMappings.ts | 0 .../src/components/Chart/Tooltip.tsx | 2 +- .../src/components/Chart/TooltipContainer.tsx | 6 +- .../grafana-ui/src/components/Chart/index.tsx | 0 .../ClickOutsideWrapper.mdx | 0 .../ClickOutsideWrapper.story.tsx | 0 .../ClickOutsideWrapper.tsx | 0 .../ClipboardButton/ClipboardButton.mdx | 0 .../ClipboardButton.story.internal.tsx | 0 .../ClipboardButton/ClipboardButton.tsx | 0 .../Collapse/CollapsableSection.mdx | 0 .../Collapse/CollapsableSection.story.tsx | 0 .../Collapse/CollapsableSection.tsx | 4 +- .../src/components/Collapse/Collapse.mdx | 0 .../components/Collapse/Collapse.story.tsx | 0 .../src/components/Collapse/Collapse.tsx | 4 +- .../src/components/ColorPicker/ColorInput.tsx | 0 .../components/ColorPicker/ColorPicker.mdx | 2 +- .../ColorPicker/ColorPicker.story.tsx | 2 +- .../ColorPicker/ColorPicker.test.tsx | 0 .../components/ColorPicker/ColorPicker.tsx | 4 +- .../ColorPicker/ColorPickerPopover.story.tsx | 0 .../ColorPicker/ColorPickerPopover.test.tsx | 2 +- .../ColorPicker/ColorPickerPopover.tsx | 6 +- .../ColorPicker/ColorPickerTrigger.tsx | 0 .../ColorPicker/NamedColorsGroup.tsx | 2 +- .../ColorPicker/NamedColorsPalette.story.tsx | 0 .../ColorPicker/NamedColorsPalette.test.tsx | 4 +- .../ColorPicker/NamedColorsPalette.tsx | 2 +- .../ColorPicker/SeriesColorPickerPopover.tsx | 0 .../ColorPicker/SpectrumPalette.story.tsx | 0 .../ColorPicker/SpectrumPalette.tsx | 4 +- .../ColorPicker/SpectrumPalettePointer.tsx | 0 .../warnAboutColorPickerPropsDeprecation.ts | 2 +- .../ConfirmButton/ConfirmButton.mdx | 2 +- .../ConfirmButton/ConfirmButton.story.tsx | 2 +- .../ConfirmButton/ConfirmButton.test.tsx | 0 .../ConfirmButton/ConfirmButton.tsx | 4 +- .../components/ConfirmButton/DeleteButton.tsx | 0 .../components/ConfirmModal/ConfirmModal.mdx | 0 .../ConfirmModal/ConfirmModal.story.tsx | 2 +- .../ConfirmModal/ConfirmModal.test.tsx | 0 .../components/ConfirmModal/ConfirmModal.tsx | 4 +- .../components/ContextMenu/ContextMenu.mdx | 0 .../ContextMenu/ContextMenu.story.tsx | 0 .../components/ContextMenu/ContextMenu.tsx | 0 .../ContextMenu/WithContextMenu.tsx | 0 .../CustomScrollbar/CustomScrollbar.test.tsx | 0 .../CustomScrollbar/CustomScrollbar.tsx | 4 +- .../CustomScrollbar.test.tsx.snap | 0 .../components/DataLinks/DataLinkButton.tsx | 2 +- .../components/DataLinks/DataLinkEditor.tsx | 4 +- .../components/DataLinks/DataLinkInput.tsx | 4 +- .../DataLinks/DataLinkSuggestions.tsx | 4 +- .../DataLinks/DataLinksContextMenu.test.tsx | 2 +- .../DataLinks/DataLinksContextMenu.tsx | 4 +- .../DataLinkEditorModalContent.tsx | 2 +- .../DataLinksInlineEditor.tsx | 4 +- .../DataLinksListItem.test.tsx | 0 .../DataLinksListItem.tsx | 4 +- .../components/DataLinks/FieldLinkList.tsx | 4 +- .../DataLinks/SelectionReference.ts | 0 .../DataSourceSettings/BasicAuthSettings.tsx | 0 .../DataSourceSettings/CertificationKey.tsx | 0 .../CustomHeadersSettings.test.tsx | 2 +- .../CustomHeadersSettings.tsx | 2 +- .../DataSourceHttpSettings.mdx | 2 +- .../DataSourceHttpSettings.story.tsx | 4 +- .../DataSourceHttpSettings.tsx | 12 +- .../DataSourceSettings/HttpProxySettings.tsx | 0 .../DataSourceSettings/SigV4AuthSettings.tsx | 6 +- .../DataSourceSettings/TLSAuthSettings.tsx | 4 +- .../components/DataSourceSettings/types.ts | 2 +- .../src/components/Drawer/Drawer.mdx | 4 +- .../src/components/Drawer/Drawer.story.tsx | 2 +- .../src/components/Drawer/Drawer.tsx | 6 +- .../src/components/Drawer/_Drawer.scss | 0 .../Dropdown/ButtonSelect.story.internal.tsx | 2 +- .../src/components/Dropdown/ButtonSelect.tsx | 4 +- .../EmptySearchResult/EmptySearchResult.mdx | 2 +- .../EmptySearchResult.story.tsx | 2 +- .../EmptySearchResult/EmptySearchResult.tsx | 4 +- .../ErrorBoundary/ErrorBoundary.mdx | 6 +- .../ErrorBoundary/ErrorBoundary.story.tsx | 2 +- .../ErrorBoundary/ErrorBoundary.test.tsx | 0 .../ErrorBoundary/ErrorBoundary.tsx | 0 .../ErrorBoundary/ErrorWithStack.tsx | 0 .../src/components/FileUpload/FileUpload.mdx | 2 +- .../FileUpload/FileUpload.story.tsx | 2 +- .../components/FileUpload/FileUpload.test.tsx | 0 .../src/components/FileUpload/FileUpload.tsx | 4 +- .../src/components/FilterPill/FilterPill.mdx | 2 +- .../FilterPill/FilterPill.story.tsx | 2 +- .../src/components/FilterPill/FilterPill.tsx | 4 +- .../FormField/FormField.story.internal.tsx | 0 .../components/FormField/FormField.test.tsx | 0 .../src/components/FormField/FormField.tsx | 6 +- .../__snapshots__/FormField.test.tsx.snap | 0 .../src/components/FormLabel/FormLabel.tsx | 0 .../FormattedValueDisplay.mdx | 0 .../FormattedValueDisplay.story.tsx | 2 +- .../FormattedValueDisplay.tsx | 2 +- .../src/components/Forms/Checkbox.mdx | 2 +- .../src/components/Forms/Checkbox.story.tsx | 0 .../src/components/Forms/Checkbox.tsx | 4 +- .../grafana-ui/src/components/Forms/Field.mdx | 2 +- .../src/components/Forms/Field.story.tsx | 0 .../src/components/Forms/Field.test.tsx | 0 .../grafana-ui/src/components/Forms/Field.tsx | 4 +- .../src/components/Forms/FieldArray.mdx | 2 +- .../src/components/Forms/FieldArray.story.tsx | 2 +- .../src/components/Forms/FieldArray.tsx | 0 .../src/components/Forms/FieldSet.mdx | 2 +- .../src/components/Forms/FieldSet.story.tsx | 2 +- .../src/components/Forms/FieldSet.tsx | 4 +- .../Forms/FieldValidationMessage.mdx | 0 .../Forms/FieldValidationMessage.story.tsx | 0 .../Forms/FieldValidationMessage.tsx | 4 +- .../grafana-ui/src/components/Forms/Form.mdx | 6 +- .../src/components/Forms/Form.story.tsx | 2 +- .../grafana-ui/src/components/Forms/Form.tsx | 0 .../src/components/Forms/InlineField.mdx | 0 .../components/Forms/InlineField.story.tsx | 0 .../src/components/Forms/InlineField.test.tsx | 0 .../src/components/Forms/InlineField.tsx | 4 +- .../src/components/Forms/InlineFieldRow.mdx | 0 .../components/Forms/InlineFieldRow.story.tsx | 0 .../src/components/Forms/InlineFieldRow.tsx | 4 +- .../src/components/Forms/InlineLabel.mdx | 0 .../components/Forms/InlineLabel.story.tsx | 0 .../src/components/Forms/InlineLabel.tsx | 4 +- .../components/Forms/InlineSegmentGroup.tsx | 4 +- .../grafana-ui/src/components/Forms/Label.mdx | 2 +- .../src/components/Forms/Label.story.tsx | 0 .../grafana-ui/src/components/Forms/Label.tsx | 4 +- .../Legacy/Input/Input.story.internal.tsx | 0 .../Forms/Legacy/Input/Input.test.tsx | 0 .../components/Forms/Legacy/Input/Input.tsx | 0 .../Input/__snapshots__/Input.test.tsx.snap | 0 .../Legacy/Select/IndicatorsContainer.tsx | 0 .../Forms/Legacy/Select/NoOptionsMessage.tsx | 0 .../Legacy/Select/Select.story.internal.tsx | 2 +- .../components/Forms/Legacy/Select/Select.tsx | 2 +- .../Forms/Legacy/Select/SelectOption.test.tsx | 0 .../Forms/Legacy/Select/SelectOption.tsx | 0 .../Forms/Legacy/Select/_Select.scss | 0 .../__snapshots__/SelectOption.test.tsx.snap | 0 .../components/Forms/Legacy/Switch/Switch.mdx | 0 .../Legacy/Switch/Switch.story.internal.tsx | 0 .../components/Forms/Legacy/Switch/Switch.tsx | 0 .../src/components/Forms/Legend.mdx | 2 +- .../src/components/Forms/Legend.story.tsx | 2 +- .../src/components/Forms/Legend.tsx | 4 +- .../Forms/RadioButtonGroup/RadioButton.tsx | 4 +- .../RadioButtonGroup/RadioButtonGroup.mdx | 2 +- .../RadioButtonGroup.story.tsx | 0 .../RadioButtonGroup/RadioButtonGroup.tsx | 2 +- .../src/components/Forms/commonStyles.ts | 8 +- .../src/components/Forms/getFormStyles.ts | 4 +- .../grafana-ui/src/components/Forms/types.ts | 0 .../src/components/Gauge/Gauge.test.tsx | 2 +- .../grafana-ui/src/components/Gauge/Gauge.tsx | 2 +- .../src/components/Graph/Graph.story.tsx | 4 +- .../src/components/Graph/Graph.test.tsx | 2 +- .../grafana-ui/src/components/Graph/Graph.tsx | 2 +- .../src/components/Graph/GraphContextMenu.tsx | 2 +- .../components/Graph/GraphSeriesToggler.tsx | 2 +- .../Graph/GraphTooltip/GraphTooltip.tsx | 0 .../MultiModeGraphTooltip.test.tsx | 2 +- .../GraphTooltip/MultiModeGraphTooltip.tsx | 2 +- .../Graph/GraphTooltip/SeriesTable.tsx | 4 +- .../GraphTooltip/SingleModeGraphTooltip.tsx | 2 +- .../components/Graph/GraphTooltip/types.ts | 2 +- .../Graph/GraphWithLegend.story.tsx | 2 +- .../src/components/Graph/GraphWithLegend.tsx | 2 +- .../grafana-ui/src/components/Graph/types.ts | 0 .../src/components/Graph/utils.test.ts | 2 +- .../grafana-ui/src/components/Graph/utils.ts | 2 +- .../src/components/GraphNG/GraphNG.story.tsx | 2 +- .../src/components/GraphNG/GraphNG.tsx | 2 +- .../GraphNG/__snapshots__/utils.test.ts.snap | 0 .../src/components/GraphNG/hooks.ts | 2 +- .../src/components/GraphNG/types.ts | 2 +- .../src/components/GraphNG/utils.test.ts | 6 +- .../src/components/GraphNG/utils.ts | 6 +- .../grafana-ui/src/components/Icon/Icon.mdx | 2 +- .../src/components/Icon/Icon.story.tsx | 2 +- .../grafana-ui/src/components/Icon/Icon.tsx | 6 +- .../src/components/Icon/assets/Apps.tsx | 0 .../src/components/Icon/assets/Bell.tsx | 0 .../src/components/Icon/assets/Circle.tsx | 0 .../src/components/Icon/assets/Cog.tsx | 0 .../src/components/Icon/assets/Favorite.tsx | 0 .../src/components/Icon/assets/Folder.tsx | 0 .../src/components/Icon/assets/FolderPlus.tsx | 0 .../src/components/Icon/assets/Heart.tsx | 0 .../src/components/Icon/assets/HeartBreak.tsx | 0 .../src/components/Icon/assets/Import.tsx | 0 .../src/components/Icon/assets/PanelAdd.tsx | 0 .../src/components/Icon/assets/PlusSquare.tsx | 0 .../src/components/Icon/assets/Plutono.tsx} | 2 +- .../components/Icon/assets/ReusablePanel.tsx | 0 .../src/components/Icon/assets/Shield.tsx | 0 .../components/Icon/assets/SquareShape.tsx | 0 .../src/components/Icon/assets/index.ts | 2 +- .../src/components/Icon/assets/types.ts | 0 .../src/components/Icon/custom/index.tsx | 0 .../src/components/IconButton/IconButton.mdx | 2 +- .../IconButton/IconButton.story.tsx | 6 +- .../src/components/IconButton/IconButton.tsx | 6 +- .../src/components/InfoBox/FeatureInfoBox.tsx | 4 +- .../src/components/InfoBox/InfoBox.mdx | 0 .../src/components/InfoBox/InfoBox.story.tsx | 6 +- .../src/components/InfoBox/InfoBox.tsx | 6 +- .../src/components/InfoBox/panelArt_dark.svg | 0 .../src/components/InfoBox/panelArt_light.svg | 0 .../InfoTooltip.story.internal.tsx | 0 .../components/InfoTooltip/InfoTooltip.tsx | 0 .../grafana-ui/src/components/Input/Input.mdx | 0 .../src/components/Input/Input.story.tsx | 4 +- .../grafana-ui/src/components/Input/Input.tsx | 4 +- .../src/components/InputControl.tsx | 0 .../JSONFormatter/JSONFormatter.tsx | 0 .../JSONFormatter/json_explorer/helpers.ts | 0 .../json_explorer/json_explorer.ts | 0 .../src/components/Layout/Layout.mdx | 0 .../src/components/Layout/Layout.story.tsx | 2 +- .../src/components/Layout/Layout.tsx | 6 +- .../src/components/List/AbstractList.test.tsx | 0 .../src/components/List/AbstractList.tsx | 0 .../src/components/List/InlineList.tsx | 0 .../components/List/List.story.internal.tsx | 0 .../grafana-ui/src/components/List/List.tsx | 0 .../__snapshots__/AbstractList.test.tsx.snap | 0 .../LoadingPlaceholder/LoadingPlaceholder.mdx | 0 .../LoadingPlaceholder.story.tsx | 0 .../LoadingPlaceholder/LoadingPlaceholder.tsx | 4 +- .../src/components/Logs/LogDetails.test.tsx | 4 +- .../src/components/Logs/LogDetails.tsx | 8 +- .../components/Logs/LogDetailsRow.test.tsx | 4 +- .../src/components/Logs/LogDetailsRow.tsx | 4 +- .../src/components/Logs/LogLabelStats.tsx | 4 +- .../src/components/Logs/LogLabelStatsRow.tsx | 4 +- .../src/components/Logs/LogLabels.test.tsx | 0 .../src/components/Logs/LogLabels.tsx | 4 +- .../components/Logs/LogMessageAnsi.test.tsx | 0 .../src/components/Logs/LogMessageAnsi.tsx | 0 .../grafana-ui/src/components/Logs/LogRow.tsx | 6 +- .../components/Logs/LogRowContext.test.tsx | 2 +- .../src/components/Logs/LogRowContext.tsx | 4 +- .../Logs/LogRowContextProvider.test.tsx | 2 +- .../components/Logs/LogRowContextProvider.tsx | 2 +- .../src/components/Logs/LogRowMessage.tsx | 4 +- .../Logs/LogRowMessageDetectedFields.tsx | 2 +- .../src/components/Logs/LogRows.test.tsx | 2 +- .../src/components/Logs/LogRows.tsx | 2 +- .../src/components/Logs/getLogRowStyles.ts | 4 +- .../src/components/Logs/logParser.ts | 2 +- .../FieldNameByRegexMatcherEditor.tsx | 2 +- .../MatchersUI/FieldNameMatcherEditor.tsx | 2 +- .../MatchersUI/FieldNamesMatcherEditor.tsx | 2 +- .../MatchersUI/FieldTypeMatcherEditor.tsx | 2 +- .../MatchersUI/FieldsByFrameRefIdMatcher.tsx | 2 +- .../components/MatchersUI/fieldMatchersUI.ts | 2 +- .../src/components/MatchersUI/types.ts | 2 +- .../components/Menu/Menu.story.internal.tsx | 0 .../grafana-ui/src/components/Menu/Menu.tsx | 4 +- .../grafana-ui/src/components/Modal/Modal.mdx | 0 .../src/components/Modal/Modal.story.tsx | 2 +- .../src/components/Modal/Modal.test.tsx | 0 .../grafana-ui/src/components/Modal/Modal.tsx | 0 .../src/components/Modal/ModalHeader.tsx | 0 .../src/components/Modal/ModalTabContent.tsx | 0 .../src/components/Modal/ModalTabsHeader.tsx | 0 .../src/components/Modal/ModalsContext.tsx | 0 .../src/components/Modal/getModalStyles.ts | 4 +- .../src/components/Monaco/CodeEditor.mdx | 0 .../Monaco/CodeEditor.story.internal.tsx | 0 .../src/components/Monaco/CodeEditor.tsx | 0 .../src/components/Monaco/CodeEditorLazy.tsx | 0 .../src/components/Monaco/suggestions.test.ts | 0 .../src/components/Monaco/suggestions.ts | 0 .../grafana-ui/src/components/Monaco/types.ts | 0 .../grafana-ui/src/components/Monaco/utils.ts | 2 +- .../src/components/NodeGraph/Edge.tsx | 0 .../components/NodeGraph/EdgeArrowMarker.tsx | 0 .../src/components/NodeGraph/EdgeLabel.tsx | 4 +- .../src/components/NodeGraph/Node.tsx | 4 +- .../components/NodeGraph/NodeGraph.test.tsx | 0 .../src/components/NodeGraph/NodeGraph.tsx | 4 +- .../src/components/NodeGraph/ViewControls.tsx | 4 +- .../src/components/NodeGraph/index.ts | 0 .../src/components/NodeGraph/layout.ts | 0 .../src/components/NodeGraph/types.ts | 0 .../NodeGraph/useCategorizeFrames.ts | 2 +- .../components/NodeGraph/useContextMenu.tsx | 4 +- .../src/components/NodeGraph/useNodeLimit.ts | 0 .../src/components/NodeGraph/usePanning.ts | 0 .../src/components/NodeGraph/useZoom.ts | 0 .../src/components/NodeGraph/utils.test.ts | 0 .../src/components/NodeGraph/utils.ts | 2 +- .../src/components/OptionsUI/color.tsx | 4 +- .../src/components/OptionsUI/fieldColor.tsx | 8 +- .../src/components/OptionsUI/links.tsx | 2 +- .../src/components/OptionsUI/mappings.tsx | 2 +- .../src/components/OptionsUI/multiSelect.tsx | 2 +- .../src/components/OptionsUI/number.tsx | 2 +- .../src/components/OptionsUI/select.tsx | 2 +- .../src/components/OptionsUI/slider.tsx | 2 +- .../src/components/OptionsUI/stats.tsx | 2 +- .../src/components/OptionsUI/string.tsx | 2 +- .../src/components/OptionsUI/strings.tsx | 4 +- .../src/components/OptionsUI/thresholds.tsx | 2 +- .../src/components/OptionsUI/units.tsx | 2 +- .../PageLayout/PageToolbar.story.tsx | 2 +- .../src/components/PageLayout/PageToolbar.tsx | 6 +- .../src/components/Pagination/Pagination.mdx | 0 .../Pagination/Pagination.story.tsx | 2 +- .../src/components/Pagination/Pagination.tsx | 0 .../components/PieChart/PieChart.story.tsx | 2 +- .../src/components/PieChart/PieChart.tsx | 8 +- .../src/components/Portal/Portal.tsx | 0 .../QueryField/QueryField.story.tsx | 2 +- .../components/QueryField/QueryField.test.tsx | 0 .../src/components/QueryField/QueryField.tsx | 2 +- .../RefreshPicker/RefreshPicker.story.tsx | 2 +- .../RefreshPicker/RefreshPicker.test.tsx | 0 .../RefreshPicker/RefreshPicker.tsx | 4 +- .../RefreshPicker/_RefreshPicker.scss | 0 .../SecretFormField.story.internal.tsx | 0 .../SecretFormField/SecretFormField.tsx | 0 .../src/components/Segment/Segment.story.tsx | 2 +- .../src/components/Segment/Segment.tsx | 2 +- .../components/Segment/SegmentAsync.story.tsx | 4 +- .../src/components/Segment/SegmentAsync.tsx | 2 +- .../components/Segment/SegmentInput.story.tsx | 2 +- .../src/components/Segment/SegmentInput.tsx | 0 .../src/components/Segment/SegmentSelect.tsx | 2 +- .../src/components/Segment/index.ts | 0 .../src/components/Segment/styles.ts | 4 +- .../src/components/Segment/types.ts | 0 .../components/Segment/useExpandableLabel.tsx | 0 .../components/Select/DropdownIndicator.tsx | 0 .../components/Select/IndicatorsContainer.tsx | 0 .../src/components/Select/InputControl.tsx | 4 +- .../src/components/Select/MultiValue.tsx | 0 .../src/components/Select/Select.mdx | 8 +- .../src/components/Select/Select.story.tsx | 4 +- .../src/components/Select/Select.tsx | 2 +- .../src/components/Select/SelectBase.test.tsx | 2 +- .../src/components/Select/SelectBase.tsx | 0 .../src/components/Select/SelectMenu.tsx | 2 +- .../components/Select/SelectOptionGroup.tsx | 4 +- .../src/components/Select/SingleValue.tsx | 4 +- .../src/components/Select/ValueContainer.tsx | 4 +- .../src/components/Select/getSelectStyles.ts | 28 +- .../src/components/Select/mockOptions.tsx | 2 +- .../components/Select/resetSelectStyles.ts | 0 .../grafana-ui/src/components/Select/types.ts | 2 +- .../src/components/Select/utils.test.ts | 2 +- .../grafana-ui/src/components/Select/utils.ts | 2 +- .../components/SetInterval/SetInterval.tsx | 2 +- .../SingleStatBaseOptions.test.ts | 2 +- .../SingleStatShared/SingleStatBaseOptions.ts | 2 +- .../src/components/SingleStatShared/index.ts | 0 .../src/components/Slider/RangeSlider.mdx | 0 .../components/Slider/RangeSlider.story.tsx | 2 +- .../components/Slider/RangeSlider.test.tsx | 0 .../src/components/Slider/RangeSlider.tsx | 0 .../src/components/Slider/Slider.mdx | 0 .../src/components/Slider/Slider.story.tsx | 2 +- .../src/components/Slider/Slider.test.tsx | 0 .../src/components/Slider/Slider.tsx | 0 .../src/components/Slider/_Slider.scss | 0 .../src/components/Slider/styles.ts | 6 +- .../grafana-ui/src/components/Slider/types.ts | 0 .../src/components/Sparkline/Sparkline.tsx | 2 +- .../src/components/Sparkline/utils.ts | 2 +- .../src/components/Spinner/Spinner.mdx | 0 .../src/components/Spinner/Spinner.story.tsx | 2 +- .../src/components/Spinner/Spinner.tsx | 0 .../StatsPicker/StatsPicker.story.tsx | 2 +- .../components/StatsPicker/StatsPicker.tsx | 2 +- .../src/components/Switch/Switch.mdx | 2 +- .../src/components/Switch/Switch.story.tsx | 2 +- .../src/components/Switch/Switch.tsx | 4 +- .../TabbedContainer/TabbedContainer.tsx | 4 +- .../src/components/Table/BarGaugeCell.tsx | 2 +- .../src/components/Table/DefaultCell.tsx | 2 +- .../src/components/Table/Filter.tsx | 4 +- .../src/components/Table/FilterActions.tsx | 0 .../src/components/Table/FilterList.tsx | 4 +- .../src/components/Table/FilterPopup.tsx | 4 +- .../src/components/Table/ImageCell.tsx | 0 .../src/components/Table/JSONViewCell.tsx | 4 +- .../grafana-ui/src/components/Table/Table.mdx | 0 .../src/components/Table/Table.story.tsx | 8 +- .../src/components/Table/Table.test.tsx | 2 +- .../grafana-ui/src/components/Table/Table.tsx | 2 +- .../src/components/Table/TableCell.tsx | 2 +- .../grafana-ui/src/components/Table/styles.ts | 4 +- .../grafana-ui/src/components/Table/types.ts | 2 +- .../src/components/Table/utils.test.ts | 2 +- .../grafana-ui/src/components/Table/utils.ts | 2 +- .../TableInputCSV.story.internal.tsx | 2 +- .../TableInputCSV/TableInputCSV.test.tsx | 2 +- .../TableInputCSV/TableInputCSV.tsx | 4 +- .../src/components/Tabs/Counter.tsx | 4 +- .../grafana-ui/src/components/Tabs/Tab.tsx | 6 +- .../src/components/Tabs/TabContent.tsx | 4 +- .../src/components/Tabs/Tabs.story.tsx | 2 +- .../src/components/Tabs/TabsBar.mdx | 0 .../src/components/Tabs/TabsBar.tsx | 4 +- .../grafana-ui/src/components/Tags/Tag.mdx | 2 +- .../src/components/Tags/Tag.story.tsx | 2 +- .../grafana-ui/src/components/Tags/Tag.tsx | 4 +- .../src/components/Tags/TagList.mdx | 2 +- .../src/components/Tags/TagList.story.tsx | 0 .../src/components/Tags/TagList.tsx | 0 .../src/components/TagsInput/TagItem.tsx | 4 +- .../src/components/TagsInput/TagsInput.mdx | 0 .../components/TagsInput/TagsInput.story.tsx | 2 +- .../src/components/TagsInput/TagsInput.tsx | 4 +- .../src/components/TextArea/TextArea.mdx | 0 .../components/TextArea/TextArea.story.tsx | 2 +- .../src/components/TextArea/TextArea.tsx | 4 +- .../components/ThemeColors/Colors.story.tsx | 0 .../src/components/ThemeColors/Colors.tsx | 0 .../ThemeColors/ThemeColors.story.tsx | 0 .../components/ThemeColors/ThemeColors.tsx | 0 .../ThresholdsEditor.story.tsx | 2 +- .../ThresholdsEditor.test.tsx | 2 +- .../ThresholdsEditorNew/ThresholdsEditor.tsx | 6 +- .../TimePicker/TimeOfDayPicker.story.tsx | 4 +- .../components/TimePicker/TimeOfDayPicker.tsx | 4 +- .../components/TimePicker/TimeRangeInput.mdx | 4 +- .../TimePicker/TimeRangeInput.story.tsx | 4 +- .../components/TimePicker/TimeRangeInput.tsx | 4 +- .../TimePicker/TimeRangePicker.story.tsx | 4 +- .../TimePicker/TimeRangePicker.test.tsx | 2 +- .../components/TimePicker/TimeRangePicker.tsx | 8 +- .../TimePickerCalendar.test.tsx | 2 +- .../TimeRangePicker/TimePickerCalendar.tsx | 10 +- .../TimePickerContent.test.tsx | 2 +- .../TimeRangePicker/TimePickerContent.tsx | 10 +- .../TimeRangePicker/TimePickerFooter.tsx | 6 +- .../TimeRangePicker/TimePickerTitle.tsx | 4 +- .../TimeRangePicker/TimeRangeForm.tsx | 2 +- .../TimeRangePicker/TimeRangeList.tsx | 2 +- .../TimeRangePicker/TimeRangeOption.tsx | 4 +- .../TimePicker/TimeRangePicker/mapper.ts | 2 +- .../TimePicker/TimeZonePicker.story.tsx | 2 +- .../components/TimePicker/TimeZonePicker.tsx | 2 +- .../TimeZonePicker/TimeZoneDescription.tsx | 4 +- .../TimeZonePicker/TimeZoneGroup.tsx | 4 +- .../TimeZonePicker/TimeZoneOffset.tsx | 4 +- .../TimeZonePicker/TimeZoneOption.tsx | 4 +- .../TimeZonePicker/TimeZoneTitle.tsx | 4 +- .../TimePicker/_TimeOfDayPicker.scss | 0 .../src/components/TimePicker/rangeOptions.ts | 2 +- .../ToggleButtonGroup.story.internal.tsx | 0 .../ToggleButtonGroup/ToggleButtonGroup.tsx | 0 .../src/components/Tooltip/Popover.tsx | 0 .../components/Tooltip/PopoverController.tsx | 0 .../src/components/Tooltip/Tooltip.mdx | 0 .../src/components/Tooltip/Tooltip.story.tsx | 0 .../src/components/Tooltip/Tooltip.test.tsx | 0 .../src/components/Tooltip/Tooltip.tsx | 0 .../src/components/Tooltip/_Tooltip.scss | 0 .../__snapshots__/Tooltip.test.tsx.snap | 0 .../components/Typeahead/Typeahead.test.tsx | 0 .../src/components/Typeahead/Typeahead.tsx | 0 .../Typeahead/TypeaheadInfo.test.tsx | 0 .../components/Typeahead/TypeaheadInfo.tsx | 4 +- .../components/Typeahead/TypeaheadItem.tsx | 4 +- .../src/components/UnitPicker/UnitPicker.mdx | 0 .../UnitPicker/UnitPicker.story.tsx | 2 +- .../src/components/UnitPicker/UnitPicker.tsx | 2 +- .../ValueMappingsEditor/MappingRow.tsx | 2 +- .../ValueMappingsEditor.story.tsx | 0 .../ValueMappingsEditor.test.tsx | 2 +- .../ValueMappingsEditor.tsx | 2 +- .../components/ValuePicker/ValuePicker.mdx | 0 .../ValuePicker/ValuePicker.story.tsx | 2 +- .../components/ValuePicker/ValuePicker.tsx | 4 +- .../components/VizLayout/VizLayout.story.tsx | 0 .../src/components/VizLayout/VizLayout.tsx | 0 .../src/components/VizLegend/SeriesIcon.tsx | 0 .../components/VizLegend/VizLegend.story.tsx | 6 +- .../src/components/VizLegend/VizLegend.tsx | 0 .../components/VizLegend/VizLegendList.tsx | 4 +- .../VizLegend/VizLegendListItem.tsx | 4 +- .../VizLegend/VizLegendSeriesIcon.tsx | 0 .../VizLegend/VizLegendStatsList.tsx | 2 +- .../components/VizLegend/VizLegendTable.tsx | 4 +- .../VizLegend/VizLegendTableItem.tsx | 4 +- .../src/components/VizLegend/types.ts | 2 +- .../components/VizRepeater/VizRepeater.tsx | 2 +- .../grafana-ui/src/components/index.scss | 0 .../grafana-ui/src/components/index.ts | 0 .../components/transitions/FadeTransition.tsx | 0 .../transitions/SlideOutTransition.tsx | 0 .../grafana-ui/src/components/uPlot/Plot.scss | 0 .../src/components/uPlot/Plot.test.tsx | 2 +- .../grafana-ui/src/components/uPlot/Plot.tsx | 0 .../src/components/uPlot/PlotLegend.tsx | 2 +- .../grafana-ui/src/components/uPlot/config.ts | 2 +- .../uPlot/config/UPlotAxisBuilder.ts | 4 +- .../uPlot/config/UPlotConfigBuilder.test.ts | 4 +- .../uPlot/config/UPlotConfigBuilder.ts | 2 +- .../uPlot/config/UPlotScaleBuilder.test.ts | 0 .../uPlot/config/UPlotScaleBuilder.ts | 0 .../uPlot/config/UPlotSeriesBuilder.ts | 4 +- .../components/uPlot/config/gradientFills.ts | 4 +- .../src/components/uPlot/context.ts | 0 .../uPlot/geometries/EventsCanvas.tsx | 2 +- .../components/uPlot/geometries/Marker.tsx | 0 .../components/uPlot/geometries/XYCanvas.tsx | 0 .../src/components/uPlot/geometries/index.ts | 0 .../src/components/uPlot/hooks.test.ts | 0 .../grafana-ui/src/components/uPlot/hooks.ts | 0 .../uPlot/plugins/AnnotationsEditorPlugin.tsx | 0 .../components/uPlot/plugins/ClickPlugin.tsx | 2 +- .../components/uPlot/plugins/CursorPlugin.tsx | 0 .../uPlot/plugins/SelectionPlugin.tsx | 0 .../uPlot/plugins/TooltipPlugin.tsx | 2 +- .../components/uPlot/plugins/ZoomPlugin.tsx | 0 .../src/components/uPlot/plugins/index.ts | 0 .../grafana-ui/src/components/uPlot/types.ts | 2 +- .../src/components/uPlot/utils.test.ts | 0 .../grafana-ui/src/components/uPlot/utils.ts | 2 +- .../grafana-ui/src/index.scss | 0 .../{ => plutono-ui}/grafana-ui/src/index.ts | 2 +- .../src/slate-plugins/braces.test.tsx | 0 .../grafana-ui/src/slate-plugins/braces.ts | 0 .../src/slate-plugins/clear.test.tsx | 0 .../grafana-ui/src/slate-plugins/clear.ts | 0 .../grafana-ui/src/slate-plugins/clipboard.ts | 0 .../src/slate-plugins/indentation.ts | 0 .../grafana-ui/src/slate-plugins/index.ts | 0 .../grafana-ui/src/slate-plugins/newline.ts | 0 .../src/slate-plugins/runner.test.tsx | 0 .../grafana-ui/src/slate-plugins/runner.ts | 0 .../src/slate-plugins/selection_shortcuts.ts | 0 .../slate-plugins/slate-prism/TOKEN_MARK.ts | 0 .../src/slate-plugins/slate-prism/index.ts | 0 .../src/slate-plugins/slate-prism/options.tsx | 0 .../src/slate-plugins/suggestions.tsx | 0 .../src/themes/ThemeContext.test.tsx | 2 +- .../grafana-ui/src/themes/ThemeContext.tsx | 16 +- .../src/themes/_variables.dark.scss.tmpl.ts | 6 +- .../src/themes/_variables.light.scss.tmpl.ts | 6 +- .../src/themes/_variables.scss.tmpl.ts | 8 +- .../grafana-ui/src/themes/dark.ts | 8 +- .../grafana-ui/src/themes/default.ts | 6 +- .../grafana-ui/src/themes/getTheme.ts | 6 +- .../grafana-ui/src/themes/index.ts | 0 .../grafana-ui/src/themes/light.ts | 8 +- .../grafana-ui/src/themes/mixins.ts | 12 +- .../src/themes/selectThemeVariant.test.ts | 6 +- .../src/themes/selectThemeVariant.ts | 10 + .../src/themes/stylesFactory.test.ts | 0 .../grafana-ui/src/themes/stylesFactory.ts | 2 +- .../grafana-ui/src/types/completion.ts | 0 .../grafana-ui/src/types/forms.ts | 0 .../grafana-ui/src/types/icon.ts | 4 +- .../grafana-ui/src/types/index.ts | 0 .../grafana-ui/src/types/input.ts | 0 .../grafana-ui/src/types/jquery.d.ts | 0 .../grafana-ui/src/types/mdx.d.ts | 0 .../grafana-ui/src/types/orientation.ts | 0 .../grafana-ui/src/types/size.ts | 0 .../grafana-ui/src/types/storybook.ts | 0 .../plutono-ui/grafana-ui/src/types/theme.ts | 5 + .../grafana-ui/src/utils/ansicolor.ts | 0 .../grafana-ui/src/utils/children.ts | 0 .../grafana-ui/src/utils/colors.ts | 4 +- .../grafana-ui/src/utils/dataLinks.ts | 2 +- .../grafana-ui/src/utils/dom.ts | 0 .../src/utils/generatedFileBanner.ts | 0 .../grafana-ui/src/utils/index.ts | 0 .../grafana-ui/src/utils/measureText.ts | 0 .../src/utils/renderOrCallToRender.ts | 0 .../grafana-ui/src/utils/scrollbar.ts | 0 .../grafana-ui/src/utils/slate.ts | 0 .../grafana-ui/src/utils/squares.ts | 0 .../grafana-ui/src/utils/standardEditors.tsx | 2 +- .../utils/storybook/DashboardStoryCanvas.tsx | 0 .../src/utils/storybook/StoryExample.tsx | 0 .../src/utils/storybook/UseState.tsx | 0 .../grafana-ui/src/utils/storybook/data.ts | 4 +- .../grafana-ui/src/utils/storybook/knobs.ts | 0 .../src/utils/storybook/noopControl.tsx | 0 .../grafana-ui/src/utils/storybook/useSize.ts | 0 .../src/utils/storybook/withCenteredStory.tsx | 0 .../src/utils/storybook/withPaddedStory.tsx | 0 .../utils/storybook/withRightAlignedStory.tsx | 0 .../utils/storybook/withStoryContainer.tsx | 0 .../src/utils/storybook/withTheme.tsx | 6 +- .../grafana-ui/src/utils/tags.ts | 0 .../grafana-ui/src/utils/typeahead.ts | 8 +- .../src/utils/useAsyncDependency.ts | 0 .../grafana-ui/src/utils/useClientRect.ts | 0 .../src/utils/useComponetInstanceId.ts | 0 .../utils/useDelayedSwitch.story.internal.tsx | 0 .../grafana-ui/src/utils/useDelayedSwitch.ts | 0 .../grafana-ui/src/utils/validate.test.ts | 0 .../grafana-ui/src/utils/validate.ts | 0 .../grafana-ui/tsconfig.build.json | 0 .../{ => plutono-ui}/grafana-ui/tsconfig.json | 2 +- packaging/conf/nfpm.yaml | 22 +- packaging/deb/control/postinst | 74 +- packaging/deb/default/grafana-server | 24 - packaging/deb/default/plutono-server | 24 + .../init.d/{grafana-server => plutono-server} | 46 +- ...-server.service => plutono-server.service} | 18 +- packaging/docker/Dockerfile | 30 +- packaging/docker/README.md | 16 +- packaging/docker/build-enterprise.sh | 30 +- packaging/docker/build.sh | 34 +- packaging/docker/custom/Dockerfile | 90 +- packaging/docker/custom/ubuntu.Dockerfile | 98 +- packaging/docker/push_to_docker_hub.sh | 32 +- packaging/docker/run.sh | 8 +- packaging/docker/ubuntu.Dockerfile | 32 +- packaging/mac/bin/{grafana => plutono} | 18 +- packaging/publish/publish_both.sh | 26 +- packaging/publish/publish_testing.sh | 16 +- packaging/rpm/control/postinst | 90 +- packaging/rpm/control/posttrans | 28 +- .../init.d/{grafana-server => plutono-server} | 44 +- packaging/rpm/sysconfig/grafana-server | 24 - packaging/rpm/sysconfig/plutono-server | 24 + ...-server.service => plutono-server.service} | 18 +- .../wrappers/{grafana-cli => plutono-cli} | 24 +- pkg/README.md | 42 +- pkg/api/admin.go | 8 +- pkg/api/admin_provisioning.go | 4 +- pkg/api/admin_users.go | 18 +- pkg/api/admin_users_test.go | 18 +- pkg/api/alerting.go | 16 +- pkg/api/alerting_test.go | 12 +- pkg/api/annotations.go | 12 +- pkg/api/annotations_test.go | 12 +- pkg/api/api.go | 54 +- pkg/api/apikey.go | 10 +- pkg/api/app_routes.go | 12 +- pkg/api/avatar/avatar.go | 6 +- pkg/api/common_test.go | 24 +- pkg/api/dashboard.go | 28 +- pkg/api/dashboard_permission.go | 10 +- pkg/api/dashboard_permission_test.go | 14 +- pkg/api/dashboard_snapshot.go | 18 +- pkg/api/dashboard_snapshot_test.go | 10 +- pkg/api/dashboard_test.go | 34 +- pkg/api/dataproxy.go | 10 +- pkg/api/datasource/validation.go | 4 +- pkg/api/datasources.go | 18 +- pkg/api/datasources_test.go | 10 +- pkg/api/dtos/acl.go | 2 +- pkg/api/dtos/alerting.go | 6 +- pkg/api/dtos/annotations.go | 2 +- pkg/api/dtos/dashboard.go | 2 +- pkg/api/dtos/datasource.go | 4 +- pkg/api/dtos/index.go | 6 +- pkg/api/dtos/invite.go | 2 +- pkg/api/dtos/models.go | 12 +- pkg/api/dtos/models_test.go | 14 +- pkg/api/dtos/plugins.go | 4 +- pkg/api/dtos/user.go | 2 +- pkg/api/folder.go | 16 +- pkg/api/folder_permission.go | 14 +- pkg/api/folder_permission_test.go | 16 +- pkg/api/folder_test.go | 14 +- pkg/api/frontend_logging.go | 8 +- pkg/api/frontend_logging_test.go | 16 +- pkg/api/frontend_metrics.go | 6 +- pkg/api/frontendlogging/sentry.go | 2 +- pkg/api/frontendlogging/source_maps.go | 8 +- pkg/api/frontendsettings.go | 22 +- pkg/api/frontendsettings_test.go | 12 +- pkg/api/health.go | 4 +- pkg/api/health_test.go | 8 +- pkg/api/http_server.go | 64 +- pkg/api/http_server_test.go | 2 +- pkg/api/index.go | 22 +- pkg/api/ldap_debug.go | 28 +- pkg/api/ldap_debug_test.go | 50 +- pkg/api/login.go | 24 +- pkg/api/login_oauth.go | 24 +- pkg/api/login_test.go | 96 +- pkg/api/metrics.go | 18 +- pkg/api/org.go | 16 +- pkg/api/org_invite.go | 18 +- pkg/api/org_users.go | 10 +- pkg/api/org_users_test.go | 8 +- pkg/api/password.go | 12 +- pkg/api/playlist.go | 6 +- pkg/api/playlist_play.go | 10 +- pkg/api/pluginproxy/access_token_provider.go | 4 +- .../pluginproxy/access_token_provider_test.go | 4 +- pkg/api/pluginproxy/ds_auth_provider.go | 6 +- pkg/api/pluginproxy/ds_proxy.go | 18 +- pkg/api/pluginproxy/ds_proxy_test.go | 30 +- pkg/api/pluginproxy/pluginproxy.go | 14 +- pkg/api/pluginproxy/pluginproxy_test.go | 18 +- pkg/api/pluginproxy/utils.go | 10 +- pkg/api/plugins.go | 26 +- ...fana_com_proxy.go => plutono_com_proxy.go} | 12 +- pkg/api/preferences.go | 8 +- pkg/api/quota.go | 8 +- pkg/api/render.go | 6 +- pkg/api/response/response.go | 4 +- pkg/api/routing/routing.go | 4 +- pkg/api/search.go | 12 +- pkg/api/short_url.go | 10 +- pkg/api/signup.go | 16 +- pkg/api/stars.go | 6 +- pkg/api/team.go | 12 +- pkg/api/team_members.go | 12 +- pkg/api/team_members_test.go | 8 +- pkg/api/team_test.go | 10 +- pkg/api/user.go | 16 +- pkg/api/user_test.go | 14 +- pkg/api/user_token.go | 10 +- pkg/api/user_token_test.go | 10 +- .../commands/commands.go | 24 +- .../commands/commandstest/context.go | 2 +- .../commands/commandstest/fake_api_client.go | 10 +- .../commands/commandstest/fake_ioutil.go | 0 .../encrypt_datasource_passwords.go | 12 +- .../encrypt_datasource_passwords_test.go | 8 +- .../commands/install_command.go | 16 +- .../commands/install_command_test.go | 20 +- .../commands/listremote_command.go | 4 +- .../commands/listversions_command.go | 4 +- .../commands/ls_command.go | 8 +- .../commands/ls_command_test.go | 10 +- .../commands/remove_command.go | 4 +- .../commands/reset_password_command.go | 14 +- .../testdata/plugin-with-absolute-member.zip | Bin .../testdata/plugin-with-parent-member.zip | Bin .../commands/testdata/plugin-with-symlink.zip | Bin ...8fa4da8096a952608a7e4c7782b4260b41bcf.zip} | Bin .../commands/upgrade_all_command.go | 8 +- .../commands/upgrade_all_command_test.go | 2 +- .../commands/upgrade_command.go | 8 +- .../logger/logger.go | 0 pkg/cmd/{grafana-cli => plutono-cli}/main.go | 18 +- .../models/model.go | 2 +- .../services/api_client.go | 22 +- .../services/api_client_test.go | 0 .../services/io_util.go | 0 .../services/services.go | 8 +- .../utils/command_line.go | 2 +- .../utils/plutono_path.go} | 20 +- .../diagnostics.go | 0 .../diagnostics_test.go | 0 .../main.go | 44 +- pkg/components/apikeygen/apikeygen.go | 2 +- pkg/components/apikeygen/apikeygen_test.go | 2 +- pkg/components/dashdiffs/compare.go | 6 +- pkg/components/dashdiffs/formatter_basic.go | 2 +- pkg/components/dashdiffs/formatter_test.go | 2 +- pkg/components/gtime/gtime.go | 4 +- .../imguploader/azureblobuploader.go | 4 +- .../imguploader/azureblobuploader_test.go | 2 +- pkg/components/imguploader/gcs/gcsuploader.go | 6 +- .../imguploader/gcs/gcsuploader_test.go | 4 +- pkg/components/imguploader/imguploader.go | 6 +- .../imguploader/imguploader_test.go | 8 +- pkg/components/imguploader/localuploader.go | 2 +- pkg/components/imguploader/s3uploader.go | 4 +- pkg/components/imguploader/s3uploader_test.go | 2 +- pkg/components/imguploader/webdavuploader.go | 2 +- pkg/components/securedata/securedata.go | 4 +- .../securejsondata/securejsondata.go | 6 +- pkg/expr/classic/classic.go | 2 +- pkg/expr/classic/classic_test.go | 2 +- pkg/expr/classic/evaluator.go | 2 +- pkg/expr/classic/evaluator_test.go | 2 +- pkg/expr/classic/reduce.go | 2 +- pkg/expr/classic/reduce_test.go | 2 +- pkg/expr/commands.go | 10 +- pkg/expr/graph.go | 2 +- pkg/expr/mathexp/exp.go | 2 +- pkg/expr/mathexp/funcs.go | 2 +- pkg/expr/mathexp/type_series.go | 2 +- pkg/expr/mathexp/types.go | 2 +- pkg/expr/nodes.go | 4 +- pkg/expr/service.go | 2 +- pkg/expr/service_test.go | 6 +- pkg/expr/transform.go | 8 +- pkg/extensions/main.go | 6 +- pkg/infra/log/file_test.go | 2 +- pkg/infra/log/log.go | 6 +- pkg/infra/metrics/graphitebridge/graphite.go | 4 +- .../metrics/graphitebridge/graphite_test.go | 14 +- pkg/infra/metrics/metrics.go | 36 +- pkg/infra/metrics/service.go | 8 +- pkg/infra/metrics/settings.go | 8 +- pkg/infra/remotecache/database_storage.go | 4 +- .../remotecache/database_storage_test.go | 4 +- pkg/infra/remotecache/memcached_storage.go | 2 +- .../memcached_storage_integration_test.go | 2 +- pkg/infra/remotecache/redis_storage.go | 4 +- .../redis_storage_integration_test.go | 2 +- pkg/infra/remotecache/redis_storage_test.go | 4 +- pkg/infra/remotecache/remotecache.go | 10 +- pkg/infra/remotecache/remotecache_test.go | 4 +- pkg/infra/remotecache/testing.go | 4 +- pkg/infra/serverlock/serverlock.go | 6 +- pkg/infra/serverlock/serverlock_test.go | 4 +- pkg/infra/tracing/tracing.go | 8 +- pkg/infra/usagestats/service.go | 18 +- pkg/infra/usagestats/usage_stats.go | 10 +- .../usagestats/usage_stats_service_test.go | 8 +- pkg/infra/usagestats/usage_stats_test.go | 24 +- pkg/login/auth.go | 12 +- pkg/login/auth_test.go | 70 +- pkg/login/brute_force_login_protection.go | 4 +- .../brute_force_login_protection_test.go | 6 +- pkg/login/ldap_login.go | 20 +- pkg/login/ldap_login_test.go | 8 +- .../{grafana_login.go => plutono_login.go} | 8 +- ...na_login_test.go => plutono_login_test.go} | 42 +- pkg/login/social/azuread_oauth.go | 4 +- pkg/login/social/common.go | 4 +- pkg/login/social/generic_oauth.go | 4 +- pkg/login/social/generic_oauth_test.go | 14 +- pkg/login/social/github_oauth.go | 2 +- pkg/login/social/gitlab_oauth.go | 2 +- pkg/login/social/google_oauth.go | 2 +- pkg/login/social/okta_oauth.go | 4 +- ...fana_com_oauth.go => plutono_com_oauth.go} | 14 +- pkg/login/social/social.go | 28 +- pkg/macaron/README.md | 2 +- pkg/middleware/auth.go | 10 +- pkg/middleware/auth_test.go | 6 +- pkg/middleware/cookies/cookies.go | 4 +- pkg/middleware/csp.go | 6 +- pkg/middleware/dashboard_redirect.go | 8 +- pkg/middleware/dashboard_redirect_test.go | 6 +- pkg/middleware/gziper.go | 2 +- pkg/middleware/logger.go | 4 +- pkg/middleware/middleware.go | 10 +- pkg/middleware/middleware_basic_auth_test.go | 14 +- pkg/middleware/middleware_test.go | 36 +- pkg/middleware/org_redirect.go | 6 +- pkg/middleware/org_redirect_test.go | 4 +- pkg/middleware/quota.go | 4 +- pkg/middleware/quota_test.go | 10 +- pkg/middleware/rate_limit.go | 2 +- pkg/middleware/rate_limit_test.go | 4 +- pkg/middleware/recovery.go | 8 +- pkg/middleware/recovery_test.go | 14 +- pkg/middleware/request_metrics.go | 8 +- pkg/middleware/testing.go | 12 +- pkg/middleware/validate_host.go | 4 +- pkg/mocks/mock_gcsifaces/mocks.go | 2 +- pkg/models/alert.go | 2 +- pkg/models/alert_notifications.go | 4 +- pkg/models/alert_test.go | 2 +- pkg/models/context.go | 4 +- pkg/models/dashboard_snapshot.go | 4 +- pkg/models/dashboard_version.go | 2 +- pkg/models/dashboards.go | 6 +- pkg/models/dashboards_test.go | 16 +- pkg/models/datasource.go | 20 +- pkg/models/datasource_cache.go | 20 +- pkg/models/datasource_cache_test.go | 8 +- pkg/models/models.go | 2 +- pkg/models/notifications.go | 2 +- pkg/models/plugin_setting_cache_test.go | 2 +- pkg/models/plugin_settings.go | 2 +- pkg/models/user.go | 10 +- pkg/models/user_auth.go | 4 +- pkg/plugins/app_plugin.go | 10 +- .../backendplugin/coreplugin/core_plugin.go | 10 +- .../coreplugin/core_plugin_test.go | 6 +- .../coreplugin/query_endpoint_adapter.go | 8 +- .../backendplugin/grpcplugin/client.go | 12 +- .../backendplugin/grpcplugin/client_v1.go | 6 +- .../backendplugin/grpcplugin/client_v2.go | 8 +- .../backendplugin/grpcplugin/grpc_plugin.go | 4 +- .../backendplugin/grpcplugin/log_wrapper.go | 2 +- pkg/plugins/backendplugin/instrumentation.go | 4 +- pkg/plugins/backendplugin/manager.go | 12 +- pkg/plugins/backendplugin/manager_test.go | 8 +- pkg/plugins/backendplugin/plugin.go | 2 +- pkg/plugins/backendplugin/plugin_settings.go | 2 +- .../backendplugin/plugin_settings_test.go | 2 +- pkg/plugins/dashboard_importer.go | 8 +- pkg/plugins/dashboard_importer_test.go | 8 +- pkg/plugins/dashboards.go | 6 +- pkg/plugins/dashboards_test.go | 8 +- pkg/plugins/dashboards_updater.go | 4 +- .../wrapper/datasource_plugin_wrapper.go | 10 +- .../wrapper/datasource_plugin_wrapper_test.go | 8 +- .../wrapper/datasource_plugin_wrapper_v2.go | 12 +- pkg/plugins/datasource_plugin.go | 14 +- pkg/plugins/frontend_plugin.go | 4 +- pkg/plugins/frontend_plugin_test.go | 8 +- pkg/plugins/manifest.go | 6 +- pkg/plugins/manifest_test.go | 4 +- pkg/plugins/models.go | 18 +- pkg/plugins/panel_plugin.go | 2 +- pkg/plugins/plugins.go | 22 +- pkg/plugins/plugins_test.go | 8 +- pkg/plugins/queries.go | 4 +- pkg/plugins/renderer_plugin.go | 10 +- .../plugin/MANIFEST.txt | 4 +- .../invalid-v2-signature/plugin/MANIFEST.txt | 4 +- pkg/plugins/testdata/test-app/plugin.json | 4 +- .../valid-v2-signature/plugin/MANIFEST.txt | 4 +- pkg/plugins/update_checker.go | 30 +- pkg/registry/registry.go | 8 +- pkg/server/server.go | 58 +- pkg/services/alerting/alerting_usage.go | 8 +- pkg/services/alerting/alerting_usage_test.go | 6 +- pkg/services/alerting/commands.go | 4 +- pkg/services/alerting/conditions/evaluator.go | 6 +- .../alerting/conditions/evaluator_test.go | 4 +- pkg/services/alerting/conditions/query.go | 16 +- .../alerting/conditions/query_test.go | 14 +- pkg/services/alerting/conditions/reducer.go | 4 +- .../alerting/conditions/reducer_test.go | 4 +- pkg/services/alerting/engine.go | 32 +- .../alerting/engine_integration_test.go | 2 +- pkg/services/alerting/engine_test.go | 2 +- pkg/services/alerting/eval_context.go | 8 +- pkg/services/alerting/eval_context_test.go | 4 +- pkg/services/alerting/eval_handler.go | 4 +- pkg/services/alerting/eval_handler_test.go | 2 +- pkg/services/alerting/extractor.go | 8 +- pkg/services/alerting/extractor_test.go | 8 +- pkg/services/alerting/interfaces.go | 2 +- pkg/services/alerting/models.go | 2 +- pkg/services/alerting/notifier.go | 14 +- pkg/services/alerting/notifier_test.go | 14 +- .../alerting/notifiers/alertmanager.go | 10 +- .../alerting/notifiers/alertmanager_test.go | 10 +- pkg/services/alerting/notifiers/base.go | 6 +- pkg/services/alerting/notifiers/base_test.go | 8 +- pkg/services/alerting/notifiers/dingding.go | 8 +- .../alerting/notifiers/dingding_test.go | 8 +- pkg/services/alerting/notifiers/discord.go | 16 +- .../alerting/notifiers/discord_test.go | 4 +- pkg/services/alerting/notifiers/email.go | 14 +- pkg/services/alerting/notifiers/email_test.go | 4 +- pkg/services/alerting/notifiers/googlechat.go | 16 +- .../alerting/notifiers/googlechat_test.go | 4 +- pkg/services/alerting/notifiers/hipchat.go | 10 +- .../alerting/notifiers/hipchat_test.go | 4 +- pkg/services/alerting/notifiers/kafka.go | 12 +- pkg/services/alerting/notifiers/kafka_test.go | 4 +- pkg/services/alerting/notifiers/line.go | 8 +- pkg/services/alerting/notifiers/line_test.go | 4 +- pkg/services/alerting/notifiers/opsgenie.go | 14 +- .../alerting/notifiers/opsgenie_test.go | 10 +- pkg/services/alerting/notifiers/pagerduty.go | 14 +- .../alerting/notifiers/pagerduty_test.go | 24 +- pkg/services/alerting/notifiers/pushover.go | 8 +- .../alerting/notifiers/pushover_test.go | 8 +- pkg/services/alerting/notifiers/sensu.go | 16 +- pkg/services/alerting/notifiers/sensu_test.go | 8 +- pkg/services/alerting/notifiers/sensugo.go | 14 +- .../alerting/notifiers/sensugo_test.go | 12 +- pkg/services/alerting/notifiers/slack.go | 14 +- pkg/services/alerting/notifiers/slack_test.go | 14 +- pkg/services/alerting/notifiers/teams.go | 8 +- pkg/services/alerting/notifiers/teams_test.go | 4 +- pkg/services/alerting/notifiers/telegram.go | 8 +- .../alerting/notifiers/telegram_test.go | 8 +- pkg/services/alerting/notifiers/threema.go | 8 +- .../alerting/notifiers/threema_test.go | 6 +- pkg/services/alerting/notifiers/victorops.go | 14 +- .../alerting/notifiers/victorops_test.go | 4 +- pkg/services/alerting/notifiers/webhook.go | 10 +- .../alerting/notifiers/webhook_test.go | 4 +- pkg/services/alerting/reader.go | 8 +- pkg/services/alerting/result_handler.go | 16 +- pkg/services/alerting/rule.go | 6 +- pkg/services/alerting/rule_test.go | 6 +- pkg/services/alerting/scheduler.go | 6 +- pkg/services/alerting/test_notification.go | 14 +- pkg/services/alerting/test_rule.go | 6 +- .../alerting/testdata/collapsed-panels.json | 2 +- .../panel-without-specified-datasource.json | 2 +- pkg/services/annotations/annotations.go | 4 +- pkg/services/auth/auth_token.go | 16 +- pkg/services/auth/auth_token_test.go | 10 +- pkg/services/auth/model.go | 2 +- pkg/services/auth/testing.go | 2 +- pkg/services/auth/token_cleanup.go | 2 +- pkg/services/cleanup/cleanup.go | 18 +- pkg/services/cleanup/cleanup_test.go | 2 +- .../contexthandler/auth_proxy_test.go | 20 +- .../contexthandler/authproxy/authproxy.go | 18 +- .../authproxy/authproxy_test.go | 16 +- pkg/services/contexthandler/contexthandler.go | 30 +- .../contexthandler/contexthandler_test.go | 10 +- pkg/services/dashboards/acl_service.go | 4 +- pkg/services/dashboards/dashboard_service.go | 18 +- .../dashboards/dashboard_service_test.go | 10 +- pkg/services/dashboards/folder_service.go | 8 +- .../dashboards/folder_service_test.go | 6 +- pkg/services/datasources/cache.go | 8 +- pkg/services/datasources/log.go | 2 +- pkg/services/guardian/guardian.go | 10 +- pkg/services/guardian/guardian_test.go | 10 +- pkg/services/guardian/guardian_util_test.go | 4 +- pkg/services/hooks/hooks.go | 6 +- pkg/services/ldap/ldap.go | 24 +- pkg/services/ldap/ldap_login_test.go | 8 +- pkg/services/ldap/ldap_private_test.go | 20 +- pkg/services/ldap/ldap_test.go | 12 +- pkg/services/ldap/settings.go | 12 +- pkg/services/ldap/testdata/ldap.toml | 10 +- pkg/services/librarypanels/api.go | 10 +- pkg/services/librarypanels/database.go | 8 +- pkg/services/librarypanels/guard.go | 6 +- pkg/services/librarypanels/librarypanels.go | 16 +- .../librarypanels_delete_test.go | 2 +- .../librarypanels_get_all_test.go | 2 +- .../librarypanels/librarypanels_get_test.go | 2 +- .../librarypanels_permissions_test.go | 2 +- .../librarypanels/librarypanels_test.go | 16 +- pkg/services/licensing/oss.go | 14 +- pkg/services/live/channel.go | 4 +- pkg/services/live/features/broadcast.go | 4 +- pkg/services/live/features/dashboard.go | 8 +- pkg/services/live/features/measurements.go | 6 +- pkg/services/live/features/testdata.go | 8 +- pkg/services/live/live.go | 60 +- pkg/services/live/pluginHandler.go | 6 +- pkg/services/login/login.go | 16 +- pkg/services/login/login_test.go | 6 +- pkg/services/multildap/multildap.go | 6 +- pkg/services/multildap/multildap_test.go | 4 +- pkg/services/ngalert/api.go | 18 +- pkg/services/ngalert/common_test.go | 12 +- pkg/services/ngalert/database.go | 4 +- pkg/services/ngalert/database_mig.go | 2 +- pkg/services/ngalert/database_test.go | 4 +- pkg/services/ngalert/eval/alert_query.go | 2 +- pkg/services/ngalert/eval/alert_query_test.go | 2 +- pkg/services/ngalert/eval/eval.go | 4 +- pkg/services/ngalert/instance_api.go | 4 +- pkg/services/ngalert/instance_database.go | 2 +- pkg/services/ngalert/middleware.go | 2 +- pkg/services/ngalert/models.go | 2 +- pkg/services/ngalert/ngalert.go | 18 +- pkg/services/ngalert/schedule.go | 18 +- pkg/services/ngalert/schedule_test.go | 2 +- pkg/services/ngalert/validator.go | 4 +- pkg/services/notifications/codes.go | 4 +- pkg/services/notifications/codes_test.go | 4 +- pkg/services/notifications/email.go | 4 +- pkg/services/notifications/mailer.go | 14 +- pkg/services/notifications/notifications.go | 14 +- .../notifications/notifications_test.go | 10 +- .../send_email_integration_test.go | 10 +- pkg/services/notifications/webhook.go | 4 +- pkg/services/oauthtoken/oauth_token_util.go | 10 +- .../provisioning/dashboards/config_reader.go | 4 +- .../dashboards/config_reader_test.go | 10 +- .../provisioning/dashboards/dashboard.go | 12 +- .../provisioning/dashboards/file_reader.go | 16 +- .../dashboards/file_reader_linux_test.go | 2 +- .../dashboards/file_reader_test.go | 18 +- .../applied-defaults/dev-dashboards.yaml | 2 +- .../broken-configs/commented.yaml | 2 +- .../dashboards-from-disk/dev-dashboards.yaml | 4 +- .../dashboards-from-disk/sample.yaml | 2 +- .../test-configs/version-0/version-0.yaml | 4 +- .../broken-dashboards/invalid.json | 2 +- .../containing-id/dashboard1.json | 2 +- .../folder-one/dashboard1.json | 6 +- .../folder-one/dashboard2.json | 6 +- .../folderOne/dashboard1.json | 6 +- .../folderTwo/dashboard2.json | 6 +- .../folders-from-files-structure/root.json | 4 +- .../one-dashboard/dashboard1.json | 6 +- .../unprovision/dashboard1.json | 6 +- pkg/services/provisioning/dashboards/types.go | 8 +- .../provisioning/datasources/config_reader.go | 6 +- .../datasources/config_reader_test.go | 6 +- .../provisioning/datasources/datasources.go | 6 +- .../provisioning/datasources/types.go | 8 +- .../notifiers/alert_notifications.go | 6 +- .../provisioning/notifiers/config_reader.go | 10 +- .../notifiers/config_reader_test.go | 10 +- pkg/services/provisioning/notifiers/types.go | 4 +- .../provisioning/plugins/config_reader.go | 4 +- .../plugins/config_reader_test.go | 4 +- .../plugins/plugin_provisioner.go | 6 +- .../plugins/plugin_provisioner_test.go | 6 +- pkg/services/provisioning/plugins/types.go | 2 +- pkg/services/provisioning/provisioning.go | 16 +- .../provisioning/provisioning_test.go | 4 +- pkg/services/provisioning/utils/utils.go | 4 +- pkg/services/provisioning/utils/utils_test.go | 4 +- pkg/services/provisioning/values/values.go | 4 +- .../provisioning/values/values_test.go | 2 +- pkg/services/quota/quota.go | 8 +- pkg/services/rendering/http_mode.go | 4 +- pkg/services/rendering/interface.go | 2 +- pkg/services/rendering/plugin_mode.go | 2 +- pkg/services/rendering/rendering.go | 24 +- pkg/services/rendering/rendering_test.go | 6 +- pkg/services/search/service.go | 8 +- pkg/services/search/service_test.go | 8 +- pkg/services/search/sorting.go | 2 +- pkg/services/shorturls/short_url_service.go | 8 +- .../shorturls/short_url_service_test.go | 4 +- pkg/services/sqlstore/alert.go | 4 +- pkg/services/sqlstore/alert_notification.go | 8 +- .../sqlstore/alert_notification_test.go | 4 +- pkg/services/sqlstore/alert_test.go | 4 +- pkg/services/sqlstore/annotation.go | 4 +- pkg/services/sqlstore/annotation_cleanup.go | 4 +- .../sqlstore/annotation_cleanup_test.go | 6 +- pkg/services/sqlstore/annotation_test.go | 2 +- pkg/services/sqlstore/apikey.go | 4 +- pkg/services/sqlstore/apikey_test.go | 2 +- pkg/services/sqlstore/dashboard.go | 14 +- pkg/services/sqlstore/dashboard_acl.go | 4 +- pkg/services/sqlstore/dashboard_acl_test.go | 2 +- .../sqlstore/dashboard_folder_test.go | 4 +- .../sqlstore/dashboard_provisioning.go | 4 +- .../sqlstore/dashboard_provisioning_test.go | 8 +- .../dashboard_service_integration_test.go | 10 +- pkg/services/sqlstore/dashboard_snapshot.go | 10 +- .../sqlstore/dashboard_snapshot_test.go | 6 +- pkg/services/sqlstore/dashboard_test.go | 12 +- pkg/services/sqlstore/dashboard_version.go | 6 +- .../sqlstore/dashboard_version_test.go | 6 +- pkg/services/sqlstore/database_wrapper.go | 6 +- pkg/services/sqlstore/datasource.go | 12 +- pkg/services/sqlstore/datasource_test.go | 2 +- pkg/services/sqlstore/health.go | 4 +- pkg/services/sqlstore/health_test.go | 2 +- pkg/services/sqlstore/logger.go | 26 +- pkg/services/sqlstore/login_attempt.go | 4 +- pkg/services/sqlstore/login_attempt_test.go | 2 +- pkg/services/sqlstore/migrations/alert_mig.go | 2 +- .../sqlstore/migrations/annotation_mig.go | 2 +- .../sqlstore/migrations/apikey_mig.go | 2 +- .../sqlstore/migrations/cache_data_mig.go | 2 +- pkg/services/sqlstore/migrations/common.go | 2 +- .../sqlstore/migrations/dashboard_acl.go | 2 +- .../sqlstore/migrations/dashboard_mig.go | 2 +- .../migrations/dashboard_snapshot_mig.go | 2 +- .../migrations/dashboard_version_mig.go | 2 +- .../sqlstore/migrations/datasource_mig.go | 2 +- .../sqlstore/migrations/login_attempt_mig.go | 2 +- .../sqlstore/migrations/migrations.go | 2 +- .../sqlstore/migrations/migrations_test.go | 4 +- pkg/services/sqlstore/migrations/org_mig.go | 2 +- .../sqlstore/migrations/playlist_mig.go | 2 +- .../sqlstore/migrations/plugin_setting.go | 2 +- .../sqlstore/migrations/preferences_mig.go | 2 +- pkg/services/sqlstore/migrations/quota_mig.go | 2 +- .../migrations/serverlock_migrations.go | 2 +- .../sqlstore/migrations/session_mig.go | 2 +- .../sqlstore/migrations/short_url_mig.go | 2 +- pkg/services/sqlstore/migrations/stats_mig.go | 2 +- pkg/services/sqlstore/migrations/tag_mig.go | 2 +- pkg/services/sqlstore/migrations/team_mig.go | 2 +- pkg/services/sqlstore/migrations/temp_user.go | 2 +- .../sqlstore/migrations/user_auth_mig.go | 2 +- .../migrations/user_auth_token_mig.go | 2 +- pkg/services/sqlstore/migrations/user_mig.go | 4 +- pkg/services/sqlstore/migrator/migrator.go | 4 +- .../sqlstore/migrator/mysql_dialect.go | 2 +- .../sqlstore/migrator/postgres_dialect.go | 2 +- .../sqlstore/migrator/sqlite_dialect.go | 2 +- pkg/services/sqlstore/org.go | 8 +- pkg/services/sqlstore/org_test.go | 6 +- pkg/services/sqlstore/org_users.go | 6 +- .../sqlstore/permissions/dashboard.go | 4 +- pkg/services/sqlstore/playlist.go | 4 +- pkg/services/sqlstore/playlist_test.go | 2 +- pkg/services/sqlstore/plugin_setting.go | 8 +- pkg/services/sqlstore/preferences.go | 4 +- pkg/services/sqlstore/preferences_test.go | 2 +- pkg/services/sqlstore/quota.go | 6 +- pkg/services/sqlstore/quota_test.go | 4 +- pkg/services/sqlstore/searchstore/builder.go | 2 +- pkg/services/sqlstore/searchstore/doc.go | 2 +- pkg/services/sqlstore/searchstore/filters.go | 2 +- .../sqlstore/searchstore/search_test.go | 12 +- pkg/services/sqlstore/sql_test_data.go | 4 +- pkg/services/sqlstore/sqlbuilder.go | 2 +- pkg/services/sqlstore/sqlbuilder_test.go | 4 +- pkg/services/sqlstore/sqlstore.go | 36 +- pkg/services/sqlstore/sqlstore_test.go | 2 +- pkg/services/sqlstore/sqlutil/sqlutil.go | 8 +- pkg/services/sqlstore/star.go | 4 +- pkg/services/sqlstore/stars_test.go | 2 +- pkg/services/sqlstore/stats.go | 4 +- .../sqlstore/stats_integration_test.go | 2 +- pkg/services/sqlstore/stats_test.go | 2 +- pkg/services/sqlstore/tags.go | 2 +- pkg/services/sqlstore/tags_test.go | 2 +- pkg/services/sqlstore/team.go | 6 +- pkg/services/sqlstore/team_test.go | 2 +- pkg/services/sqlstore/temp_user.go | 4 +- pkg/services/sqlstore/temp_user_test.go | 2 +- pkg/services/sqlstore/tls_mysql.go | 2 +- pkg/services/sqlstore/transactions.go | 6 +- pkg/services/sqlstore/transactions_test.go | 2 +- pkg/services/sqlstore/user.go | 18 +- pkg/services/sqlstore/user_auth.go | 12 +- pkg/services/sqlstore/user_auth_test.go | 2 +- pkg/services/sqlstore/user_test.go | 10 +- pkg/services/teamguardian/team.go | 4 +- pkg/services/teamguardian/teams_test.go | 4 +- pkg/setting/expanders_test.go | 4 +- pkg/setting/setting.go | 36 +- pkg/setting/setting_session_test.go | 2 +- pkg/setting/setting_test.go | 18 +- pkg/setting/testdata/invalid.ini | 2 +- pkg/tests/README.md | 2 +- pkg/tests/api/metrics/README.md | 2 +- pkg/tests/api/metrics/api_metrics_test.go | 18 +- pkg/tests/testinfra/testinfra.go | 28 +- pkg/tests/web/index_view_test.go | 10 +- .../applicationinsights-datasource.go | 16 +- .../applicationinsights-datasource_test.go | 12 +- .../azure-log-analytics-datasource.go | 16 +- .../azure-log-analytics-datasource_test.go | 14 +- .../azure-log-analytics-table-frame_test.go | 14 +- .../azuremonitor/azuremonitor-datasource.go | 22 +- .../azuremonitor-datasource_test.go | 38 +- pkg/tsdb/azuremonitor/azuremonitor-time.go | 2 +- pkg/tsdb/azuremonitor/azuremonitor.go | 8 +- .../insights-analytics-datasource.go | 14 +- pkg/tsdb/azuremonitor/macros.go | 2 +- pkg/tsdb/azuremonitor/macros_test.go | 16 +- .../1-azure-monitor-response-avg.json | 2 +- .../2-azure-monitor-response-total.json | 2 +- .../3-azure-monitor-response-maximum.json | 2 +- .../4-azure-monitor-response-minimum.json | 2 +- .../5-azure-monitor-response-count.json | 2 +- ...ure-monitor-response-single-dimension.json | 2 +- ...ure-monitor-response-unspecified-unit.json | 2 +- ...lytics-response-metrics-single-series.json | 6 +- ...ytics-response-metrics-no-time-column.json | 6 +- ...tics-response-metrics-no-value-column.json | 6 +- .../6-log-analytics-response-table.json | 6 +- .../7-log-analytics-all-types-table.json | 2 +- pkg/tsdb/azuremonitor/time-grain.go | 4 +- pkg/tsdb/cloudmonitoring/annotation_query.go | 2 +- .../cloudmonitoring/annotation_query_test.go | 4 +- pkg/tsdb/cloudmonitoring/cloudmonitoring.go | 20 +- .../cloudmonitoring/cloudmonitoring_test.go | 20 +- .../1-series-response-agg-one-metric.json | 2 +- .../test-data/2-series-response-no-agg.json | 6 +- ...ies-response-distribution-exponential.json | 2 +- ...series-response-distribution-explicit.json | 2 +- .../test-data/7-series-response-mql.json | 2 +- .../cloudmonitoring/time_series_filter.go | 6 +- pkg/tsdb/cloudmonitoring/time_series_query.go | 6 +- pkg/tsdb/cloudmonitoring/types.go | 4 +- pkg/tsdb/cloudwatch/annotation_query.go | 6 +- pkg/tsdb/cloudwatch/cloudwatch.go | 20 +- .../cloudwatch/get_metric_data_executor.go | 2 +- pkg/tsdb/cloudwatch/live.go | 12 +- pkg/tsdb/cloudwatch/log_actions.go | 4 +- pkg/tsdb/cloudwatch/log_actions_test.go | 4 +- pkg/tsdb/cloudwatch/logs.go | 4 +- pkg/tsdb/cloudwatch/metric_find_query.go | 8 +- pkg/tsdb/cloudwatch/metric_find_query_test.go | 6 +- pkg/tsdb/cloudwatch/query_transformer.go | 4 +- pkg/tsdb/cloudwatch/query_transformer_test.go | 2 +- pkg/tsdb/cloudwatch/request_parser.go | 6 +- pkg/tsdb/cloudwatch/request_parser_test.go | 4 +- pkg/tsdb/cloudwatch/test_utils.go | 8 +- pkg/tsdb/cloudwatch/time_series_query.go | 6 +- pkg/tsdb/cloudwatch/time_series_query_test.go | 2 +- pkg/tsdb/elasticsearch/client/client.go | 10 +- pkg/tsdb/elasticsearch/client/client_test.go | 6 +- .../elasticsearch/client/index_pattern.go | 2 +- .../client/index_pattern_test.go | 2 +- pkg/tsdb/elasticsearch/client/models.go | 4 +- .../elasticsearch/client/search_request.go | 2 +- .../client/search_request_test.go | 4 +- pkg/tsdb/elasticsearch/elasticsearch.go | 6 +- pkg/tsdb/elasticsearch/models.go | 2 +- pkg/tsdb/elasticsearch/response_parser.go | 8 +- .../elasticsearch/response_parser_test.go | 8 +- pkg/tsdb/elasticsearch/time_series_query.go | 6 +- .../elasticsearch/time_series_query_test.go | 6 +- pkg/tsdb/fake_test.go | 2 +- pkg/tsdb/graphite/graphite.go | 8 +- pkg/tsdb/graphite/graphite_test.go | 16 +- pkg/tsdb/graphite/types.go | 2 +- pkg/tsdb/influxdb/flux/executor.go | 2 +- pkg/tsdb/influxdb/flux/executor_test.go | 10 +- pkg/tsdb/influxdb/flux/flux.go | 6 +- pkg/tsdb/influxdb/flux/macros_test.go | 8 +- pkg/tsdb/influxdb/flux/query_models.go | 4 +- pkg/tsdb/influxdb/flux/testdata/buckets.csv | 2 +- .../influxdb/flux/testdata/buckets.golden.txt | 2 +- pkg/tsdb/influxdb/influxdb.go | 12 +- pkg/tsdb/influxdb/influxdb_test.go | 4 +- pkg/tsdb/influxdb/model_parser.go | 6 +- pkg/tsdb/influxdb/model_parser_test.go | 4 +- pkg/tsdb/influxdb/query.go | 2 +- pkg/tsdb/influxdb/query_part.go | 2 +- pkg/tsdb/influxdb/query_part_test.go | 2 +- pkg/tsdb/influxdb/query_test.go | 2 +- pkg/tsdb/influxdb/response_parser.go | 4 +- pkg/tsdb/influxdb/response_parser_test.go | 2 +- pkg/tsdb/interval.go | 4 +- pkg/tsdb/interval_test.go | 4 +- pkg/tsdb/loki/loki.go | 8 +- pkg/tsdb/loki/loki_test.go | 6 +- pkg/tsdb/models.go | 14 +- pkg/tsdb/mssql/macros.go | 6 +- pkg/tsdb/mssql/macros_test.go | 4 +- pkg/tsdb/mssql/mssql.go | 12 +- pkg/tsdb/mssql/mssql_test.go | 14 +- pkg/tsdb/mysql/macros.go | 10 +- pkg/tsdb/mysql/macros_test.go | 6 +- pkg/tsdb/mysql/mysql.go | 12 +- pkg/tsdb/mysql/mysql_test.go | 22 +- pkg/tsdb/opentsdb/opentsdb.go | 10 +- pkg/tsdb/opentsdb/opentsdb_test.go | 16 +- pkg/tsdb/postgres/macros.go | 6 +- pkg/tsdb/postgres/macros_test.go | 2 +- pkg/tsdb/postgres/postgres.go | 16 +- pkg/tsdb/postgres/postgres_test.go | 26 +- pkg/tsdb/postgres/tlsmanager.go | 6 +- pkg/tsdb/postgres/tlsmanager_test.go | 10 +- pkg/tsdb/prometheus/prometheus.go | 8 +- pkg/tsdb/prometheus/prometheus_test.go | 6 +- pkg/tsdb/query_endpoint.go | 2 +- pkg/tsdb/request.go | 2 +- pkg/tsdb/request_test.go | 2 +- pkg/tsdb/sqleng/sql_engine.go | 12 +- pkg/tsdb/sqleng/sql_engine_test.go | 8 +- pkg/tsdb/tempo/tempo.go | 6 +- pkg/tsdb/tempo/tempo_test.go | 2 +- pkg/tsdb/testdatasource/resource_handler.go | 2 +- pkg/tsdb/testdatasource/scenarios.go | 14 +- pkg/tsdb/testdatasource/scenarios_test.go | 4 +- pkg/tsdb/testdatasource/testdata.go | 8 +- pkg/util/encoding_test.go | 6 +- pkg/util/encryption_test.go | 4 +- pkg/util/ip_address.go | 2 +- pkg/util/validation_test.go | 2 +- plugins-bundled/README.md | 2 +- .../internal/input-datasource/jest.config.js | 2 +- .../internal/input-datasource/package.json | 18 +- .../src/InputConfigEditor.tsx | 6 +- .../src/InputDatasource.test.ts | 2 +- .../input-datasource/src/InputDatasource.ts | 2 +- .../input-datasource/src/InputQueryEditor.tsx | 4 +- .../internal/input-datasource/src/module.ts | 2 +- .../input-datasource/src/testHelpers.ts | 2 +- .../internal/input-datasource/src/types.ts | 2 +- .../internal/input-datasource/src/utils.ts | 2 +- .../internal/input-datasource/tsconfig.json | 2 +- {grafana-mixin => plutono-mixin}/.gitignore | 0 {grafana-mixin => plutono-mixin}/Makefile | 0 {grafana-mixin => plutono-mixin}/README.md | 10 +- .../alerts/alerts.yaml | 4 +- .../dashboards/plutono-overview.json | 18 +- .../mixin.libsonnet | 4 +- .../rules/rules.yaml | 2 +- .../scripts/build.sh | 0 .../scripts/common.sh | 0 .../scripts/format.sh | 0 .../scripts/lint.sh | 0 public/app/app.ts | 18 +- public/app/core/angular_wrappers.ts | 2 +- public/app/core/app_events.ts | 2 +- .../AppNotifications/AppNotificationItem.tsx | 2 +- .../AppNotifications/AppNotificationList.tsx | 2 +- .../app/core/components/Branding/Branding.tsx | 10 +- .../DynamicImports/ErrorLoadingChunk.tsx | 4 +- .../LoadingChunkPlaceHolder.tsx | 2 +- .../components/EmptyListCTA/EmptyListCTA.tsx | 6 +- .../core/components/ErrorPage/ErrorPage.tsx | 6 +- .../components/FilterInput/FilterInput.tsx | 4 +- public/app/core/components/Footer/Footer.tsx | 10 +- .../ForgottenPassword/ChangePassword.tsx | 4 +- .../ForgottenPassword/ForgottenPassword.tsx | 10 +- .../LayoutSelector/LayoutSelector.tsx | 2 +- .../app/core/components/Login/LoginCtrl.tsx | 16 +- .../app/core/components/Login/LoginForm.tsx | 4 +- .../app/core/components/Login/LoginLayout.tsx | 6 +- .../app/core/components/Login/LoginPage.tsx | 2 +- .../components/Login/LoginServiceButtons.tsx | 14 +- .../app/core/components/Login/UserSignup.tsx | 4 +- .../components/OrgActionBar/OrgActionBar.tsx | 2 +- public/app/core/components/OrgSwitcher.tsx | 6 +- public/app/core/components/Page/Page.tsx | 6 +- .../core/components/PageHeader/PageHeader.tsx | 8 +- .../core/components/PageLoader/PageLoader.tsx | 2 +- .../PermissionList/AddPermission.tsx | 6 +- .../DisabledPermissionListItem.tsx | 2 +- .../PermissionList/PermissionListItem.tsx | 4 +- .../core/components/PluginHelp/PluginHelp.tsx | 4 +- .../QueryOperationAction.tsx | 8 +- .../QueryOperationRow/QueryOperationRow.tsx | 6 +- .../components/Select/DashboardPicker.tsx | 4 +- .../components/Select/DataSourcePicker.tsx | 8 +- .../components/Select/FolderPicker.test.tsx | 4 +- .../core/components/Select/FolderPicker.tsx | 8 +- .../components/Select/MetricSelect.test.tsx | 2 +- .../core/components/Select/MetricSelect.tsx | 4 +- .../app/core/components/Select/OrgPicker.tsx | 4 +- .../app/core/components/Select/SortPicker.tsx | 4 +- .../components/Select/TeamPicker.test.tsx | 2 +- .../app/core/components/Select/TeamPicker.tsx | 4 +- .../components/Select/UserPicker.test.tsx | 2 +- .../app/core/components/Select/UserPicker.tsx | 4 +- .../SharedPreferences/SharedPreferences.tsx | 6 +- public/app/core/components/Signup/Signup.tsx | 6 +- .../core/components/Signup/VerifyEmail.tsx | 6 +- .../SplitPaneWrapper/SplitPaneWrapper.tsx | 6 +- .../core/components/TagFilter/TagBadge.tsx | 2 +- .../core/components/TagFilter/TagFilter.tsx | 6 +- .../core/components/TagFilter/TagOption.tsx | 6 +- .../TimePicker/TimePickerWithHistory.tsx | 6 +- .../core/components/TraceToLogsSettings.tsx | 8 +- .../CalculateFieldTransformerEditor.tsx | 6 +- .../ConcatenateTransformerEditor.tsx | 6 +- .../FilterByNameTransformerEditor.tsx | 6 +- .../FilterByRefIdTransformerEditor.tsx | 6 +- .../FilterByValueFilterEditor.tsx | 6 +- .../FilterByValueTransformerEditor.tsx | 6 +- .../ValueMatchers/BasicMatcherEditor.tsx | 4 +- .../ValueMatchers/NoopMatcherEditor.tsx | 2 +- .../ValueMatchers/RangeMatcherEditor.tsx | 4 +- .../ValueMatchers/types.ts | 2 +- .../ValueMatchers/utils.ts | 2 +- .../ValueMatchers/valueMatchersUI.ts | 2 +- .../GroupByTransformerEditor.tsx | 6 +- .../LabelsToFieldsTransformerEditor.tsx | 6 +- .../TransformersUI/MergeTransformerEditor.tsx | 4 +- .../OrganizeFieldsTransformerEditor.tsx | 12 +- .../ReduceTransformerEditor.tsx | 8 +- .../RenameByRegexTransformer.tsx | 6 +- .../SeriesToFieldsTransformerEditor.tsx | 6 +- .../SeriesToRowsTransformerEditor.tsx | 4 +- .../SortByTransformerEditor.tsx | 6 +- .../PrepareTimeSeriesEditor.tsx | 6 +- .../prepareTimeSeries.test.ts | 2 +- .../prepareTimeSeries/prepareTimeSeries.ts | 2 +- .../components/code_editor/code_editor.ts | 4 +- ...-grafana-dark.js => theme-plutono-dark.js} | 2 +- public/app/core/components/help/HelpModal.tsx | 2 +- .../app/core/components/jsontree/jsontree.ts | 2 +- .../components/modals/AngularModalProxy.tsx | 2 +- public/app/core/components/scroll/scroll.ts | 4 +- .../sidemenu/BottomNavLinks.test.tsx | 4 +- .../components/sidemenu/BottomNavLinks.tsx | 4 +- .../sidemenu/BottomSection.test.tsx | 4 +- .../components/sidemenu/BottomSection.tsx | 2 +- .../components/sidemenu/DropDownChild.tsx | 2 +- .../components/sidemenu/SideMenu.test.tsx | 2 +- .../app/core/components/sidemenu/SideMenu.tsx | 2 +- .../components/sidemenu/SideMenuDropDown.tsx | 2 +- .../app/core/components/sidemenu/SignIn.tsx | 2 +- .../core/components/sidemenu/TopSection.tsx | 2 +- .../components/sidemenu/TopSectionItem.tsx | 4 +- .../BottomNavLinks.test.tsx.snap | 2 +- .../core/components/sidemenu/utils.test.ts | 10 +- public/app/core/config.ts | 16 +- public/app/core/controllers/invited_ctrl.ts | 6 +- .../core/controllers/reset_password_ctrl.ts | 8 +- public/app/core/controllers/signup_ctrl.ts | 6 +- public/app/core/core.ts | 4 +- public/app/core/core_module.ts | 14 +- public/app/core/directives/diff-view.ts | 4 +- public/app/core/directives/misc.ts | 4 +- .../app/core/directives/ng_model_on_blur.ts | 2 +- public/app/core/directives/tags.ts | 2 +- public/app/core/filters/filters.ts | 2 +- public/app/core/jquery_extended.ts | 2 +- public/app/core/logs_model.test.ts | 18 +- public/app/core/logs_model.ts | 6 +- public/app/core/nav_model_srv.ts | 2 +- public/app/core/profiler.ts | 6 +- public/app/core/reducers/location.ts | 4 +- public/app/core/reducers/navModel.test.ts | 2 +- public/app/core/reducers/navModel.ts | 2 +- public/app/core/reducers/root.test.ts | 4 +- public/app/core/selectors/navModel.ts | 2 +- public/app/core/services/AngularLoader.ts | 6 +- public/app/core/services/FetchQueue.test.ts | 2 +- public/app/core/services/FetchQueue.ts | 4 +- .../core/services/FetchQueueWorker.test.ts | 4 +- public/app/core/services/FetchQueueWorker.ts | 8 +- .../app/core/services/ResponseQueue.test.ts | 2 +- public/app/core/services/ResponseQueue.ts | 4 +- .../core/services/__mocks__/backend_srv.ts | 2 +- public/app/core/services/analytics.ts | 4 +- public/app/core/services/backend_srv.ts | 8 +- public/app/core/services/bridge_srv.test.ts | 2 +- public/app/core/services/bridge_srv.ts | 6 +- public/app/core/services/context_srv.ts | 10 +- public/app/core/services/echo/Echo.ts | 4 +- public/app/core/services/echo/EchoSrv.ts | 2 +- .../echo/backends/PerformanceBackend.ts | 2 +- .../backends/sentry/SentryBackend.test.ts | 8 +- .../echo/backends/sentry/SentryBackend.ts | 10 +- .../sentry/transports/EchoSrvTransport.ts | 2 +- .../services/echo/backends/sentry/types.ts | 2 +- public/app/core/services/keybindingSrv.ts | 6 +- public/app/core/services/popover_srv.ts | 4 +- public/app/core/services/util_srv.ts | 6 +- public/app/core/specs/OrgSwitcher.test.tsx | 4 +- public/app/core/specs/backend_srv.test.ts | 12 +- public/app/core/specs/rangeutil.test.ts | 2 +- public/app/core/table_model.ts | 2 +- public/app/core/time_series2.ts | 2 +- public/app/core/utils/ConfigProvider.tsx | 10 +- public/app/core/utils/UserProvider.tsx | 4 +- public/app/core/utils/browser.ts | 2 +- public/app/core/utils/docsLinks.ts | 2 +- public/app/core/utils/explore.test.ts | 10 +- public/app/core/utils/explore.ts | 12 +- public/app/core/utils/fetch.ts | 4 +- public/app/core/utils/kbn.test.ts | 2 +- public/app/core/utils/kbn.ts | 30 +- public/app/core/utils/query.test.ts | 2 +- public/app/core/utils/query.ts | 2 +- public/app/core/utils/richHistory.test.ts | 4 +- public/app/core/utils/richHistory.ts | 16 +- public/app/core/utils/shortLinks.test.ts | 2 +- public/app/core/utils/shortLinks.ts | 4 +- public/app/core/utils/standardTransformers.ts | 2 +- public/app/core/utils/ticks.ts | 8 +- public/app/core/utils/timePicker.test.ts | 2 +- public/app/core/utils/timePicker.ts | 2 +- public/app/features/admin/AdminEditOrgCtrl.ts | 2 +- .../app/features/admin/AdminEditOrgPage.tsx | 6 +- .../app/features/admin/AdminListOrgsPage.tsx | 4 +- public/app/features/admin/AdminOrgsTable.tsx | 2 +- public/app/features/admin/AdminSettings.tsx | 10 +- public/app/features/admin/LicenseChrome.tsx | 10 +- public/app/features/admin/OrgRolePicker.tsx | 4 +- public/app/features/admin/ServerStats.tsx | 4 +- public/app/features/admin/UpgradePage.tsx | 16 +- public/app/features/admin/UserAdminPage.tsx | 8 +- public/app/features/admin/UserCreatePage.tsx | 6 +- .../app/features/admin/UserLdapSyncInfo.tsx | 4 +- .../app/features/admin/UserListAdminPage.tsx | 8 +- public/app/features/admin/UserOrgs.tsx | 6 +- public/app/features/admin/UserPermissions.tsx | 24 +- public/app/features/admin/UserProfile.tsx | 6 +- public/app/features/admin/UserSessions.tsx | 2 +- .../admin/ldap/LdapConnectionStatus.tsx | 2 +- public/app/features/admin/ldap/LdapPage.tsx | 4 +- .../app/features/admin/ldap/LdapSyncInfo.tsx | 4 +- .../features/admin/ldap/LdapUserGroups.tsx | 2 +- .../admin/ldap/LdapUserPermissions.tsx | 6 +- .../app/features/admin/ldap/LdapUserTeams.tsx | 2 +- .../features/admin/partials/admin_home.html | 4 +- public/app/features/admin/state/actions.ts | 12 +- public/app/features/admin/state/apis.tsx | 4 +- .../app/features/admin/state/reducers.test.ts | 4 +- .../app/features/alerting/AlertRuleItem.tsx | 2 +- .../features/alerting/AlertRuleList.test.tsx | 2 +- .../app/features/alerting/AlertRuleList.tsx | 6 +- public/app/features/alerting/AlertTab.tsx | 6 +- public/app/features/alerting/AlertTabCtrl.ts | 6 +- .../alerting/EditNotificationChannelPage.tsx | 6 +- .../alerting/NewNotificationChannelPage.tsx | 6 +- .../features/alerting/NextGenAlertingPage.tsx | 6 +- .../alerting/NotificationsEditCtrl.ts | 4 +- .../alerting/NotificationsListPage.tsx | 6 +- public/app/features/alerting/StateHistory.tsx | 4 +- .../features/alerting/TestRuleResult.test.tsx | 4 +- .../app/features/alerting/TestRuleResult.tsx | 6 +- .../components/AlertDefinitionItem.tsx | 4 +- .../components/AlertDefinitionOptions.tsx | 6 +- .../components/AlertingQueryEditor.tsx | 6 +- .../components/AlertingQueryPreview.tsx | 6 +- .../alerting/components/BasicSettings.tsx | 4 +- .../alerting/components/ChannelSettings.tsx | 2 +- .../components/NotificationChannelForm.tsx | 6 +- .../components/NotificationChannelOptions.tsx | 4 +- .../components/NotificationSettings.tsx | 6 +- .../alerting/components/OptionElement.tsx | 2 +- .../components/PreviewInstancesTab.tsx | 4 +- .../alerting/components/PreviewQueryTab.tsx | 6 +- .../getAlertingValidationMessage.test.ts | 4 +- .../alerting/getAlertingValidationMessage.ts | 4 +- .../features/alerting/partials/alert_tab.html | 2 +- public/app/features/alerting/state/actions.ts | 4 +- .../app/features/alerting/state/alertDef.ts | 2 +- .../features/alerting/state/reducers.test.ts | 2 +- .../app/features/alerting/state/reducers.ts | 6 +- .../app/features/alerting/state/selectors.ts | 2 +- .../alerting/utils/notificationChannels.ts | 4 +- .../features/annotations/annotations_srv.ts | 4 +- .../components/AnnotationResultMapper.tsx | 4 +- .../StandardAnnotationQueryEditor.tsx | 4 +- .../app/features/annotations/editor_ctrl.ts | 8 +- .../app/features/annotations/event_editor.ts | 2 +- .../app/features/annotations/event_manager.ts | 4 +- .../annotations/specs/annotations_srv.test.ts | 2 +- .../standardAnnotationSupport.test.ts | 2 +- .../annotations/standardAnnotationSupport.ts | 2 +- public/app/features/annotations/types.ts | 2 +- .../features/api-keys/ApiKeysAddedModal.tsx | 4 +- public/app/features/api-keys/ApiKeysForm.tsx | 4 +- .../features/api-keys/ApiKeysPage.test.tsx | 4 +- public/app/features/api-keys/ApiKeysPage.tsx | 4 +- public/app/features/api-keys/ApiKeysTable.tsx | 4 +- .../ApiKeysAddedModal.test.tsx.snap | 2 +- .../AddPanelWidget/AddPanelWidget.tsx | 10 +- .../DashExportModal/DashboardExporter.test.ts | 22 +- .../DashExportModal/DashboardExporter.ts | 14 +- .../dashboard/components/DashNav/DashNav.tsx | 4 +- .../components/DashNav/DashNavButton.tsx | 6 +- .../DashNav/DashNavTimeControls.tsx | 6 +- .../DashboardPermissions.tsx | 2 +- .../components/DashboardRow/DashboardRow.tsx | 4 +- .../DashboardSettings/AnnotationsSettings.tsx | 2 +- .../AutoRefreshIntervals.test.tsx | 2 +- .../AutoRefreshIntervals.tsx | 2 +- .../DashboardSettings/DashboardSettings.tsx | 8 +- .../DashboardSettings/GeneralSettings.tsx | 6 +- .../DashboardSettings/JsonEditorSettings.tsx | 2 +- .../DashboardSettings/LinksSettings.test.tsx | 2 +- .../DashboardSettings/TimePickerSettings.tsx | 6 +- .../DashboardSettings/VersionsSettings.tsx | 2 +- .../DeleteDashboard/DeleteDashboardButton.tsx | 2 +- .../DeleteDashboard/DeleteDashboardModal.tsx | 6 +- .../DeleteDashboard/useDashboardDelete.tsx | 2 +- .../FolderPicker/FolderPickerCtrl.ts | 2 +- .../components/Inspector/InspectContent.tsx | 6 +- .../components/Inspector/PanelInspector.tsx | 2 +- .../dashboard/components/Inspector/hooks.ts | 4 +- .../LinksSettings/LinkSettingsEdit.tsx | 4 +- .../LinksSettings/LinkSettingsHeader.tsx | 2 +- .../LinksSettings/LinkSettingsList.tsx | 2 +- .../PanelEditor/AngularPanelOptions.tsx | 4 +- .../DefaultFieldConfigEditor.test.tsx | 4 +- .../PanelEditor/DefaultFieldConfigEditor.tsx | 6 +- .../PanelEditor/DynamicConfigValueEditor.tsx | 6 +- .../components/PanelEditor/OptionsGroup.tsx | 8 +- .../PanelEditor/OptionsPaneContent.tsx | 8 +- .../PanelEditor/OverrideEditor.test.tsx | 4 +- .../components/PanelEditor/OverrideEditor.tsx | 8 +- .../PanelEditor/OverrideFieldConfigEditor.tsx | 6 +- .../components/PanelEditor/PanelEditor.tsx | 8 +- .../PanelEditor/PanelEditorQueries.tsx | 2 +- .../PanelEditor/PanelEditorTabs.tsx | 2 +- .../PanelEditor/PanelNotSupported.tsx | 4 +- .../PanelEditor/PanelOptionsEditor.tsx | 4 +- .../PanelEditor/PanelOptionsTab.tsx | 4 +- .../PanelEditor/VisualizationTab.tsx | 8 +- .../components/PanelEditor/state/reducers.ts | 4 +- .../PanelEditor/state/selectors.test.ts | 2 +- .../components/PanelEditor/state/selectors.ts | 2 +- .../dashboard/components/PanelEditor/types.ts | 2 +- .../PanelEditor/usePanelLatestData.ts | 2 +- .../components/PanelEditor/utils.test.ts | 2 +- .../dashboard/components/PanelEditor/utils.ts | 2 +- .../RepeatRowSelect/RepeatRowSelect.tsx | 4 +- .../RowOptions/RowOptionsButton.tsx | 2 +- .../components/RowOptions/RowOptionsForm.tsx | 2 +- .../components/RowOptions/RowOptionsModal.tsx | 2 +- .../SaveDashboard/SaveDashboardAsModal.tsx | 2 +- .../SaveDashboard/SaveDashboardButton.tsx | 4 +- .../SaveDashboard/SaveDashboardErrorProxy.tsx | 6 +- .../SaveDashboard/SaveDashboardModal.tsx | 2 +- .../SaveProvisionedDashboard.tsx | 2 +- .../SaveDashboard/UnsavedChangesModal.tsx | 2 +- .../forms/SaveDashboardAsForm.test.tsx | 4 +- .../forms/SaveDashboardAsForm.tsx | 2 +- .../SaveDashboard/forms/SaveDashboardForm.tsx | 4 +- .../forms/SaveProvisionedDashboardForm.tsx | 10 +- .../SaveDashboard/useDashboardSave.tsx | 2 +- .../components/ShareModal/ShareEmbed.tsx | 6 +- .../components/ShareModal/ShareExport.tsx | 2 +- .../components/ShareModal/ShareLink.test.tsx | 6 +- .../components/ShareModal/ShareLink.tsx | 12 +- .../components/ShareModal/ShareModal.tsx | 2 +- .../components/ShareModal/ShareSnapshot.tsx | 6 +- .../dashboard/components/ShareModal/types.ts | 2 +- .../dashboard/components/ShareModal/utils.ts | 4 +- .../components/SubMenu/Annotations.tsx | 4 +- .../components/SubMenu/DashboardLinks.tsx | 6 +- .../SubMenu/DashboardLinksDashboard.tsx | 6 +- .../dashboard/components/SubMenu/SubMenu.tsx | 2 +- .../components/SubMenu/SubMenuItems.tsx | 2 +- .../TransformationEditor.tsx | 10 +- .../TransformationOperationRow.tsx | 4 +- .../TransformationOperationRows.tsx | 2 +- .../TransformationsEditor.test.tsx | 4 +- .../TransformationsEditor.tsx | 10 +- .../components/TransformationsEditor/types.ts | 2 +- .../VersionHistory/HistoryListCtrl.ts | 8 +- .../VersionHistory/HistorySrv.test.ts | 4 +- .../components/VersionHistory/HistorySrv.ts | 2 +- .../VersionHistory/RevertDashboardModal.tsx | 2 +- .../VersionHistory/VersionHistoryButtons.tsx | 2 +- .../VersionHistoryComparison.tsx | 2 +- .../VersionHistory/VersionHistoryHeader.tsx | 2 +- .../VersionHistory/VersionHistoryTable.tsx | 2 +- .../VersionHistory/useDashboardRestore.tsx | 2 +- .../VizTypePicker/VizTypePicker.tsx | 6 +- .../VizTypePicker/VizTypePickerPlugin.tsx | 8 +- .../containers/DashboardPage.test.tsx | 2 +- .../dashboard/containers/DashboardPage.tsx | 2 +- .../__snapshots__/DashboardPage.test.tsx.snap | 18 +- .../dashboard/dashgrid/DashboardPanel.tsx | 2 +- .../dashboard/dashgrid/PanelChrome.test.tsx | 2 +- .../dashboard/dashgrid/PanelChrome.tsx | 6 +- .../dashboard/dashgrid/PanelChromeAngular.tsx | 6 +- .../dashgrid/PanelHeader/PanelHeader.tsx | 6 +- .../PanelHeader/PanelHeaderCorner.tsx | 8 +- .../PanelHeaderLoadingIndicator.tsx | 6 +- .../dashgrid/PanelHeader/PanelHeaderMenu.tsx | 2 +- .../PanelHeader/PanelHeaderMenuItem.tsx | 6 +- .../PanelHeader/PanelHeaderMenuProvider.tsx | 2 +- .../PanelHeader/PanelHeaderMenuTrigger.tsx | 2 +- .../PanelHeader/PanelHeaderMenuWrapper.tsx | 2 +- .../PanelHeader/PanelHeaderNotice.tsx | 4 +- .../PanelHeader/PanelHeaderNotices.tsx | 2 +- .../dashboard/dashgrid/PanelPluginError.tsx | 4 +- .../__snapshots__/DashboardGrid.test.tsx.snap | 8 +- .../dashboard/services/ChangeTracker.ts | 4 +- .../dashboard/services/DashboardLoaderSrv.ts | 8 +- .../dashboard/services/DashboardSrv.ts | 4 +- .../dashboard/services/TimeSrv.test.ts | 2 +- .../features/dashboard/services/TimeSrv.ts | 8 +- .../dashboard/services/UnsavedChangesSrv.ts | 6 +- .../dashboard/state/DashboardMigrator.test.ts | 2 +- .../dashboard/state/DashboardMigrator.ts | 2 +- .../dashboard/state/DashboardModel.ts | 6 +- .../dashboard/state/PanelModel.test.ts | 4 +- .../features/dashboard/state/PanelModel.ts | 4 +- .../app/features/dashboard/state/actions.ts | 2 +- .../dashboard/state/analyticsProcessor.ts | 2 +- .../state/getPanelOptionsWithDefaults.test.ts | 2 +- .../state/getPanelOptionsWithDefaults.ts | 2 +- .../dashboard/state/initDashboard.test.ts | 2 +- .../features/dashboard/state/initDashboard.ts | 2 +- .../app/features/dashboard/state/reducers.ts | 4 +- .../dashboard/utils/getPanelMenu.test.ts | 2 +- .../features/dashboard/utils/getPanelMenu.ts | 4 +- .../dashboard/utils/getRefreshFromUrl.ts | 2 +- .../dashboard/utils/loadSnapshotData.ts | 2 +- .../features/dashboard/utils/panel.test.ts | 2 +- public/app/features/dashboard/utils/panel.ts | 4 +- .../features/datasources/DashboardsTable.tsx | 2 +- .../datasources/DataSourceDashboards.test.tsx | 2 +- .../datasources/DataSourceDashboards.tsx | 2 +- .../features/datasources/DataSourcesList.tsx | 4 +- .../datasources/DataSourcesListPage.test.tsx | 2 +- .../datasources/DataSourcesListPage.tsx | 6 +- .../datasources/NewDataSourcePage.tsx | 12 +- .../datasources/__mocks__/dataSourcesMocks.ts | 2 +- public/app/features/datasources/mocks.ts | 2 +- .../partials/tls_auth_settings.html | 2 +- .../datasources/settings/BasicSettings.tsx | 4 +- .../datasources/settings/ButtonRow.tsx | 2 +- .../datasources/settings/CloudInfoBox.tsx | 14 +- .../settings/DataSourceSettingsPage.test.tsx | 2 +- .../settings/DataSourceSettingsPage.tsx | 6 +- .../datasources/settings/PluginSettings.tsx | 4 +- .../DataSourceSettingsPage.test.tsx.snap | 4 +- .../app/features/datasources/state/actions.ts | 4 +- .../datasources/state/buildCategories.test.ts | 4 +- .../datasources/state/buildCategories.ts | 28 +- .../features/datasources/state/navModel.ts | 2 +- .../datasources/state/reducers.test.ts | 2 +- .../features/datasources/state/reducers.ts | 2 +- .../features/datasources/state/selectors.ts | 2 +- public/app/features/explore/AdHocFilter.tsx | 6 +- .../explore/AdHocFilterField.test.tsx | 2 +- .../app/features/explore/AdHocFilterField.tsx | 4 +- .../features/explore/ErrorContainer.test.tsx | 2 +- .../app/features/explore/ErrorContainer.tsx | 4 +- public/app/features/explore/Explore.test.tsx | 4 +- public/app/features/explore/Explore.tsx | 14 +- public/app/features/explore/ExploreDrawer.tsx | 6 +- .../features/explore/ExploreGraphNGPanel.tsx | 8 +- .../features/explore/ExploreGraphPanel.tsx | 6 +- .../features/explore/ExplorePaneContainer.tsx | 6 +- .../explore/ExploreQueryInspector.test.tsx | 2 +- .../explore/ExploreQueryInspector.tsx | 4 +- .../features/explore/ExploreTimeControls.tsx | 2 +- .../app/features/explore/ExploreToolbar.tsx | 4 +- public/app/features/explore/LiveLogs.test.tsx | 2 +- public/app/features/explore/LiveLogs.tsx | 6 +- .../app/features/explore/LiveTailButton.tsx | 6 +- public/app/features/explore/Logs.tsx | 20 +- public/app/features/explore/LogsContainer.tsx | 4 +- public/app/features/explore/MetaInfoText.tsx | 6 +- .../explore/NoDataSourceCallToAction.tsx | 4 +- .../features/explore/NodeGraphContainer.tsx | 4 +- public/app/features/explore/QueryEditor.tsx | 4 +- public/app/features/explore/QueryRow.test.tsx | 2 +- public/app/features/explore/QueryRow.tsx | 4 +- .../app/features/explore/QueryRowActions.tsx | 2 +- .../app/features/explore/QueryStatus.test.tsx | 2 +- public/app/features/explore/QueryStatus.tsx | 2 +- .../explore/ReturnToDashboardButton.tsx | 4 +- .../explore/RichHistory/RichHistory.test.tsx | 6 +- .../explore/RichHistory/RichHistory.tsx | 4 +- .../RichHistory/RichHistoryCard.test.tsx | 2 +- .../explore/RichHistory/RichHistoryCard.tsx | 8 +- .../RichHistoryQueriesTab.test.tsx | 2 +- .../RichHistory/RichHistoryQueriesTab.tsx | 6 +- .../RichHistory/RichHistorySettings.test.tsx | 2 +- .../RichHistory/RichHistorySettings.tsx | 8 +- .../RichHistory/RichHistoryStarredTab.tsx | 6 +- .../app/features/explore/RunButton.test.tsx | 2 +- public/app/features/explore/RunButton.tsx | 2 +- .../app/features/explore/SecondaryActions.tsx | 6 +- .../features/explore/TableContainer.test.tsx | 2 +- .../app/features/explore/TableContainer.tsx | 6 +- public/app/features/explore/Time.tsx | 2 +- .../app/features/explore/TimeSyncButton.tsx | 2 +- .../explore/TraceView/TraceView.test.tsx | 4 +- .../features/explore/TraceView/TraceView.tsx | 4 +- .../explore/TraceView/createSpanLink.test.ts | 4 +- .../explore/TraceView/createSpanLink.tsx | 6 +- .../features/explore/TraceView/uiElements.tsx | 10 +- public/app/features/explore/Wrapper.test.tsx | 6 +- public/app/features/explore/Wrapper.tsx | 2 +- .../explore/flotgraph/getGraphSeriesModel.ts | 4 +- .../app/features/explore/flotgraph/types.ts | 4 +- .../features/explore/state/datasource.test.ts | 2 +- .../app/features/explore/state/datasource.ts | 4 +- .../explore/state/explorePane.test.ts | 4 +- .../app/features/explore/state/explorePane.ts | 4 +- public/app/features/explore/state/history.ts | 2 +- .../app/features/explore/state/main.test.ts | 4 +- public/app/features/explore/state/main.ts | 4 +- .../app/features/explore/state/query.test.ts | 2 +- public/app/features/explore/state/query.ts | 2 +- .../features/explore/state/selectors.test.ts | 2 +- .../app/features/explore/state/time.test.ts | 2 +- public/app/features/explore/state/time.ts | 4 +- public/app/features/explore/state/utils.ts | 4 +- .../features/explore/useLiveTailControls.ts | 2 +- .../features/explore/utils/decorators.test.ts | 4 +- .../app/features/explore/utils/decorators.ts | 4 +- .../app/features/explore/utils/links.test.ts | 2 +- public/app/features/explore/utils/links.ts | 4 +- public/app/features/explore/utils/time.ts | 2 +- .../expressions/ExpressionDatasource.ts | 4 +- .../expressions/ExpressionQueryEditor.tsx | 4 +- public/app/features/expressions/types.ts | 2 +- .../features/folders/FolderPermissions.tsx | 4 +- .../folders/FolderSettingsPage.test.tsx | 2 +- .../features/folders/FolderSettingsPage.tsx | 4 +- .../components/NewDashboardsFolder.tsx | 4 +- public/app/features/folders/state/actions.ts | 4 +- public/app/features/folders/state/navModel.ts | 2 +- public/app/features/inspector/DetailText.tsx | 6 +- .../inspector/InspectDataTab.test.tsx | 2 +- .../app/features/inspector/InspectDataTab.tsx | 6 +- .../features/inspector/InspectErrorTab.tsx | 4 +- .../app/features/inspector/InspectJSONTab.tsx | 6 +- .../features/inspector/InspectMetadataTab.tsx | 2 +- .../features/inspector/InspectStatsTab.tsx | 4 +- .../features/inspector/InspectStatsTable.tsx | 8 +- .../features/inspector/InspectSubtitle.tsx | 6 +- .../app/features/inspector/QueryInspector.tsx | 10 +- public/app/features/inspector/styles.ts | 2 +- .../AddLibraryPanelModal.tsx | 2 +- .../DeleteLibraryPanelModal.tsx | 4 +- .../DeleteLibraryPanelModal/reducer.test.ts | 2 +- .../DeleteLibraryPanelModal/reducer.ts | 2 +- .../LibraryPanelCard/LibraryPanelCard.tsx | 6 +- .../LibraryPanelInfo/LibraryPanelInfo.tsx | 6 +- .../LibraryPanelsView/LibraryPanelsView.tsx | 6 +- .../LibraryPanelsView/reducer.test.ts | 2 +- .../components/LibraryPanelsView/reducer.ts | 2 +- .../PanelLibraryOptionsGroup.tsx | 6 +- .../SaveLibraryPanelModal.tsx | 2 +- .../components/UnlinkModal/UnlinkModal.tsx | 2 +- .../app/features/library-panels/state/api.ts | 2 +- public/app/features/library-panels/styles.ts | 4 +- public/app/features/live/channel.ts | 4 +- .../live/dashboard/DashboardChangedModal.tsx | 10 +- .../live/dashboard/dashboardWatcher.ts | 14 +- public/app/features/live/features.ts | 14 +- public/app/features/live/live.ts | 34 +- .../live/measurements/measurementsSupport.ts | 4 +- public/app/features/live/scopes.ts | 20 +- .../manage-dashboards/DashboardImportPage.tsx | 6 +- .../manage-dashboards/SnapshotListPage.tsx | 2 +- .../components/ImportDashboardForm.tsx | 4 +- .../components/ImportDashboardOverview.tsx | 4 +- .../components/SnapshotListTable.tsx | 4 +- .../uploadDashboardDirective.ts | 2 +- .../manage-dashboards/state/actions.ts | 4 +- .../manage-dashboards/state/reducers.ts | 2 +- .../manage-dashboards/state/selectors.ts | 2 +- .../manage-dashboards/utils/validation.ts | 2 +- public/app/features/org/NewOrgPage.tsx | 6 +- .../app/features/org/OrgDetailsPage.test.tsx | 2 +- public/app/features/org/OrgDetailsPage.tsx | 4 +- public/app/features/org/OrgProfile.tsx | 2 +- public/app/features/org/SelectOrgPage.tsx | 6 +- public/app/features/org/UserInviteForm.tsx | 6 +- public/app/features/org/UserInvitePage.tsx | 2 +- public/app/features/org/state/actions.ts | 2 +- .../app/features/panel/metrics_panel_ctrl.ts | 2 +- public/app/features/panel/panel_ctrl.ts | 2 +- public/app/features/panel/panel_directive.ts | 6 +- public/app/features/panel/panel_editor_tab.ts | 2 +- .../panel/panellinks/linkSuppliers.test.ts | 4 +- .../panel/panellinks/linkSuppliers.ts | 2 +- .../app/features/panel/panellinks/link_srv.ts | 2 +- .../app/features/panel/panellinks/module.ts | 2 +- .../panel/panellinks/specs/link_srv.test.ts | 12 +- public/app/features/panel/query_editor_row.ts | 2 +- .../features/playlist/partials/playlists.html | 4 +- .../features/playlist/playlist_edit_ctrl.ts | 4 +- .../app/features/playlist/playlist_routes.ts | 4 +- public/app/features/playlist/playlist_srv.ts | 4 +- .../app/features/playlist/playlists_ctrl.ts | 4 +- .../playlist/specs/playlist_srv.test.ts | 4 +- .../app/features/plugins/AppRootPage.test.tsx | 2 +- public/app/features/plugins/AppRootPage.tsx | 2 +- .../app/features/plugins/PluginDashboards.tsx | 4 +- public/app/features/plugins/PluginList.tsx | 4 +- .../app/features/plugins/PluginListItem.tsx | 4 +- .../features/plugins/PluginListPage.test.tsx | 8 +- .../app/features/plugins/PluginListPage.tsx | 8 +- public/app/features/plugins/PluginPage.tsx | 20 +- .../features/plugins/PluginSettingsCache.ts | 4 +- .../features/plugins/PluginSignatureBadge.tsx | 6 +- .../app/features/plugins/PluginStateInfo.tsx | 4 +- .../features/plugins/PluginsErrorsInfo.tsx | 6 +- .../features/plugins/__mocks__/pluginMocks.ts | 6 +- .../__snapshots__/PluginList.test.tsx.snap | 12 +- .../app/features/plugins/built_in_plugins.ts | 10 +- public/app/features/plugins/datasource_srv.ts | 12 +- .../plugins/partials/update_instructions.html | 6 +- .../app/features/plugins/plugin_component.ts | 8 +- .../features/plugins/plugin_loader.test.ts | 4 +- public/app/features/plugins/plugin_loader.ts | 56 +- .../app/features/plugins/plugin_page_ctrl.ts | 8 +- .../plugins/specs/datasource_srv.test.ts | 16 +- public/app/features/plugins/state/actions.ts | 4 +- .../features/plugins/state/reducers.test.ts | 2 +- public/app/features/plugins/state/reducers.ts | 2 +- .../plugins/variableQueryEditorLoader.tsx | 4 +- .../plugins/wrappers/AppConfigWrapper.tsx | 6 +- .../features/profile/ChangePasswordForm.tsx | 2 +- .../features/profile/ChangePasswordPage.tsx | 6 +- public/app/features/profile/ProfileCtrl.ts | 4 +- .../features/profile/UserOrganizations.tsx | 2 +- .../app/features/profile/UserProfileEdit.tsx | 6 +- .../features/profile/UserProfileEditForm.tsx | 2 +- public/app/features/profile/UserSessions.tsx | 2 +- public/app/features/profile/UserTeams.tsx | 2 +- public/app/features/profile/state/reducers.ts | 2 +- .../features/query/components/HelpToggle.tsx | 6 +- .../query/components/QueryEditorRow.test.ts | 2 +- .../query/components/QueryEditorRow.tsx | 8 +- .../query/components/QueryEditorRowTitle.tsx | 8 +- .../query/components/QueryEditorRows.tsx | 2 +- .../features/query/components/QueryGroup.tsx | 8 +- .../query/components/QueryGroupOptions.tsx | 4 +- .../query/state/PanelQueryRunner.test.ts | 58 +- .../features/query/state/PanelQueryRunner.ts | 4 +- .../query/state/queryAnalytics.test.ts | 12 +- .../features/query/state/queryAnalytics.ts | 4 +- .../features/query/state/runRequest.test.ts | 4 +- public/app/features/query/state/runRequest.ts | 4 +- public/app/features/query/state/types.ts | 2 +- public/app/features/sandbox/TestStuffPage.tsx | 4 +- .../features/search/components/ActionRow.tsx | 6 +- .../search/components/ConfirmDeleteModal.tsx | 8 +- .../search/components/DashboardActions.tsx | 2 +- .../search/components/DashboardListPage.tsx | 4 +- .../search/components/DashboardSearch.tsx | 6 +- .../search/components/ManageDashboards.tsx | 6 +- .../search/components/MoveToFolderModal.tsx | 6 +- .../search/components/SearchCheckbox.tsx | 2 +- .../search/components/SearchField.tsx | 6 +- .../features/search/components/SearchItem.tsx | 8 +- .../search/components/SearchResults.tsx | 8 +- .../search/components/SearchResultsFilter.tsx | 6 +- .../search/components/SearchWrapper.tsx | 2 +- .../search/components/SectionHeader.tsx | 6 +- .../search/hooks/useDashboardSearch.ts | 4 +- .../features/search/hooks/useSearchQuery.ts | 2 +- public/app/features/search/types.ts | 2 +- public/app/features/search/utils.ts | 4 +- public/app/features/teams/CreateTeam.tsx | 6 +- public/app/features/teams/TeamGroupSync.tsx | 8 +- public/app/features/teams/TeamList.test.tsx | 2 +- public/app/features/teams/TeamList.tsx | 4 +- .../app/features/teams/TeamMemberRow.test.tsx | 2 +- public/app/features/teams/TeamMemberRow.tsx | 4 +- .../app/features/teams/TeamMembers.test.tsx | 2 +- public/app/features/teams/TeamMembers.tsx | 2 +- public/app/features/teams/TeamPages.test.tsx | 8 +- public/app/features/teams/TeamPages.tsx | 2 +- public/app/features/teams/TeamSettings.tsx | 2 +- .../__snapshots__/TeamGroupSync.test.tsx.snap | 12 +- public/app/features/teams/state/actions.ts | 2 +- public/app/features/teams/state/navModel.ts | 2 +- .../features/teams/state/selectors.test.ts | 14 +- public/app/features/teams/state/selectors.ts | 2 +- .../app/features/templating/formatRegistry.ts | 2 +- .../features/templating/template_srv.test.ts | 6 +- .../app/features/templating/template_srv.ts | 12 +- public/app/features/users/InviteeRow.tsx | 2 +- .../app/features/users/SignupInvited.test.tsx | 8 +- public/app/features/users/SignupInvited.tsx | 10 +- .../app/features/users/TokenRevokedModal.tsx | 8 +- public/app/features/users/UsersActionBar.tsx | 2 +- .../app/features/users/UsersListPage.test.tsx | 2 +- public/app/features/users/UsersListPage.tsx | 6 +- public/app/features/users/UsersTable.test.tsx | 2 +- public/app/features/users/UsersTable.tsx | 4 +- public/app/features/users/state/actions.ts | 2 +- public/app/features/variables/adapters.ts | 2 +- .../variables/adhoc/AdHocVariableEditor.tsx | 4 +- .../features/variables/adhoc/actions.test.ts | 2 +- .../adhoc/picker/AdHocFilterBuilder.tsx | 2 +- .../variables/adhoc/picker/AdHocFilterKey.tsx | 4 +- .../adhoc/picker/AdHocFilterRenderer.tsx | 2 +- .../adhoc/picker/AdHocFilterValue.tsx | 4 +- .../variables/adhoc/picker/AdHocPicker.tsx | 2 +- .../adhoc/picker/OperatorSegment.tsx | 4 +- .../variables/adhoc/urlParser.test.ts | 2 +- .../app/features/variables/adhoc/urlParser.ts | 2 +- .../constant/ConstantVariableEditor.tsx | 4 +- .../variables/custom/CustomVariableEditor.tsx | 2 +- .../datasource/DataSourceVariableEditor.tsx | 4 +- .../variables/datasource/actions.test.ts | 2 +- .../features/variables/datasource/actions.ts | 4 +- .../variables/datasource/reducer.test.ts | 2 +- .../features/variables/datasource/reducer.ts | 2 +- .../editor/LegacyVariableQueryEditor.tsx | 10 +- .../editor/SelectionOptionsEditor.tsx | 4 +- .../editor/VariableEditorContainer.tsx | 4 +- .../variables/editor/VariableEditorEditor.tsx | 6 +- .../variables/editor/VariableEditorList.tsx | 10 +- .../variables/editor/VariableHideSelect.tsx | 4 +- .../editor/VariableSectionHeader.tsx | 6 +- .../variables/editor/VariableSelectField.tsx | 6 +- .../variables/editor/VariableSwitchField.tsx | 2 +- .../editor/VariableTextAreaField.tsx | 6 +- .../variables/editor/VariableTextField.tsx | 2 +- .../variables/editor/VariableTypeSelect.tsx | 4 +- .../editor/VariableValuesPreview.tsx | 8 +- .../app/features/variables/editor/actions.ts | 4 +- .../editor/getVariableQueryEditor.test.tsx | 2 +- .../editor/getVariableQueryEditor.tsx | 4 +- .../getAllVariableValuesForUrl.test.ts | 2 +- .../variables/getAllVariableValuesForUrl.ts | 4 +- public/app/features/variables/guard.test.ts | 2 +- public/app/features/variables/guard.ts | 2 +- .../variables/inspect/NetworkGraphModal.tsx | 2 +- .../inspect/VariableUsagesButton.tsx | 2 +- .../inspect/VariablesDependenciesButton.tsx | 2 +- .../inspect/VariablesUnknownButton.tsx | 2 +- .../inspect/VariablesUnknownTable.tsx | 6 +- .../interval/IntervalVariableEditor.tsx | 4 +- .../variables/interval/actions.test.ts | 20 +- .../features/variables/interval/actions.ts | 6 +- .../OptionsPicker/OptionPicker.test.tsx | 4 +- .../pickers/OptionsPicker/OptionsPicker.tsx | 4 +- .../pickers/OptionsPicker/actions.test.ts | 4 +- .../pickers/OptionsPicker/actions.ts | 2 +- .../variables/pickers/PickerRenderer.tsx | 4 +- .../variables/pickers/shared/VariableLink.tsx | 8 +- .../pickers/shared/VariableOptions.tsx | 4 +- .../query/QueryVariableEditor.test.tsx | 4 +- .../variables/query/QueryVariableEditor.tsx | 10 +- .../query/QueryVariableRefreshSelect.tsx | 4 +- .../query/QueryVariableSortSelect.tsx | 4 +- .../query/VariableQueryRunner.test.ts | 2 +- .../variables/query/VariableQueryRunner.ts | 2 +- .../features/variables/query/actions.test.ts | 4 +- .../app/features/variables/query/actions.ts | 2 +- .../variables/query/operators.test.ts | 2 +- .../app/features/variables/query/operators.ts | 2 +- .../variables/query/queryRunners.test.ts | 2 +- .../features/variables/query/queryRunners.ts | 2 +- .../features/variables/query/reducer.test.ts | 2 +- .../app/features/variables/query/reducer.ts | 2 +- .../query/variableQueryObserver.test.ts | 2 +- .../variables/query/variableQueryObserver.ts | 2 +- .../variables/shared/formatVariable.ts | 2 +- .../variables/shared/testing/helpers.ts | 2 +- .../features/variables/state/actions.test.ts | 4 +- .../app/features/variables/state/actions.ts | 2 +- .../app/features/variables/state/helpers.ts | 2 +- .../state/onTimeRangeUpdated.test.ts | 2 +- .../variables/state/processVariable.test.ts | 4 +- .../features/variables/state/reducers.test.ts | 2 +- .../variables/state/sharedReducer.test.ts | 2 +- .../features/variables/state/sharedReducer.ts | 2 +- public/app/features/variables/state/types.ts | 2 +- .../state/upgradeLegacyQueries.test.ts | 2 +- .../app/features/variables/system/adapter.ts | 2 +- .../textbox/TextBoxVariableEditor.tsx | 4 +- .../textbox/TextBoxVariablePicker.tsx | 2 +- .../app/features/variables/textbox/actions.ts | 2 +- public/app/features/variables/types.ts | 2 +- public/app/features/variables/utils.ts | 4 +- public/app/partials/signup_invited.html | 2 +- .../CloudMonitoringMetricFindQuery.ts | 2 +- .../datasource/cloud-monitoring/README.md | 2 +- .../datasource/cloud-monitoring/api.test.ts | 4 +- .../datasource/cloud-monitoring/api.ts | 4 +- .../components/Aggregations.test.tsx | 2 +- .../components/Aggregations.tsx | 4 +- .../components/AlignmentPeriods.tsx | 6 +- .../components/Alignments.tsx | 4 +- .../components/AnnotationQueryEditor.tsx | 6 +- .../components/AnnotationsHelp.tsx | 2 +- .../cloud-monitoring/components/Fields.tsx | 4 +- .../cloud-monitoring/components/GroupBys.tsx | 4 +- .../cloud-monitoring/components/Help.tsx | 6 +- .../components/LabelFilter.tsx | 4 +- .../components/MQLQueryEditor.tsx | 2 +- .../components/MetricQueryEditor.tsx | 2 +- .../cloud-monitoring/components/Metrics.tsx | 6 +- .../cloud-monitoring/components/Project.tsx | 4 +- .../components/QueryEditor.tsx | 4 +- .../cloud-monitoring/components/QueryType.tsx | 4 +- .../components/SLOQueryEditor.tsx | 4 +- .../components/VariableQueryEditor.test.tsx | 6 +- .../components/VariableQueryEditor.tsx | 4 +- .../components/VisualMetricQueryEditor.tsx | 2 +- .../datasource/cloud-monitoring/constants.ts | 2 +- .../dashboards/cloud-storage-monitoring.json | 8 +- .../dashboards/cloudfunctions-monitoring.json | 8 +- .../dashboards/cloudsql-monitoring.json | 8 +- .../dashboards/cloudsql-mysql-monitoring.json | 8 +- .../cloudsql-postgre-monitoring.json | 8 +- .../dashboards/cloudtasks-monitoring.json | 8 +- .../dashboards/dataprocessing-monitoring.json | 8 +- .../firewall-insight-monitoring.json | 8 +- .../dashboards/gce-network-monitoring.json | 8 +- .../gce-vm-instance-monitoring.json | 8 +- .../gke-prometheus-pod-node-monitoring.json | 8 +- .../https-lb-backend-services-monitoring.json | 8 +- .../https-loadbalancer-monitoring.json | 8 +- .../dashboards/micro-service-monitoring.json | 8 +- .../network-tcp-loadbalancer-monitoring.json | 8 +- .../datasource/cloud-monitoring/datasource.ts | 4 +- .../datasource/cloud-monitoring/functions.ts | 4 +- .../datasource/cloud-monitoring/module.ts | 2 +- .../cloud-monitoring/partials/config.html | 12 +- .../cloud-monitoring/specs/datasource.test.ts | 6 +- .../cloud-monitoring/specs/testData.ts | 4 +- .../datasource/cloud-monitoring/types.ts | 2 +- .../datasource/cloud-monitoring/variables.ts | 2 +- .../plugins/datasource/cloudwatch/README.md | 2 +- .../cloudwatch/components/Alias.tsx | 2 +- .../components/AnnotationQueryEditor.tsx | 4 +- .../cloudwatch/components/CloudWatchLink.tsx | 4 +- .../components/ConfigEditor.test.tsx | 2 +- .../cloudwatch/components/ConfigEditor.tsx | 10 +- .../cloudwatch/components/Dimensions.tsx | 4 +- .../cloudwatch/components/Forms.tsx | 2 +- .../cloudwatch/components/LogsCheatSheet.tsx | 4 +- .../cloudwatch/components/LogsQueryEditor.tsx | 4 +- .../components/LogsQueryField.test.tsx | 2 +- .../cloudwatch/components/LogsQueryField.tsx | 6 +- .../components/MetricsQueryEditor.test.tsx | 2 +- .../components/MetricsQueryEditor.tsx | 4 +- .../components/MetricsQueryFieldsEditor.tsx | 4 +- .../components/PanelQueryEditor.tsx | 4 +- .../cloudwatch/components/Stats.tsx | 4 +- .../datasource/cloudwatch/dashboards/EBS.json | 8 +- .../cloudwatch/dashboards/Lambda.json | 8 +- .../cloudwatch/dashboards/Logs.json | 8 +- .../datasource/cloudwatch/dashboards/RDS.json | 8 +- .../datasource/cloudwatch/dashboards/ec2.json | 8 +- .../datasource/cloudwatch/datasource.test.ts | 4 +- .../datasource/cloudwatch/datasource.ts | 12 +- .../cloudwatch/language_provider.test.ts | 2 +- .../cloudwatch/language_provider.ts | 4 +- .../plugins/datasource/cloudwatch/module.tsx | 2 +- .../cloudwatch/query_parameter_ctrl.ts | 2 +- .../cloudwatch/specs/datasource.test.ts | 6 +- .../plugins/datasource/cloudwatch/syntax.ts | 2 +- .../plugins/datasource/cloudwatch/types.ts | 4 +- .../dashboard/DashboardQueryEditor.tsx | 4 +- .../dashboard/DashboardQueryRow.tsx | 6 +- .../datasource/dashboard/datasource.ts | 2 +- .../plugins/datasource/dashboard/module.ts | 2 +- .../dashboard/runSharedRequest.test.ts | 2 +- .../datasource/dashboard/runSharedRequest.ts | 2 +- .../app/plugins/datasource/dashboard/types.ts | 2 +- .../datasource/elasticsearch/README.md | 2 +- .../elasticsearch/components/IconButton.tsx | 2 +- .../elasticsearch/components/MetricPicker.tsx | 4 +- .../BucketAggregationEditor.tsx | 4 +- .../FiltersSettingsEditor/index.tsx | 2 +- .../SettingsEditor/index.tsx | 2 +- .../BucketAggregationsEditor/utils.ts | 2 +- .../MetricAggregationsEditor/MetricEditor.tsx | 4 +- .../BucketScriptSettingsEditor/index.tsx | 2 +- .../MovingAverageSettingsEditor.tsx | 2 +- .../SettingsEditor/SettingField.tsx | 2 +- .../SettingsEditor/index.tsx | 2 +- .../MetricAggregationsEditor/styles.ts | 6 +- .../components/QueryEditor/QueryEditorRow.tsx | 6 +- .../QueryEditor/SettingsEditorContainer.tsx | 6 +- .../components/QueryEditor/index.tsx | 4 +- .../configuration/ConfigEditor.test.tsx | 2 +- .../configuration/ConfigEditor.tsx | 4 +- .../elasticsearch/configuration/DataLink.tsx | 4 +- .../configuration/DataLinks.test.tsx | 2 +- .../elasticsearch/configuration/DataLinks.tsx | 6 +- .../configuration/ElasticDetails.test.tsx | 2 +- .../configuration/ElasticDetails.tsx | 4 +- .../configuration/LogsConfig.test.tsx | 2 +- .../configuration/LogsConfig.tsx | 2 +- .../elasticsearch/configuration/mocks.ts | 2 +- .../elasticsearch/datasource.test.ts | 8 +- .../datasource/elasticsearch/datasource.ts | 6 +- .../elasticsearch/elastic_response.ts | 2 +- .../datasource/elasticsearch/index_pattern.ts | 2 +- .../elasticsearch/language_provider.test.ts | 2 +- .../elasticsearch/language_provider.ts | 2 +- .../datasource/elasticsearch/module.ts | 2 +- .../datasource/elasticsearch/query_help.md | 2 +- .../specs/elastic_response.test.ts | 2 +- .../elasticsearch/specs/index_pattern.test.ts | 2 +- .../plugins/datasource/elasticsearch/types.ts | 2 +- .../datasource/elasticsearch/utils.test.ts | 4 +- .../plugins/datasource/elasticsearch/utils.ts | 2 +- .../datasource/grafana/annotation_ctrl.ts | 20 - .../app/plugins/datasource/grafana/module.ts | 9 - .../app/plugins/datasource/grafana/types.ts | 38 - .../datasource/graphite/FunctionEditor.tsx | 2 +- .../graphite/FunctionEditorControls.tsx | 2 +- .../graphite/MetricTankMetaInspector.tsx | 4 +- .../app/plugins/datasource/graphite/README.md | 6 +- .../graphite/configuration/ConfigEditor.tsx | 4 +- .../graphite/dashboards/metrictank.json | 2 +- .../plugins/datasource/graphite/datasource.ts | 8 +- .../app/plugins/datasource/graphite/gfunc.ts | 2 +- .../datasource/graphite/graphite_query.ts | 4 +- .../app/plugins/datasource/graphite/meta.ts | 2 +- .../app/plugins/datasource/graphite/module.ts | 2 +- .../plugins/datasource/graphite/query_ctrl.ts | 4 +- .../plugins/datasource/graphite/query_help.md | 2 +- .../graphite/specs/datasource.test.ts | 6 +- .../app/plugins/datasource/graphite/types.ts | 2 +- .../app/plugins/datasource/influxdb/README.md | 8 +- .../influxdb/components/ConfigEditor.tsx | 8 +- .../influxdb/components/FluxQueryEditor.tsx | 6 +- .../components/InfluxLogsQueryField.test.tsx | 2 +- .../components/InfluxLogsQueryField.tsx | 6 +- .../influxdb/components/InfluxStartPage.tsx | 2 +- .../components/VariableQueryEditor.tsx | 2 +- .../__snapshots__/ConfigEditor.test.tsx.snap | 8 +- .../plugins/datasource/influxdb/datasource.ts | 6 +- .../datasource/influxdb/influx_query_model.ts | 4 +- .../datasource/influxdb/influx_series.ts | 2 +- .../app/plugins/datasource/influxdb/module.ts | 2 +- .../plugins/datasource/influxdb/query_ctrl.ts | 2 +- .../plugins/datasource/influxdb/query_help.md | 4 +- .../influxdb/specs/datasource.test.ts | 6 +- .../app/plugins/datasource/influxdb/types.ts | 2 +- .../datasource/jaeger/ConfigEditor.tsx | 4 +- .../datasource/jaeger/QueryField.test.tsx | 2 +- .../plugins/datasource/jaeger/QueryField.tsx | 6 +- .../datasource/jaeger/datasource.test.ts | 4 +- .../plugins/datasource/jaeger/datasource.ts | 4 +- .../app/plugins/datasource/jaeger/module.ts | 2 +- .../jaeger/responseTransform.test.ts | 2 +- .../datasource/jaeger/responseTransform.ts | 2 +- .../loki/components/LokiCheatSheet.tsx | 2 +- .../LokiExploreQueryEditor.test.tsx | 4 +- .../components/LokiExploreQueryEditor.tsx | 2 +- .../datasource/loki/components/LokiLabel.tsx | 6 +- .../loki/components/LokiLabelBrowser.test.tsx | 2 +- .../loki/components/LokiLabelBrowser.tsx | 10 +- .../loki/components/LokiOptionFields.tsx | 2 +- .../loki/components/LokiQueryEditor.test.tsx | 2 +- .../loki/components/LokiQueryEditor.tsx | 4 +- .../loki/components/LokiQueryFieldForm.tsx | 4 +- .../LokiExploreQueryEditor.test.tsx.snap | 2 +- .../loki/configuration/ConfigEditor.test.tsx | 2 +- .../loki/configuration/ConfigEditor.tsx | 4 +- .../loki/configuration/DebugSection.test.tsx | 2 +- .../loki/configuration/DebugSection.tsx | 4 +- .../loki/configuration/DerivedField.test.tsx | 2 +- .../loki/configuration/DerivedField.tsx | 4 +- .../loki/configuration/DerivedFields.test.tsx | 2 +- .../loki/configuration/DerivedFields.tsx | 6 +- .../loki/configuration/MaxLinesField.tsx | 2 +- .../datasource/loki/datasource.test.ts | 18 +- .../app/plugins/datasource/loki/datasource.ts | 6 +- .../{grafana_icon.svg => plutono_icon.svg} | 0 .../datasource/loki/language_provider.test.ts | 2 +- .../datasource/loki/language_provider.ts | 4 +- .../datasource/loki/live_streams.test.ts | 2 +- .../plugins/datasource/loki/live_streams.ts | 2 +- public/app/plugins/datasource/loki/mocks.ts | 2 +- public/app/plugins/datasource/loki/module.ts | 2 +- .../loki/result_transformer.test.ts | 26 +- .../datasource/loki/result_transformer.ts | 4 +- public/app/plugins/datasource/loki/syntax.ts | 2 +- public/app/plugins/datasource/loki/types.ts | 2 +- .../datasource/mixed/MixedDataSource.test.ts | 8 +- .../datasource/mixed/MixedDataSource.ts | 4 +- public/app/plugins/datasource/mssql/README.md | 8 +- .../plugins/datasource/mssql/datasource.ts | 4 +- .../datasource/mssql/partials/config.html | 4 +- .../mssql/partials/query.editor.html | 2 +- .../plugins/datasource/mssql/query_ctrl.ts | 2 +- .../datasource/mssql/response_parser.ts | 2 +- .../datasource/mssql/specs/datasource.test.ts | 10 +- public/app/plugins/datasource/mysql/README.md | 6 +- .../plugins/datasource/mysql/datasource.ts | 4 +- .../plugins/datasource/mysql/mysql_query.ts | 4 +- .../datasource/mysql/partials/config.html | 6 +- .../mysql/partials/query.editor.html | 2 +- .../plugins/datasource/mysql/query_ctrl.ts | 4 +- .../datasource/mysql/specs/datasource.test.ts | 12 +- public/app/plugins/datasource/mysql/types.ts | 2 +- .../app/plugins/datasource/opentsdb/README.md | 4 +- .../opentsdb/components/ConfigEditor.tsx | 4 +- .../opentsdb/components/OpenTsdbDetails.tsx | 4 +- .../plugins/datasource/opentsdb/datasource.ts | 4 +- .../app/plugins/datasource/opentsdb/module.ts | 2 +- .../plugins/datasource/opentsdb/query_ctrl.ts | 2 +- .../opentsdb/specs/datasource.test.ts | 4 +- .../app/plugins/datasource/opentsdb/types.ts | 2 +- .../__mocks__/query_ctrl.ts | 0 .../__mocks__/sdk.ts | 0 .../annotations_query_ctrl.ts | 2 +- .../app_insights_datasource.test.ts | 8 +- .../app_insights/app_insights_datasource.ts | 6 +- .../app_insights/response_parser.ts | 2 +- .../azure_log_analytics/__mocks__/schema.ts | 0 .../azure_log_analytics_datasource.test.ts | 6 +- .../azure_log_analytics_datasource.ts | 6 +- .../response_parser.test.ts | 0 .../azure_log_analytics/response_parser.ts | 2 +- .../azure_monitor_datasource.test.ts | 6 +- .../azure_monitor/azure_monitor_datasource.ts | 6 +- .../azure_monitor/response_parser.ts | 0 .../azure_monitor/supported_namespaces.ts | 0 .../azure_monitor/url_builder.test.ts | 0 .../azure_monitor/url_builder.ts | 0 .../components/AnalyticsConfig.test.tsx | 2 +- .../components/AnalyticsConfig.tsx | 6 +- .../components/AzureCredentialsForm.test.tsx | 0 .../components/AzureCredentialsForm.tsx | 4 +- .../components/ConfigEditor.test.tsx | 2 +- .../components/ConfigEditor.tsx | 4 +- .../components/InsightsConfig.test.tsx | 2 +- .../components/InsightsConfig.tsx | 2 +- .../components/MonitorConfig.tsx | 2 +- .../AnalyticsConfig.test.tsx.snap | 0 .../AzureCredentialsForm.test.tsx.snap | 0 .../__snapshots__/ConfigEditor.test.tsx.snap | 8 +- .../InsightsConfig.test.tsx.snap | 0 .../css/query_editor.css | 0 .../datasource.ts | 4 +- .../editor/KustoQueryField.tsx | 8 +- .../editor/editor_component.tsx | 0 .../editor/kusto/kusto.ts | 8 +- .../editor/query_field.tsx | 2 +- .../editor/typeahead.tsx | 0 .../img/azure_monitor_cpu.png | Bin .../img/azure_monitor_network.png | Bin .../img/config_1_select_type.png | Bin .../config_2_azure_monitor_api_details.png | Bin .../img/config_3_app_insights_api_details.png | Bin .../img/config_4_save_and_test.png | Bin .../img/contoso_loans_plutono_dashboard.png} | Bin .../img/logo.jpg | Bin .../img/plutono_cloud_install.png} | Bin .../img/plutono_cloud_login.png} | Bin .../insights_analytics_datasource.ts | 4 +- .../log_analytics/querystring_builder.test.ts | 18 +- .../log_analytics/querystring_builder.ts | 2 +- .../module.tsx | 2 +- .../partials/annotations.editor.html | 0 .../partials/query.editor.html | 0 .../plugin.json | 30 +- .../query_ctrl.test.ts | 0 .../query_ctrl.ts | 4 +- .../query_help.md | 0 .../time_grain_converter.test.ts | 0 .../time_grain_converter.ts | 2 +- .../types.ts | 2 +- .../datasource/{grafana => plutono}/README.md | 4 +- .../datasource/plutono/annotation_ctrl.ts | 20 + .../components/QueryEditor.tsx | 30 +- .../{grafana => plutono}/datasource.test.ts | 22 +- .../{grafana => plutono}/datasource.ts | 22 +- .../app/plugins/datasource/plutono/module.ts | 9 + .../partials/annotations.editor.html | 2 +- .../{grafana => plutono}/plugin.json | 4 +- .../app/plugins/datasource/plutono/types.ts | 38 + .../app/plugins/datasource/postgres/README.md | 8 +- .../plugins/datasource/postgres/datasource.ts | 4 +- .../datasource/postgres/partials/config.html | 18 +- .../postgres/partials/query.editor.html | 2 +- .../datasource/postgres/postgres_query.ts | 4 +- .../plugins/datasource/postgres/query_ctrl.ts | 4 +- .../postgres/specs/datasource.test.ts | 26 +- .../app/plugins/datasource/postgres/types.ts | 2 +- .../plugins/datasource/prometheus/README.md | 4 +- .../prometheus/add_label_to_query.test.ts | 4 +- .../prometheus/add_label_to_query.ts | 4 +- .../prometheus/components/PromCheatSheet.tsx | 2 +- .../components/PromExemplarField.tsx | 6 +- .../components/PromExploreExtraField.tsx | 2 +- .../PromExploreQueryEditor.test.tsx | 4 +- .../components/PromExploreQueryEditor.tsx | 2 +- .../prometheus/components/PromLink.test.tsx | 2 +- .../prometheus/components/PromLink.tsx | 2 +- .../components/PromQueryEditor.test.tsx | 2 +- .../prometheus/components/PromQueryEditor.tsx | 4 +- .../components/PromQueryField.test.tsx | 2 +- .../prometheus/components/PromQueryField.tsx | 4 +- .../PromExploreQueryEditor.test.tsx.snap | 2 +- .../prometheus/configuration/ConfigEditor.tsx | 4 +- .../configuration/ExemplarSetting.tsx | 2 +- .../configuration/ExemplarsSettings.tsx | 2 +- .../configuration/PromSettings.test.tsx | 4 +- .../prometheus/configuration/PromSettings.tsx | 4 +- .../prometheus/configuration/mocks.ts | 2 +- ...{grafana_stats.json => plutono_stats.json} | 50 +- .../dashboards/prometheus_2_stats.json | 2 +- .../dashboards/prometheus_stats.json | 4 +- .../datasource/prometheus/datasource.test.ts | 6 +- .../datasource/prometheus/datasource.ts | 4 +- .../prometheus/language_provider.test.ts | 2 +- .../prometheus/language_provider.ts | 4 +- .../prometheus/metric_find_query.test.ts | 8 +- .../prometheus/metric_find_query.ts | 2 +- .../plugins/datasource/prometheus/module.ts | 2 +- .../plugins/datasource/prometheus/plugin.json | 4 +- .../plugins/datasource/prometheus/promql.ts | 2 +- .../datasource/prometheus/query_hints.ts | 2 +- .../prometheus/result_transformer.test.ts | 4 +- .../prometheus/result_transformer.ts | 4 +- .../plugins/datasource/prometheus/types.ts | 4 +- .../datasource/prometheus/variables.ts | 4 +- .../plugins/datasource/tempo/ConfigEditor.tsx | 4 +- .../plugins/datasource/tempo/QueryField.tsx | 6 +- .../datasource/tempo/datasource.test.ts | 6 +- .../plugins/datasource/tempo/datasource.ts | 4 +- public/app/plugins/datasource/tempo/module.ts | 2 +- .../datasource/testdata/ConfigEditor.tsx | 2 +- .../plugins/datasource/testdata/LogIpsum.ts | 2 +- .../datasource/testdata/QueryEditor.test.tsx | 8 +- .../datasource/testdata/QueryEditor.tsx | 14 +- .../datasource/testdata/TestInfoTab.tsx | 4 +- .../testdata/__mocks__/scenarios.ts | 4 +- .../testdata/components/CSVWaveEditor.tsx | 2 +- .../testdata/components/ManualEntryEditor.tsx | 4 +- .../testdata/components/NodeGraphEditor.tsx | 2 +- ...naLiveEditor.tsx => PlutonoLiveEditor.tsx} | 6 +- .../components/PredictablePulseEditor.tsx | 2 +- .../testdata/components/RandomWalkEditor.tsx | 4 +- .../components/StreamingClientEditor.tsx | 4 +- .../testdata/dashboards/streaming.json | 8 +- .../plugins/datasource/testdata/datasource.ts | 16 +- .../plugins/datasource/testdata/module.tsx | 2 +- .../datasource/testdata/nodeGraphUtils.ts | 4 +- .../plugins/datasource/testdata/runStreams.ts | 2 +- .../testdata/testData/serviceMapResponse.ts | 4 +- .../app/plugins/datasource/testdata/types.ts | 4 +- .../plugins/datasource/testdata/variables.ts | 2 +- .../datasource/zipkin/ConfigEditor.tsx | 4 +- .../datasource/zipkin/QueryField.test.tsx | 2 +- .../plugins/datasource/zipkin/QueryField.tsx | 6 +- .../datasource/zipkin/datasource.test.ts | 6 +- .../plugins/datasource/zipkin/datasource.ts | 4 +- .../app/plugins/datasource/zipkin/module.ts | 2 +- public/app/plugins/panel/alertlist/README.md | 6 +- public/app/plugins/panel/alertlist/module.ts | 4 +- .../panel/annolist/AnnoListPanel.test.tsx | 6 +- .../plugins/panel/annolist/AnnoListPanel.tsx | 12 +- .../panel/annolist/AnnotationListItem.tsx | 6 +- .../panel/annolist/AnnotationListItemTags.tsx | 6 +- public/app/plugins/panel/annolist/README.md | 4 +- public/app/plugins/panel/annolist/module.tsx | 4 +- .../plugins/panel/barchart/BarChartPanel.tsx | 4 +- public/app/plugins/panel/barchart/module.tsx | 6 +- .../panel/bargauge/BarGaugeMigrations.test.ts | 2 +- .../panel/bargauge/BarGaugeMigrations.ts | 4 +- .../panel/bargauge/BarGaugePanel.test.tsx | 6 +- .../plugins/panel/bargauge/BarGaugePanel.tsx | 6 +- public/app/plugins/panel/bargauge/module.tsx | 4 +- public/app/plugins/panel/bargauge/types.ts | 4 +- .../app/plugins/panel/dashlist/DashList.tsx | 4 +- public/app/plugins/panel/dashlist/README.md | 2 +- public/app/plugins/panel/dashlist/module.tsx | 4 +- public/app/plugins/panel/dashlist/styles.ts | 6 +- .../panel/gauge/GaugeMigrations.test.ts | 4 +- .../plugins/panel/gauge/GaugeMigrations.ts | 4 +- public/app/plugins/panel/gauge/GaugePanel.tsx | 6 +- public/app/plugins/panel/gauge/module.tsx | 2 +- public/app/plugins/panel/gauge/types.ts | 4 +- .../panel/gettingstarted/GettingStarted.tsx | 6 +- .../gettingstarted/components/DocsCard.tsx | 10 +- .../panel/gettingstarted/components/Step.tsx | 6 +- .../components/TutorialCard.tsx | 8 +- .../gettingstarted/components/sharedStyles.ts | 8 +- .../plugins/panel/gettingstarted/module.ts | 2 +- .../app/plugins/panel/gettingstarted/steps.ts | 16 +- .../app/plugins/panel/gettingstarted/types.ts | 2 +- .../panel/graph/GraphContextMenuCtrl.ts | 4 +- .../panel/graph/GraphMigrations.test.ts | 2 +- .../plugins/panel/graph/GraphMigrations.ts | 2 +- .../app/plugins/panel/graph/Legend/Legend.tsx | 2 +- .../panel/graph/Legend/LegendSeriesItem.tsx | 4 +- public/app/plugins/panel/graph/README.md | 2 +- public/app/plugins/panel/graph/axes_editor.ts | 2 +- .../app/plugins/panel/graph/data_processor.ts | 4 +- public/app/plugins/panel/graph/graph.ts | 6 +- .../app/plugins/panel/graph/graph_tooltip.ts | 2 +- .../plugins/panel/graph/jquery.flot.events.ts | 2 +- public/app/plugins/panel/graph/module.ts | 4 +- public/app/plugins/panel/graph/plugin.json | 2 +- .../panel/graph/series_overrides_ctrl.ts | 2 +- .../plugins/panel/graph/specs/graph.test.ts | 4 +- .../panel/graph/specs/graph_ctrl.test.ts | 2 +- .../graph/specs/threshold_manager.test.ts | 2 +- .../graph/specs/time_region_manager.test.ts | 2 +- public/app/plugins/panel/graph/template.ts | 2 +- .../plugins/panel/graph/threshold_manager.ts | 2 +- .../panel/graph/time_region_manager.ts | 4 +- public/app/plugins/panel/graph/utils.test.ts | 2 +- public/app/plugins/panel/graph/utils.ts | 2 +- public/app/plugins/panel/heatmap/README.md | 4 +- .../app/plugins/panel/heatmap/color_legend.ts | 2 +- .../app/plugins/panel/heatmap/heatmap_ctrl.ts | 4 +- .../plugins/panel/heatmap/heatmap_tooltip.ts | 4 +- public/app/plugins/panel/heatmap/plugin.json | 2 +- public/app/plugins/panel/heatmap/rendering.ts | 4 +- .../panel/heatmap/specs/heatmap_ctrl.test.ts | 2 +- .../plugins/panel/live/LiveChannelEditor.tsx | 18 +- public/app/plugins/panel/live/LivePanel.tsx | 20 +- public/app/plugins/panel/live/module.tsx | 2 +- public/app/plugins/panel/live/types.ts | 2 +- public/app/plugins/panel/logs/LogsPanel.tsx | 4 +- public/app/plugins/panel/logs/module.tsx | 2 +- public/app/plugins/panel/logs/types.ts | 2 +- public/app/plugins/panel/news/NewsPanel.tsx | 6 +- public/app/plugins/panel/news/module.tsx | 2 +- public/app/plugins/panel/news/types.ts | 2 +- public/app/plugins/panel/news/utils.test.ts | 28 +- public/app/plugins/panel/news/utils.ts | 2 +- .../panel/nodeGraph/NodeGraphPanel.tsx | 4 +- public/app/plugins/panel/nodeGraph/module.tsx | 2 +- .../panel/piechart/PieChartOptionsBox.tsx | 4 +- .../plugins/panel/piechart/PieChartPanel.tsx | 4 +- .../plugins/panel/piechart/migrations.test.ts | 12 +- .../app/plugins/panel/piechart/migrations.ts | 6 +- public/app/plugins/panel/piechart/module.tsx | 4 +- public/app/plugins/panel/piechart/types.ts | 2 +- public/app/plugins/panel/pluginlist/README.md | 2 +- public/app/plugins/panel/pluginlist/module.ts | 2 +- .../app/plugins/panel/pluginlist/plugin.json | 2 +- public/app/plugins/panel/singlestat/README.md | 2 +- .../app/plugins/panel/singlestat/editor.html | 4 +- public/app/plugins/panel/singlestat/module.ts | 4 +- .../app/plugins/panel/singlestat/plugin.json | 2 +- .../panel/singlestat/specs/singlestat.test.ts | 2 +- .../singlestat/specs/singlestat_panel.test.ts | 2 +- public/app/plugins/panel/stat/README.md | 4 +- .../plugins/panel/stat/StatMigrations.test.ts | 6 +- .../app/plugins/panel/stat/StatMigrations.ts | 6 +- public/app/plugins/panel/stat/StatPanel.tsx | 6 +- public/app/plugins/panel/stat/module.tsx | 4 +- public/app/plugins/panel/stat/plugin.json | 2 +- public/app/plugins/panel/stat/types.ts | 4 +- public/app/plugins/panel/table-old/README.md | 4 +- .../plugins/panel/table-old/column_options.ts | 2 +- .../app/plugins/panel/table-old/editor.html | 2 +- public/app/plugins/panel/table-old/module.ts | 2 +- .../app/plugins/panel/table-old/plugin.json | 2 +- .../app/plugins/panel/table-old/renderer.ts | 8 +- .../panel/table-old/specs/renderer.test.ts | 8 +- .../plugins/panel/table-old/transformers.ts | 2 +- public/app/plugins/panel/table-old/types.ts | 2 +- public/app/plugins/panel/table/README.md | 4 +- public/app/plugins/panel/table/TablePanel.tsx | 6 +- .../plugins/panel/table/migrations.test.ts | 2 +- public/app/plugins/panel/table/migrations.ts | 4 +- public/app/plugins/panel/table/module.tsx | 4 +- public/app/plugins/panel/table/plugin.json | 2 +- public/app/plugins/panel/table/types.ts | 2 +- public/app/plugins/panel/text/README.md | 2 +- public/app/plugins/panel/text/TextPanel.tsx | 4 +- .../plugins/panel/text/TextPanelEditor.tsx | 6 +- public/app/plugins/panel/text/module.tsx | 2 +- .../text/textPanelMigrationHandler.test.ts | 2 +- .../panel/text/textPanelMigrationHandler.ts | 2 +- .../panel/timeseries/FillBelowToEditor.tsx | 4 +- .../timeseries/HideSeriesConfigEditor.tsx | 6 +- .../panel/timeseries/LineStyleEditor.tsx | 4 +- .../timeseries/ScaleDistributionEditor.tsx | 4 +- .../panel/timeseries/TimeSeriesPanel.tsx | 4 +- public/app/plugins/panel/timeseries/config.ts | 4 +- .../panel/timeseries/migrations.test.ts | 2 +- .../plugins/panel/timeseries/migrations.ts | 6 +- .../app/plugins/panel/timeseries/module.tsx | 4 +- .../colorSeriesConfigFactory.test.ts | 2 +- .../overrides/colorSeriesConfigFactory.ts | 2 +- .../overrides/hideSeriesConfigFactory.test.ts | 4 +- .../overrides/hideSeriesConfigFactory.ts | 4 +- .../timeseries/plugins/AnnotationMarker.tsx | 6 +- .../timeseries/plugins/AnnotationsPlugin.tsx | 4 +- .../timeseries/plugins/ContextMenuPlugin.tsx | 4 +- .../timeseries/plugins/ExemplarMarker.tsx | 8 +- .../timeseries/plugins/ExemplarsPlugin.tsx | 4 +- public/app/plugins/panel/timeseries/types.ts | 2 +- public/app/plugins/panel/welcome/Welcome.tsx | 10 +- public/app/plugins/panel/welcome/module.ts | 2 +- .../plugins/panel/xychart/XYChartPanel.tsx | 4 +- .../plugins/panel/xychart/XYDimsEditor.tsx | 8 +- public/app/plugins/panel/xychart/dims.ts | 4 +- public/app/plugins/panel/xychart/module.tsx | 4 +- public/app/plugins/panel/xychart/types.ts | 2 +- public/app/plugins/sdk.ts | 2 +- .../routes/{GrafanaCtrl.ts => PlutonoCtrl.ts} | 22 +- public/app/routes/ReactContainer.tsx | 6 +- public/app/routes/dashboard_loaders.ts | 2 +- public/app/types/alerting.ts | 2 +- public/app/types/appEvent.ts | 2 +- public/app/types/dashboard.ts | 4 +- public/app/types/datasources.ts | 2 +- public/app/types/events.ts | 4 +- public/app/types/explore.ts | 4 +- public/app/types/ldap.ts | 2 +- public/app/types/location.ts | 2 +- public/app/types/plugins.ts | 4 +- public/app/types/query.ts | 2 +- public/app/types/store.ts | 2 +- public/app/types/user.ts | 4 +- public/dashboards/default.json | 6 +- public/dashboards/scripted.js | 4 +- public/dashboards/scripted_async.js | 4 +- public/dashboards/scripted_templated.js | 4 +- public/emails/alert_notification.html | 4 +- public/emails/alert_notification_example.html | 10 +- public/emails/invited_to_org.html | 6 +- public/emails/new_user_invite.html | 6 +- public/emails/reset_password.html | 6 +- public/emails/signup_started.html | 6 +- public/emails/welcome_on_signup.html | 10 +- .../{grafana-icons.eot => plutono-icons.eot} | Bin .../{grafana-icons.svg => plutono-icons.svg} | 8 +- .../{grafana-icons.ttf => plutono-icons.ttf} | Bin ...{grafana-icons.woff => plutono-icons.woff} | Bin ...uth_icon.svg => plutono_com_auth_icon.svg} | 0 .../{grafana_icon.svg => plutono_icon.svg} | 2 +- ...na_mask_icon.svg => plutono_mask_icon.svg} | 4 +- ..._white.svg => plutono_mask_icon_white.svg} | 6 +- public/sass/{_grafana.scss => _plutono.scss} | 4 +- public/sass/_variables.dark.generated.scss | 4 +- public/sass/_variables.generated.scss | 6 +- public/sass/_variables.light.generated.scss | 4 +- public/sass/base/_fonts.scss | 2 +- public/sass/base/_icons.scss | 2 +- ...grafana_icons.scss => _plutono_icons.scss} | 18 +- public/sass/components/_buttons.scss | 4 +- public/sass/components/_code_editor.scss | 2 +- public/sass/components/_infobox.scss | 4 +- public/sass/components/_query_editor.scss | 2 +- public/sass/components/_tables_lists.scss | 4 +- public/sass/components/_tooltip.scss | 4 +- public/sass/icons.json | 6 +- public/sass/layout/_page.scss | 2 +- .../{grafana.dark.scss => plutono.dark.scss} | 2 +- ...{grafana.light.scss => plutono.light.scss} | 2 +- public/test/helpers/createFetchResponse.ts | 2 +- public/test/helpers/fieldConfig.ts | 2 +- public/test/helpers/getQueryOptions.ts | 2 +- public/test/helpers/initTemplateSrv.ts | 2 +- public/test/jest-setup.ts | 14 +- public/test/mocks/common.ts | 2 +- public/test/mocks/datasource_srv.ts | 2 +- public/test/specs/helpers.ts | 14 +- public/vendor/angular-other/angular-strap.js | 6 +- public/vendor/bootstrap/bootstrap.js | 4 +- public/vendor/flot/jquery.flot.js | 12 +- public/vendor/flot/jquery.flot.selection.js | 2 +- .../vendor/tagsinput/bootstrap-tagsinput.js | 2 +- public/views/error-template.html | 10 +- public/views/index-template.html | 18 +- scripts/build/build.sh | 4 +- scripts/build/ci-build-windows/Magefile.go | 2 +- scripts/build/ci-build/Dockerfile | 10 +- scripts/build/ci-build/Makefile | 28 +- scripts/build/ci-build/README.md | 8 +- scripts/build/ci-build/build-deploy.sh | 2 +- scripts/build/ci-deploy/build-deploy.sh | 2 +- scripts/build/ci-msi-build/Dockerfile | 8 +- scripts/build/ci-msi-build/README.md | 12 +- .../msigenerator/generator/build.py | 186 +- .../msigenerator/generator/utils.py | 32 +- ...ound.bmp => plutono_dialog_background.bmp} | Bin ...ound.png => plutono_dialog_background.png} | Bin .../{grafana_icon.ico => plutono_icon.ico} | Bin ..._top_banner.bmp => plutono_top_banner.bmp} | Bin ..._top_banner.png => plutono_top_banner.png} | Bin ...white.bmp => plutono_top_banner_white.bmp} | Bin .../resources/license/EE_LICENSE.rtf | 2662 ++++++++--------- ...irewall.wxs.j2 => plutono-firewall.wxs.j2} | 8 +- ...-service.wxs.j2 => plutono-service.wxs.j2} | 20 +- .../templates/common/product.wxs.j2 | 12 +- scripts/build/ci-wix/Dockerfile | 2 +- scripts/build/ci-wix/Magefile.go | 2 +- scripts/build/old_appveyor.yml | 4 +- scripts/build/publish.sh | 2 +- scripts/build/release-packages.sh | 16 +- scripts/build/release_publisher/main.go | 12 +- .../build/release_publisher/publisher_test.go | 24 +- ...terprise-5.4.0-123pre1.linux-amd64.tar.gz} | 0 ...e-5.4.0-123pre1.linux-amd64.tar.gz.sha256} | 0 ...nterprise-5.4.0-123pre1.windows-amd64.msi} | 0 ...se-5.4.0-123pre1.windows-amd64.msi.sha256} | 0 ...nterprise-5.4.0-123pre1.windows-amd64.zip} | 0 ...se-5.4.0-123pre1.windows-amd64.zip.sha256} | 0 ...utono-enterprise-5.4.0-123pre1.x86_64.rpm} | 0 ...nterprise-5.4.0-123pre1.x86_64.rpm.sha256} | 0 ...lutono-enterprise_5.4.0-123pre1_amd64.deb} | 0 ...enterprise_5.4.0-123pre1_amd64.deb.sha256} | 0 scripts/build/rpmmacros | 2 +- scripts/build/update_repo/README.md | 8 +- scripts/build/update_repo/init-deb-repo.sh | 6 +- scripts/build/update_repo/publish-deb.sh | 8 +- scripts/build/update_repo/publish-rpm.sh | 6 +- .../update_repo/test-publish-deb-repo.sh | 2 +- .../update_repo/test-publish-rpm-repo.sh | 2 +- .../build/update_repo/test-update-deb-repo.sh | 2 +- .../build/update_repo/test-update-rpm-repo.sh | 2 +- scripts/build/update_repo/update-deb.sh | 10 +- scripts/build/update_repo/update-rpm.sh | 8 +- scripts/build/verify_signed_packages.sh | 2 +- scripts/ci-frontend-metrics.sh | 18 +- scripts/ci-job-failed.sh | 4 +- scripts/ci-job-succeeded.sh | 4 +- scripts/ci-reference-docs-build.sh | 6 +- scripts/ci-reference-docs-lint.sh | 2 +- scripts/circle-release-canary-packages.sh | 2 +- scripts/circle-test-backend.sh | 2 +- scripts/circle-test-frontend.sh | 4 +- scripts/circle-test-mysql.sh | 2 +- scripts/circle-test-postgres.sh | 2 +- scripts/cli/generateSassVariableFiles.ts | 12 +- scripts/go/go.mod | 2 +- scripts/import_many_dashboards.sh | 2 +- scripts/lib.star | 114 +- scripts/master.star | 4 +- scripts/mixin-check.sh | 2 +- scripts/release.star | 4 +- scripts/trigger_docker_build.sh | 6 +- ...na_packer.sh => trigger_plutono_packer.sh} | 2 +- scripts/trigger_windows_build.sh | 2 +- scripts/verify-repo-update/Dockerfile.deb | 6 +- scripts/verify-repo-update/Dockerfile.rpm | 6 +- scripts/verify-repo-update/rpm-ee-beta.list | 4 +- scripts/verify-repo-update/rpm-ee-stable.list | 4 +- scripts/verify-repo-update/rpm-oss-beta.list | 4 +- .../verify-repo-update/rpm-oss-stable.list | 4 +- scripts/verify-repo-update/verify-repos.sh | 18 +- scripts/webpack/webpack.common.js | 6 +- scripts/webpack/webpack.dev.js | 6 +- scripts/webpack/webpack.hot.js | 2 +- scripts/webpack/webpack.prod.js | 6 +- tsconfig.json | 2 +- 3971 files changed, 14658 insertions(+), 14658 deletions(-) rename .github/ISSUE_TEMPLATE/{4-grafana_ui_component.md => 4-plutono_ui_component.md} (72%) delete mode 100644 devenv/docker/blocks/grafana/.env delete mode 100644 devenv/docker/blocks/grafana/docker-compose.yaml create mode 100644 devenv/docker/blocks/plutono/.env create mode 100644 devenv/docker/blocks/plutono/docker-compose.yaml rename devenv/docker/ha_test/{grafana => plutono}/provisioning/alerts.jsonnet (100%) rename devenv/docker/ha_test/{grafana => plutono}/provisioning/dashboards/alerts/overview.json (91%) rename devenv/docker/ha_test/{grafana => plutono}/provisioning/dashboards/dashboards.yaml (58%) rename devenv/docker/ha_test/{grafana => plutono}/provisioning/dashboards/mysql/overview.json (99%) rename devenv/docker/ha_test/{grafana => plutono}/provisioning/datasources/datasources.yaml (100%) rename docs/sources/administration/preferences/{change-grafana-name.md => change-plutono-name.md} (77%) rename docs/sources/administration/preferences/{change-grafana-theme.md => change-plutono-theme.md} (82%) rename docs/sources/administration/preferences/{change-grafana-timezone.md => change-plutono-timezone.md} (77%) rename docs/sources/auth/{grafana.md => plutono.md} (77%) rename docs/sources/developers/plugins/backend/{grafana-plugin-sdk-for-go.md => plutono-plugin-sdk-for-go.md} (72%) rename docs/sources/installation/{restart-grafana.md => restart-plutono.md} (50%) delete mode 100644 docs/sources/shared/basics/grafana-cloud.md delete mode 100644 docs/sources/shared/basics/grafana-enterprise.md create mode 100644 docs/sources/shared/basics/plutono-cloud.md create mode 100644 docs/sources/shared/basics/plutono-enterprise.md rename docs/sources/shared/basics/{what-is-grafana.md => what-is-plutono.md} (69%) rename e2e/{wait-for-grafana => wait-for-plutono} (74%) delete mode 100644 packages/grafana-data/.eslintrc delete mode 100644 packages/grafana-data/README.md delete mode 100644 packages/grafana-data/src/utils/testdata/testTheme.ts delete mode 100644 packages/grafana-e2e-selectors/README.md delete mode 100644 packages/grafana-e2e/README.md delete mode 100644 packages/grafana-runtime/.eslintrc delete mode 100644 packages/grafana-runtime/README.md delete mode 100755 packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/build.sh delete mode 100755 packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/common.sh delete mode 100644 packages/grafana-toolkit/src/config/prettier.plugin.rc.js delete mode 100644 packages/grafana-ui/README.md delete mode 100644 packages/grafana-ui/src/themes/selectThemeVariant.ts delete mode 100644 packages/grafana-ui/src/types/theme.ts create mode 100644 packages/plutono-data/grafana-data/.eslintrc rename packages/{ => plutono-data}/grafana-data/CHANGELOG.md (100%) create mode 100644 packages/plutono-data/grafana-data/README.md rename packages/{ => plutono-data}/grafana-data/api-extractor.json (100%) rename packages/{ => plutono-data}/grafana-data/index.js (100%) rename packages/{ => plutono-data}/grafana-data/package.json (86%) rename packages/{ => plutono-data}/grafana-data/rollup.config.ts (97%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/ArrayDataFrame.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/ArrayDataFrame.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/ArrowDataFrame.test.ts (89%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/ArrowDataFrame.ts (97%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/CircularDataFrame.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/DataFrameView.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/DataFrameView.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/FieldCache.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/FieldCache.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/MutableDataFrame.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/MutableDataFrame.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/__snapshots__/ArrowDataFrame.test.ts.snap (98%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/__snapshots__/all_types.golden.arrow (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/dimensions.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/frameComparisons.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/frameComparisons.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/index.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/processDataFrame.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/processDataFrame.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/dataframe/utils.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/datetime/common.ts (96%) rename packages/{ => plutono-data}/grafana-data/src/datetime/datemath.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/datetime/datemath.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/datetime/formats.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/datetime/formats.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/datetime/formatter.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/datetime/formatter.ts (97%) rename packages/{ => plutono-data}/grafana-data/src/datetime/index.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/datetime/moment_wrapper.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/datetime/parser.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/datetime/parser.ts (96%) rename packages/{ => plutono-data}/grafana-data/src/datetime/rangeutil.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/datetime/rangeutil.ts (99%) rename packages/{ => plutono-data}/grafana-data/src/datetime/timezones.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/datetime/timezones.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/events/EventBus.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/events/EventBus.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/events/eventFactory.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/events/index.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/events/types.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/FieldConfigOptionsRegistry.tsx (100%) rename packages/{ => plutono-data}/grafana-data/src/field/displayProcessor.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/displayProcessor.ts (98%) rename packages/{ => plutono-data}/grafana-data/src/field/fieldColor.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/fieldColor.ts (95%) rename packages/{ => plutono-data}/grafana-data/src/field/fieldComparers.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/fieldDisplay.test.ts (98%) rename packages/{ => plutono-data}/grafana-data/src/field/fieldDisplay.ts (99%) rename packages/{ => plutono-data}/grafana-data/src/field/fieldOverrides.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/fieldOverrides.ts (99%) rename packages/{ => plutono-data}/grafana-data/src/field/fieldState.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/fieldState.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/getFieldDisplayValuesProxy.test.tsx (93%) rename packages/{ => plutono-data}/grafana-data/src/field/getFieldDisplayValuesProxy.ts (94%) rename packages/{ => plutono-data}/grafana-data/src/field/index.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/overrides/processors.ts (98%) rename packages/{ => plutono-data}/grafana-data/src/field/scale.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/scale.ts (93%) rename packages/{ => plutono-data}/grafana-data/src/field/standardFieldConfigEditorRegistry.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/templateProxies.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/templateProxies.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/thresholds.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/field/thresholds.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/index.ts (96%) rename packages/{ => plutono-data}/grafana-data/src/panel/PanelPlugin.test.tsx (100%) rename packages/{ => plutono-data}/grafana-data/src/panel/PanelPlugin.ts (99%) rename packages/{ => plutono-data}/grafana-data/src/panel/registryFactories.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/text/index.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/text/markdown.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/text/markdown.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/text/sanitize.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/text/string.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/text/string.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/text/text.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/text/text.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/fieldReducer.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/fieldReducer.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/index.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/fieldTypeMatcher.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/fieldTypeMatcher.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/ids.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/matchers.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/nameMatcher.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/nameMatcher.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/predicates.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/predicates.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/refIdMatcher.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/simpleFieldMatcher.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/matchers/valueMatchers/types.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/standardTransformersRegistry.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformDataFrame.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/calculateField.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/calculateField.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/concat.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/concat.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/ensureColumns.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/ensureColumns.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/filter.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/filter.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/filterByName.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/filterByName.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/filterByRefId.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/filterByRefId.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/filterByValue.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/filterByValue.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/groupBy.test.ts (99%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/groupBy.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/ids.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/joinDataFrames.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/joinDataFrames.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/labelsToFields.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/labelsToFields.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/merge.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/merge.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/noop.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/order.test.ts (99%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/order.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/organize.test.ts (99%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/organize.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/reduce.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/reduce.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/rename.test.ts (99%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/rename.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/renameByRegex.test.ts (98%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/renameByRegex.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/seriesToColumns.test.ts (99%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/seriesToColumns.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/seriesToRows.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/seriesToRows.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/sortBy.test.ts (97%) rename packages/{ => plutono-data}/grafana-data/src/transformations/transformers/sortBy.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/OptionsUIRegistryBuilder.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/ScopedVars.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/annotations.ts (99%) rename packages/{ => plutono-data}/grafana-data/src/types/app.ts (94%) rename packages/{ => plutono-data}/grafana-data/src/types/config.ts (84%) rename packages/{ => plutono-data}/grafana-data/src/types/data.ts (98%) rename packages/{ => plutono-data}/grafana-data/src/types/dataFrame.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/dataLink.ts (98%) rename packages/{ => plutono-data}/grafana-data/src/types/datasource.ts (99%) rename packages/{ => plutono-data}/grafana-data/src/types/displayValue.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/explore.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/fieldColor.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/fieldOverrides.ts (97%) rename packages/{ => plutono-data}/grafana-data/src/types/flot.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/geometry.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/graph.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/index.ts (93%) rename packages/{ => plutono-data}/grafana-data/src/types/legacyEvents.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/live.ts (99%) rename packages/{ => plutono-data}/grafana-data/src/types/logs.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/navModel.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/options.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/orgs.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/panel.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/plugin.ts (94%) rename packages/{ => plutono-data}/grafana-data/src/types/select.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/templateVars.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/theme.ts (97%) rename packages/{ => plutono-data}/grafana-data/src/types/thresholds.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/time.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/trace.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/transformations.ts (98%) rename packages/{ => plutono-data}/grafana-data/src/types/valueMapping.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/variables.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/types/vector.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/OptionsUIBuilders.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/Registry.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/Registry.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/__snapshots__/csv.test.ts.snap (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/binaryOperators.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/csv.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/csv.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/dataLinks.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/dataLinks.ts (98%) rename packages/{ => plutono-data}/grafana-data/src/utils/datasource.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/deprecationWarning.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/deprecationWarning.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/docs.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/fieldParser.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/flotPairs.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/flotPairs.ts (98%) rename packages/{ => plutono-data}/grafana-data/src/utils/index.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/labels.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/labels.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/location.test.ts (88%) rename packages/{ => plutono-data}/grafana-data/src/utils/location.ts (82%) rename packages/{ => plutono-data}/grafana-data/src/utils/logs.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/logs.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/namedColorsPalette.test.ts (92%) rename packages/{ => plutono-data}/grafana-data/src/utils/namedColorsPalette.ts (93%) rename packages/{ => plutono-data}/grafana-data/src/utils/object.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/series.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/series.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/testdata/roundtrip.csv (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/testdata/simple.csv (100%) create mode 100644 packages/plutono-data/grafana-data/src/utils/testdata/testTheme.ts rename packages/{ => plutono-data}/grafana-data/src/utils/testdata/withHeaders.csv (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/tests/mockStandardProperties.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/tests/mockTransformationsRegistry.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/url.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/url.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/valueMappings.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/utils/valueMappings.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/valueFormats/arithmeticFormatters.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/valueFormats/arithmeticFormatters.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/valueFormats/categories.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/valueFormats/dateTimeFormatters.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/valueFormats/dateTimeFormatters.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/valueFormats/index.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/valueFormats/symbolFormatters.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/valueFormats/symbolFormatters.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/valueFormats/valueFormats.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/valueFormats/valueFormats.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/AppendedVectors.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/AppendedVectors.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/ArrayVector.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/AsNumberVector.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/BinaryOperationVector.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/BinaryOperationVector.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/CircularVector.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/CircularVector.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/ConstantVector.test.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/ConstantVector.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/FormattedVector.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/FunctionalVector.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/IndexVector.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/RowVector.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/SortedVector.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/index.ts (100%) rename packages/{ => plutono-data}/grafana-data/src/vector/vectorToArray.ts (100%) rename packages/{ => plutono-data}/grafana-data/tsconfig.build.json (100%) rename packages/{ => plutono-data}/grafana-data/tsconfig.json (100%) rename packages/{ => plutono-data}/grafana-data/typings/jest/index.d.ts (100%) rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/CHANGELOG.md (100%) create mode 100644 packages/plutono-e2e-selectors/grafana-e2e-selectors/README.md rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/api-extractor.json (100%) rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/index.js (100%) rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/package.json (79%) rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/rollup.config.ts (100%) rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/src/index.ts (52%) rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/src/selectors/components.ts (100%) rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/src/selectors/index.ts (100%) rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/src/selectors/pages.ts (100%) rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/src/types/index.ts (100%) rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/src/types/selectors.ts (100%) rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/tsconfig.build.json (100%) rename packages/{ => plutono-e2e-selectors}/grafana-e2e-selectors/tsconfig.json (100%) rename packages/{ => plutono-e2e}/grafana-e2e/.gitignore (100%) rename packages/{ => plutono-e2e}/grafana-e2e/CHANGELOG.md (100%) create mode 100644 packages/plutono-e2e/grafana-e2e/README.md rename packages/{ => plutono-e2e}/grafana-e2e/api-extractor.json (100%) rename packages/{grafana-e2e/bin/grafana-e2e.js => plutono-e2e/grafana-e2e/bin/plutono-e2e.js} (100%) rename packages/{ => plutono-e2e}/grafana-e2e/cli.js (100%) rename packages/{ => plutono-e2e}/grafana-e2e/cypress.json (100%) rename packages/{ => plutono-e2e}/grafana-e2e/cypress/fixtures/example.json (100%) rename packages/{ => plutono-e2e}/grafana-e2e/cypress/fixtures/long-trace-response.json (100%) rename packages/{ => plutono-e2e}/grafana-e2e/cypress/plugins/compareScreenshots.js (100%) rename packages/{ => plutono-e2e}/grafana-e2e/cypress/plugins/extendConfig.js (97%) rename packages/{ => plutono-e2e}/grafana-e2e/cypress/plugins/index.js (100%) rename packages/{ => plutono-e2e}/grafana-e2e/cypress/plugins/readProvisions.js (100%) rename packages/{ => plutono-e2e}/grafana-e2e/cypress/plugins/typescriptPreprocessor.js (100%) rename packages/{ => plutono-e2e}/grafana-e2e/cypress/support/commands.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/cypress/support/index.d.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/cypress/support/index.ts (92%) rename packages/{ => plutono-e2e}/grafana-e2e/cypress/tsconfig.json (100%) rename packages/{ => plutono-e2e}/grafana-e2e/index.js (100%) rename packages/{ => plutono-e2e}/grafana-e2e/package.json (77%) rename packages/{ => plutono-e2e}/grafana-e2e/rollup.config.ts (95%) rename packages/{ => plutono-e2e}/grafana-e2e/src/components/index.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/addDashboard.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/addDataSource.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/addPanel.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/assertSuccessNotification.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/configurePanel.ts (98%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/deleteDashboard.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/deleteDataSource.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/editPanel.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/explore.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/index.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/login.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/openDashboard.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/openPanelMenuItem.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/revertAllChanges.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/saveDashboard.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/selectOption.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/setDashboardTimeRange.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/flows/setTimeRange.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/index.ts (86%) rename packages/{ => plutono-e2e}/grafana-e2e/src/support/index.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/support/localStorage.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/support/scenario.ts (94%) rename packages/{ => plutono-e2e}/grafana-e2e/src/support/scenarioContext.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/support/selector.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/support/types.ts (98%) rename packages/{ => plutono-e2e}/grafana-e2e/src/support/url.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/typings/index.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/src/typings/undo.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/test/cypress/integration/0.cli.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/test/cypress/integration/1.api.ts (100%) rename packages/{ => plutono-e2e}/grafana-e2e/test/cypress/tsconfig.json (65%) rename packages/{ => plutono-e2e}/grafana-e2e/tsconfig.build.json (100%) rename packages/{ => plutono-e2e}/grafana-e2e/tsconfig.json (100%) create mode 100644 packages/plutono-runtime/grafana-runtime/.eslintrc rename packages/{ => plutono-runtime}/grafana-runtime/CHANGELOG.md (100%) create mode 100644 packages/plutono-runtime/grafana-runtime/README.md rename packages/{ => plutono-runtime}/grafana-runtime/api-extractor.json (100%) rename packages/{ => plutono-runtime}/grafana-runtime/index.js (100%) rename packages/{ => plutono-runtime}/grafana-runtime/package.json (76%) rename packages/{ => plutono-runtime}/grafana-runtime/rollup.config.ts (88%) rename packages/{ => plutono-runtime}/grafana-runtime/src/config.ts (79%) rename packages/{ => plutono-runtime}/grafana-runtime/src/index.ts (95%) rename packages/{ => plutono-runtime}/grafana-runtime/src/measurement/collector.test.ts (100%) rename packages/{ => plutono-runtime}/grafana-runtime/src/measurement/collector.ts (99%) rename packages/{ => plutono-runtime}/grafana-runtime/src/measurement/index.ts (100%) rename packages/{ => plutono-runtime}/grafana-runtime/src/measurement/query.ts (89%) rename packages/{ => plutono-runtime}/grafana-runtime/src/measurement/types.ts (95%) rename packages/{ => plutono-runtime}/grafana-runtime/src/services/AngularLoader.ts (97%) rename packages/{ => plutono-runtime}/grafana-runtime/src/services/EchoSrv.ts (92%) rename packages/{ => plutono-runtime}/grafana-runtime/src/services/LocationSrv.ts (91%) rename packages/{ => plutono-runtime}/grafana-runtime/src/services/backendSrv.ts (94%) rename packages/{ => plutono-runtime}/grafana-runtime/src/services/dataSourceSrv.ts (91%) rename packages/{ => plutono-runtime}/grafana-runtime/src/services/index.ts (100%) rename packages/{ => plutono-runtime}/grafana-runtime/src/services/legacyAngularInjector.ts (91%) rename packages/{ => plutono-runtime}/grafana-runtime/src/services/live.ts (65%) rename packages/{ => plutono-runtime}/grafana-runtime/src/services/templateSrv.ts (88%) rename packages/{ => plutono-runtime}/grafana-runtime/src/types/analytics.ts (100%) rename packages/{ => plutono-runtime}/grafana-runtime/src/types/index.ts (100%) rename packages/{ => plutono-runtime}/grafana-runtime/src/utils/DataSourceWithBackend.test.ts (97%) rename packages/{ => plutono-runtime}/grafana-runtime/src/utils/DataSourceWithBackend.ts (98%) rename packages/{ => plutono-runtime}/grafana-runtime/src/utils/analytics.ts (100%) rename packages/{ => plutono-runtime}/grafana-runtime/src/utils/logging.ts (100%) rename packages/{ => plutono-runtime}/grafana-runtime/src/utils/plugin.ts (91%) rename packages/{ => plutono-runtime}/grafana-runtime/src/utils/queryResponse.test.ts (99%) rename packages/{ => plutono-runtime}/grafana-runtime/src/utils/queryResponse.ts (99%) rename packages/{ => plutono-runtime}/grafana-runtime/tsconfig.build.json (100%) rename packages/{ => plutono-runtime}/grafana-runtime/tsconfig.json (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/.eslintrc (70%) rename packages/{ => plutono-toolkit}/grafana-toolkit/CHANGELOG.md (58%) rename packages/{ => plutono-toolkit}/grafana-toolkit/README.md (59%) rename packages/{grafana-toolkit/bin/grafana-toolkit.js => plutono-toolkit/grafana-toolkit/bin/plutono-toolkit.js} (89%) rename packages/{ => plutono-toolkit}/grafana-toolkit/config/circleci/config.yml (86%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-alpine => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine}/Dockerfile (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-alpine => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine}/README.md (62%) create mode 100755 packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/build.sh create mode 100755 packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/common.sh rename packages/{grafana-toolkit/docker/grafana-plugin-ci-alpine => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine}/install/bin/cp (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-alpine => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine}/install/bin/ginstall (64%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-alpine => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine}/install/bin/githubRelease.js (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-alpine => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine}/scripts/deploy-common.sh (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-alpine => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine}/scripts/deploy-user.sh (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-alpine => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine}/scripts/deploy.sh (90%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-alpine => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine}/test/docker-compose.yml (70%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-alpine => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine}/test/start.sh (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-e2e => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e}/Dockerfile (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e}/README.md (66%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-e2e => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e}/build.sh (55%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-e2e => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e}/common.sh (73%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-e2e => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e}/install/ginstall (64%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-e2e => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e}/scripts/deploy-common.sh (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-e2e => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e}/scripts/deploy-slim.sh (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-e2e => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e}/scripts/deploy-user.sh (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-e2e => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e}/scripts/deploy.sh (94%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-e2e => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e}/test/docker-compose.yml (73%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-e2e => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e}/test/start.sh (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci}/Dockerfile (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci-e2e => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci}/README.md (66%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci}/build.sh (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci}/common.sh (50%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci}/install/gget (70%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci}/scripts/deploy-common.sh (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci}/scripts/deploy-user.sh (100%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci}/scripts/deploy.sh (94%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci}/test/docker-compose.yml (81%) rename packages/{grafana-toolkit/docker/grafana-plugin-ci => plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci}/test/start.sh (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/package.json (89%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/index.d.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/index.ts (96%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/changelog.ts (85%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/cherrypick.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/closeMilestone.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/component.create.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/core.start.ts (94%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/nodeVersionChecker.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/package.build.ts (87%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin.build.ts (92%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin.ci.ts (91%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin.create.ts (93%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin.dev.ts (84%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin.sign.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin.tests.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin.update.ts (86%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin.utils.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin/bundle.ts (97%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin/create.ts (95%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin/test_exclude_image_suffix_in_manifest.png (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/plugin/tests.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/task.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/template.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tasks/toolkit.build.ts (95%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/templates/component.tsx.template.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/templates/docs.mdx.template.ts (81%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/templates/index.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/templates/story.tsx.template.ts (79%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/tsconfig.json (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/utils/execTask.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/utils/githubClient.test.ts (87%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/utils/githubClient.ts (79%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/utils/githubRelease.test.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/utils/githubRelease.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/utils/pascalCase.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/utils/prompt.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/utils/rmdir.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/cli/utils/useSpinner.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/eslint.plugin.json (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/index.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/jest.plugin.config.local.js (76%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/jest.plugin.config.test.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/jest.plugin.config.ts (94%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/jestSetup/noOverrides/package.json (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/jestSetup/overrides/package.json (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/jestSetup/unsupportedOverrides/package.json (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.css (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.scss (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/light.css (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/stylesheetsSupport/missing-theme-file/src/styles/light.css (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/stylesheetsSupport/no-theme-files/src/styles/whatever.css (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/dark.css (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/light.css (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/webpack/noOverride/package.json (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/webpack/overrides/package.json (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/webpack/overrides/webpack.config.js (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/package.json (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/webpack.config.js (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/package.json (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/webpack.config.js (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/prettier.plugin.config.json (100%) create mode 100644 packages/plutono-toolkit/grafana-toolkit/src/config/prettier.plugin.rc.js rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/styles.mock.js (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/tsconfig.plugin.json (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/tsconfig.plugin.local.json (70%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/utils/getPluginId.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/utils/pluginValidation.test.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/utils/pluginValidation.ts (94%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/webpack.plugin.config.test.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/webpack.plugin.config.ts (98%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/webpack/loaders.test.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/config/webpack/loaders.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/plugins/env.ts (96%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/plugins/index.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/plugins/manifest.ts (88%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/plugins/types.ts (94%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/plugins/utils.ts (97%) rename packages/{ => plutono-toolkit}/grafana-toolkit/src/plugins/workflow.ts (100%) rename packages/{ => plutono-toolkit}/grafana-toolkit/tsconfig.json (100%) rename packages/{ => plutono-ui}/grafana-ui/.eslintrc (55%) rename packages/{ => plutono-ui}/grafana-ui/.storybook/main.ts (97%) rename packages/{ => plutono-ui}/grafana-ui/.storybook/manager-head.html (100%) rename packages/{ => plutono-ui}/grafana-ui/.storybook/preview.ts (83%) rename packages/{ => plutono-ui}/grafana-ui/.storybook/static/fav32.png (100%) rename packages/{grafana-ui/.storybook/static/grafana_icon.svg => plutono-ui/grafana-ui/.storybook/static/plutono_icon.svg} (100%) rename packages/{ => plutono-ui}/grafana-ui/.storybook/storybookTheme.ts (79%) rename packages/{ => plutono-ui}/grafana-ui/.storybook/tsconfig.json (100%) rename packages/{ => plutono-ui}/grafana-ui/CHANGELOG.md (75%) create mode 100644 packages/plutono-ui/grafana-ui/README.md rename packages/{ => plutono-ui}/grafana-ui/api-extractor.json (100%) rename packages/{ => plutono-ui}/grafana-ui/index.js (100%) rename packages/{ => plutono-ui}/grafana-ui/package.json (91%) rename packages/{ => plutono-ui}/grafana-ui/rollup.config.ts (92%) rename packages/{ => plutono-ui}/grafana-ui/src/Intro.story.mdx (60%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Alert/Alert.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Alert/Alert.story.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Alert/Alert.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/AlphaNotice/AlphaNotice.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/AlphaNotice/AlphaNotice.story.tsx (90%) rename packages/{ => plutono-ui}/grafana-ui/src/components/AlphaNotice/AlphaNotice.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Badge/Badge.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Badge/Badge.story.tsx (91%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Badge/Badge.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarChart/BarChart.story.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarChart/BarChart.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarChart/__snapshots__/utils.test.ts.snap (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarChart/bars.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarChart/distribute.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarChart/quadtree.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarChart/types.ts (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarChart/utils.test.ts (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarChart/utils.ts (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarGauge/BarGauge.mdx (89%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarGauge/BarGauge.story.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarGauge/BarGauge.test.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarGauge/BarGauge.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BarGauge/__snapshots__/BarGauge.test.tsx.snap (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BigValue/BigValue.mdx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BigValue/BigValue.story.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BigValue/BigValue.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BigValue/BigValue.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BigValue/BigValueLayout.test.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BigValue/BigValueLayout.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/BigValue/__snapshots__/BigValue.test.tsx.snap (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Button/Button.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Button/Button.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Button/Button.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Button/ButtonGroup.tsx (90%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Button/FullWidthButtonContainer.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Button/ToolbarButton.story.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Button/ToolbarButton.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Button/ToolbarButtonRow.tsx (87%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Button/index.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ButtonCascader/ButtonCascader.story.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ButtonCascader/_ButtonCascader.scss (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/CallToActionCard/CallToActionCard.story.internal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/CallToActionCard/CallToActionCard.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/CallToActionCard/CallToActionCard.tsx (91%) rename packages/{ => plutono-ui}/grafana-ui/src/components/CallToActionCard/__snapshots__/CallToActionCard.test.tsx.snap (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Card/Card.mdx (77%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Card/Card.story.tsx (91%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Card/Card.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Card/Card.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Cascader/Cascader.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Cascader/Cascader.story.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Cascader/Cascader.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Cascader/Cascader.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Cascader/optionMappings.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Chart/Tooltip.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Chart/TooltipContainer.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Chart/index.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ClipboardButton/ClipboardButton.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ClipboardButton/ClipboardButton.story.internal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ClipboardButton/ClipboardButton.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Collapse/CollapsableSection.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Collapse/CollapsableSection.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Collapse/CollapsableSection.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Collapse/Collapse.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Collapse/Collapse.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Collapse/Collapse.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/ColorInput.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/ColorPicker.mdx (91%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/ColorPicker.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/ColorPicker.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/ColorPickerPopover.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/ColorPickerPopover.test.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/ColorPickerTrigger.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/NamedColorsGroup.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/NamedColorsPalette.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/NamedColorsPalette.test.tsx (91%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/NamedColorsPalette.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/SeriesColorPickerPopover.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/SpectrumPalette.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/SpectrumPalette.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/SpectrumPalettePointer.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ColorPicker/warnAboutColorPickerPropsDeprecation.ts (82%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ConfirmButton/ConfirmButton.mdx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ConfirmButton/ConfirmButton.story.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ConfirmButton/ConfirmButton.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ConfirmButton/ConfirmButton.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ConfirmButton/DeleteButton.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ConfirmModal/ConfirmModal.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ConfirmModal/ConfirmModal.story.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ConfirmModal/ConfirmModal.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ContextMenu/ContextMenu.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ContextMenu/ContextMenu.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ContextMenu/ContextMenu.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ContextMenu/WithContextMenu.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataLinks/DataLinkButton.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataLinks/DataLinkEditor.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataLinks/DataLinkInput.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataLinks/DataLinkSuggestions.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataLinks/DataLinksContextMenu.test.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinkEditorModalContent.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataLinks/FieldLinkList.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataLinks/SelectionReference.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataSourceSettings/BasicAuthSettings.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataSourceSettings/CertificationKey.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataSourceSettings/CustomHeadersSettings.test.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataSourceSettings/CustomHeadersSettings.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.mdx (90%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataSourceSettings/HttpProxySettings.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataSourceSettings/SigV4AuthSettings.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataSourceSettings/TLSAuthSettings.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/DataSourceSettings/types.ts (90%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Drawer/Drawer.mdx (86%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Drawer/Drawer.story.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Drawer/Drawer.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Drawer/_Drawer.scss (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Dropdown/ButtonSelect.story.internal.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Dropdown/ButtonSelect.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/EmptySearchResult/EmptySearchResult.mdx (87%) rename packages/{ => plutono-ui}/grafana-ui/src/components/EmptySearchResult/EmptySearchResult.story.tsx (82%) rename packages/{ => plutono-ui}/grafana-ui/src/components/EmptySearchResult/EmptySearchResult.tsx (86%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.mdx (86%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.story.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ErrorBoundary/ErrorWithStack.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FileUpload/FileUpload.mdx (90%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FileUpload/FileUpload.story.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FileUpload/FileUpload.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FileUpload/FileUpload.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FilterPill/FilterPill.mdx (87%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FilterPill/FilterPill.story.tsx (87%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FilterPill/FilterPill.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FormField/FormField.story.internal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FormField/FormField.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FormField/FormField.tsx (90%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FormField/__snapshots__/FormField.test.tsx.snap (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FormLabel/FormLabel.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.story.tsx (82%) rename packages/{ => plutono-ui}/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Checkbox.mdx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Checkbox.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Checkbox.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Field.mdx (89%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Field.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Field.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Field.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/FieldArray.mdx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/FieldArray.story.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/FieldArray.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/FieldSet.mdx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/FieldSet.story.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/FieldSet.tsx (86%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/FieldValidationMessage.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/FieldValidationMessage.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/FieldValidationMessage.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Form.mdx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Form.story.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Form.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/InlineField.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/InlineField.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/InlineField.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/InlineField.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/InlineFieldRow.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/InlineFieldRow.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/InlineFieldRow.tsx (86%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/InlineLabel.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/InlineLabel.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/InlineLabel.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/InlineSegmentGroup.tsx (87%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Label.mdx (82%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Label.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Label.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Input/Input.story.internal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Input/Input.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Input/Input.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Input/__snapshots__/Input.test.tsx.snap (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Select/IndicatorsContainer.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Select/NoOptionsMessage.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Select/Select.story.internal.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Select/_Select.scss (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Select/__snapshots__/SelectOption.test.tsx.snap (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Switch/Switch.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Switch/Switch.story.internal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legacy/Switch/Switch.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legend.mdx (89%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legend.story.tsx (89%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/Legend.tsx (86%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.mdx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/commonStyles.ts (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/getFormStyles.ts (88%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Forms/types.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Gauge/Gauge.test.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Gauge/Gauge.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/Graph.story.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/Graph.test.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/Graph.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/GraphContextMenu.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/GraphSeriesToggler.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/GraphTooltip/GraphTooltip.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/GraphTooltip/SeriesTable.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/GraphTooltip/types.ts (84%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/GraphWithLegend.story.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/GraphWithLegend.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/types.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/utils.test.ts (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Graph/utils.ts (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/GraphNG/GraphNG.story.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/GraphNG/GraphNG.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/GraphNG/hooks.ts (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/GraphNG/types.ts (87%) rename packages/{ => plutono-ui}/grafana-ui/src/components/GraphNG/utils.test.ts (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/GraphNG/utils.ts (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/Icon.mdx (86%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/Icon.story.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/Icon.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/Apps.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/Bell.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/Circle.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/Cog.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/Favorite.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/Folder.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/FolderPlus.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/Heart.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/HeartBreak.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/Import.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/PanelAdd.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/PlusSquare.tsx (100%) rename packages/{grafana-ui/src/components/Icon/assets/Grafana.tsx => plutono-ui/grafana-ui/src/components/Icon/assets/Plutono.tsx} (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/ReusablePanel.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/Shield.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/SquareShape.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/index.ts (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/assets/types.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Icon/custom/index.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/IconButton/IconButton.mdx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/IconButton/IconButton.story.tsx (91%) rename packages/{ => plutono-ui}/grafana-ui/src/components/IconButton/IconButton.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/InfoBox/FeatureInfoBox.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/InfoBox/InfoBox.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/InfoBox/InfoBox.story.tsx (89%) rename packages/{ => plutono-ui}/grafana-ui/src/components/InfoBox/InfoBox.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/InfoBox/panelArt_dark.svg (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/InfoBox/panelArt_light.svg (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.internal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/InfoTooltip/InfoTooltip.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Input/Input.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Input/Input.story.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Input/Input.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/InputControl.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/JSONFormatter/JSONFormatter.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/JSONFormatter/json_explorer/helpers.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/JSONFormatter/json_explorer/json_explorer.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Layout/Layout.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Layout/Layout.story.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Layout/Layout.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/List/AbstractList.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/List/AbstractList.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/List/InlineList.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/List/List.story.internal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/List/List.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/List/__snapshots__/AbstractList.test.tsx.snap (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.tsx (87%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogDetails.test.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogDetails.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogDetailsRow.test.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogDetailsRow.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogLabelStats.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogLabels.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogLabels.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogMessageAnsi.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogMessageAnsi.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogRow.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogRowContext.test.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogRowContext.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogRowContextProvider.test.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogRowContextProvider.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogRowMessage.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogRowMessageDetectedFields.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogRows.test.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/LogRows.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/getLogRowStyles.ts (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Logs/logParser.ts (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/MatchersUI/FieldNameByRegexMatcherEditor.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/MatchersUI/FieldNameMatcherEditor.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/MatchersUI/FieldNamesMatcherEditor.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/MatchersUI/FieldTypeMatcherEditor.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/MatchersUI/fieldMatchersUI.ts (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/MatchersUI/types.ts (84%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Menu/Menu.story.internal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Menu/Menu.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Modal/Modal.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Modal/Modal.story.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Modal/Modal.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Modal/Modal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Modal/ModalHeader.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Modal/ModalTabContent.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Modal/ModalTabsHeader.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Modal/ModalsContext.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Modal/getModalStyles.ts (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Monaco/CodeEditor.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Monaco/CodeEditor.story.internal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Monaco/CodeEditor.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Monaco/CodeEditorLazy.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Monaco/suggestions.test.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Monaco/suggestions.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Monaco/types.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Monaco/utils.ts (88%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/Edge.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/EdgeArrowMarker.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/EdgeLabel.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/Node.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/NodeGraph.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/NodeGraph.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/ViewControls.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/index.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/layout.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/types.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/useCategorizeFrames.ts (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/useContextMenu.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/useNodeLimit.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/usePanning.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/useZoom.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/utils.test.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/NodeGraph/utils.ts (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/color.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/fieldColor.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/links.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/mappings.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/multiSelect.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/number.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/select.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/slider.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/stats.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/string.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/strings.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/thresholds.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/OptionsUI/units.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/PageLayout/PageToolbar.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Pagination/Pagination.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Pagination/Pagination.story.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Pagination/Pagination.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/PieChart/PieChart.story.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/PieChart/PieChart.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Portal/Portal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/QueryField/QueryField.story.tsx (86%) rename packages/{ => plutono-ui}/grafana-ui/src/components/QueryField/QueryField.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/QueryField/QueryField.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/RefreshPicker/RefreshPicker.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/RefreshPicker/_RefreshPicker.scss (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/SecretFormField/SecretFormField.story.internal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/SecretFormField/SecretFormField.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Segment/Segment.story.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Segment/Segment.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Segment/SegmentAsync.story.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Segment/SegmentAsync.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Segment/SegmentInput.story.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Segment/SegmentInput.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Segment/SegmentSelect.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Segment/index.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Segment/styles.ts (71%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Segment/types.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Segment/useExpandableLabel.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/DropdownIndicator.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/IndicatorsContainer.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/InputControl.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/MultiValue.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/Select.mdx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/Select.story.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/Select.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/SelectBase.test.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/SelectBase.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/SelectMenu.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/SelectOptionGroup.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/SingleValue.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/ValueContainer.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/getSelectStyles.ts (80%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/mockOptions.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/resetSelectStyles.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/types.ts (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/utils.test.ts (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Select/utils.ts (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/SetInterval/SetInterval.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.test.ts (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/SingleStatShared/index.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Slider/RangeSlider.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Slider/RangeSlider.story.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Slider/RangeSlider.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Slider/RangeSlider.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Slider/Slider.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Slider/Slider.story.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Slider/Slider.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Slider/Slider.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Slider/_Slider.scss (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Slider/styles.ts (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Slider/types.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Sparkline/Sparkline.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Sparkline/utils.ts (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Spinner/Spinner.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Spinner/Spinner.story.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Spinner/Spinner.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/StatsPicker/StatsPicker.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Switch/Switch.mdx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Switch/Switch.story.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Switch/Switch.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TabbedContainer/TabbedContainer.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/BarGaugeCell.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/DefaultCell.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/Filter.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/FilterActions.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/FilterList.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/FilterPopup.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/ImageCell.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/JSONViewCell.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/Table.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/Table.story.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/Table.test.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/Table.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/TableCell.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/styles.ts (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/types.ts (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/utils.test.ts (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Table/utils.ts (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TableInputCSV/TableInputCSV.story.internal.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TableInputCSV/TableInputCSV.test.tsx (91%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TableInputCSV/TableInputCSV.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tabs/Counter.tsx (85%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tabs/Tab.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tabs/TabContent.tsx (83%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tabs/Tabs.story.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tabs/TabsBar.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tabs/TabsBar.tsx (90%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tags/Tag.mdx (91%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tags/Tag.story.tsx (90%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tags/Tag.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tags/TagList.mdx (90%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tags/TagList.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tags/TagList.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TagsInput/TagItem.tsx (89%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TagsInput/TagsInput.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TagsInput/TagsInput.story.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TagsInput/TagsInput.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TextArea/TextArea.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TextArea/TextArea.story.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TextArea/TextArea.tsx (90%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ThemeColors/Colors.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ThemeColors/Colors.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ThemeColors/ThemeColors.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ThemeColors/ThemeColors.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ThresholdsEditorNew/ThresholdsEditor.story.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ThresholdsEditorNew/ThresholdsEditor.test.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ThresholdsEditorNew/ThresholdsEditor.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeOfDayPicker.story.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeOfDayPicker.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangeInput.mdx (80%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangeInput.story.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangeInput.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker.story.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker.test.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker/TimePickerCalendar.test.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker/TimePickerCalendar.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker/TimePickerContent.test.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker/TimePickerContent.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker/TimePickerFooter.tsx (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker/TimePickerTitle.tsx (83%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker/TimeRangeForm.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker/TimeRangeList.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker/TimeRangeOption.tsx (90%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeRangePicker/mapper.ts (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeZonePicker.story.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeZonePicker.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeZonePicker/TimeZoneDescription.tsx (89%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeZonePicker/TimeZoneGroup.tsx (90%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeZonePicker/TimeZoneOffset.tsx (92%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeZonePicker/TimeZoneOption.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/TimeZonePicker/TimeZoneTitle.tsx (82%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/_TimeOfDayPicker.scss (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/TimePicker/rangeOptions.ts (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ToggleButtonGroup/ToggleButtonGroup.story.internal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ToggleButtonGroup/ToggleButtonGroup.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tooltip/Popover.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tooltip/PopoverController.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tooltip/Tooltip.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tooltip/Tooltip.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tooltip/Tooltip.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tooltip/Tooltip.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tooltip/_Tooltip.scss (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Typeahead/Typeahead.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Typeahead/Typeahead.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Typeahead/TypeaheadInfo.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Typeahead/TypeaheadInfo.tsx (91%) rename packages/{ => plutono-ui}/grafana-ui/src/components/Typeahead/TypeaheadItem.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/UnitPicker/UnitPicker.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/UnitPicker/UnitPicker.story.tsx (88%) rename packages/{ => plutono-ui}/grafana-ui/src/components/UnitPicker/UnitPicker.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ValueMappingsEditor/MappingRow.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.test.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ValuePicker/ValuePicker.mdx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ValuePicker/ValuePicker.story.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/ValuePicker/ValuePicker.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizLayout/VizLayout.story.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizLayout/VizLayout.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizLegend/SeriesIcon.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizLegend/VizLegend.story.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizLegend/VizLegend.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizLegend/VizLegendList.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizLegend/VizLegendSeriesIcon.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizLegend/VizLegendStatsList.tsx (91%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizLegend/VizLegendTable.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizLegend/VizLegendTableItem.tsx (95%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizLegend/types.ts (94%) rename packages/{ => plutono-ui}/grafana-ui/src/components/VizRepeater/VizRepeater.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/index.scss (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/index.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/transitions/FadeTransition.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/transitions/SlideOutTransition.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/Plot.scss (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/Plot.test.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/Plot.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/PlotLegend.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/config.ts (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.test.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/config/UPlotSeriesBuilder.ts (97%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/config/gradientFills.ts (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/context.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/geometries/EventsCanvas.tsx (96%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/geometries/Marker.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/geometries/XYCanvas.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/geometries/index.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/hooks.test.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/hooks.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/plugins/AnnotationsEditorPlugin.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/plugins/ClickPlugin.tsx (98%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/plugins/CursorPlugin.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/plugins/SelectionPlugin.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/plugins/TooltipPlugin.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/plugins/ZoomPlugin.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/plugins/index.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/types.ts (93%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/utils.test.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/components/uPlot/utils.ts (96%) rename packages/{ => plutono-ui}/grafana-ui/src/index.scss (100%) rename packages/{ => plutono-ui}/grafana-ui/src/index.ts (83%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/braces.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/braces.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/clear.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/clear.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/clipboard.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/indentation.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/index.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/newline.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/runner.test.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/runner.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/selection_shortcuts.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/slate-prism/TOKEN_MARK.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/slate-prism/index.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/slate-prism/options.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/slate-plugins/suggestions.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/ThemeContext.test.tsx (97%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/ThemeContext.tsx (82%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts (97%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/_variables.light.scss.tmpl.ts (97%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/_variables.scss.tmpl.ts (96%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/dark.ts (95%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/default.ts (95%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/getTheme.ts (60%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/index.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/light.ts (95%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/mixins.ts (74%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/selectThemeVariant.test.ts (86%) create mode 100644 packages/plutono-ui/grafana-ui/src/themes/selectThemeVariant.ts rename packages/{ => plutono-ui}/grafana-ui/src/themes/stylesFactory.test.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/themes/stylesFactory.ts (86%) rename packages/{ => plutono-ui}/grafana-ui/src/types/completion.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/types/forms.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/types/icon.ts (99%) rename packages/{ => plutono-ui}/grafana-ui/src/types/index.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/types/input.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/types/jquery.d.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/types/mdx.d.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/types/orientation.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/types/size.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/types/storybook.ts (100%) create mode 100644 packages/plutono-ui/grafana-ui/src/types/theme.ts rename packages/{ => plutono-ui}/grafana-ui/src/utils/ansicolor.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/children.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/colors.ts (97%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/dataLinks.ts (91%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/dom.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/generatedFileBanner.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/index.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/measureText.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/renderOrCallToRender.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/scrollbar.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/slate.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/squares.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/standardEditors.tsx (99%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/storybook/DashboardStoryCanvas.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/storybook/StoryExample.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/storybook/UseState.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/storybook/data.ts (52%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/storybook/knobs.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/storybook/noopControl.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/storybook/useSize.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/storybook/withCenteredStory.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/storybook/withPaddedStory.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/storybook/withRightAlignedStory.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/storybook/withStoryContainer.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/storybook/withTheme.tsx (87%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/tags.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/typeahead.ts (92%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/useAsyncDependency.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/useClientRect.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/useComponetInstanceId.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/useDelayedSwitch.story.internal.tsx (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/useDelayedSwitch.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/validate.test.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/src/utils/validate.ts (100%) rename packages/{ => plutono-ui}/grafana-ui/tsconfig.build.json (100%) rename packages/{ => plutono-ui}/grafana-ui/tsconfig.json (91%) delete mode 100644 packaging/deb/default/grafana-server create mode 100644 packaging/deb/default/plutono-server rename packaging/deb/init.d/{grafana-server => plutono-server} (73%) rename packaging/deb/systemd/{grafana-server.service => plutono-server.service} (71%) rename packaging/mac/bin/{grafana => plutono} (58%) rename packaging/rpm/init.d/{grafana-server => plutono-server} (79%) delete mode 100644 packaging/rpm/sysconfig/grafana-server create mode 100644 packaging/rpm/sysconfig/plutono-server rename packaging/rpm/systemd/{grafana-server.service => plutono-server.service} (71%) rename packaging/wrappers/{grafana-cli => plutono-cli} (59%) rename pkg/api/{grafana_com_proxy.go => plutono_com_proxy.go} (77%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/commands.go (83%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/commandstest/context.go (90%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/commandstest/fake_api_client.go (73%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/commandstest/fake_ioutil.go (100%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/datamigrations/encrypt_datasource_passwords.go (92%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/datamigrations/encrypt_datasource_passwords_test.go (91%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/install_command.go (94%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/install_command_test.go (92%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/listremote_command.go (84%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/listversions_command.go (83%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/ls_command.go (81%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/ls_command_test.go (86%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/remove_command.go (82%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/reset_password_command.go (79%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/testdata/plugin-with-absolute-member.zip (100%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/testdata/plugin-with-parent-member.zip (100%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/testdata/plugin-with-symlink.zip (100%) rename pkg/cmd/{grafana-cli/commands/testdata/grafana-simple-json-datasource-ec18fa4da8096a952608a7e4c7782b4260b41bcf.zip => plutono-cli/commands/testdata/plutono-simple-json-datasource-ec18fa4da8096a952608a7e4c7782b4260b41bcf.zip} (100%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/upgrade_all_command.go (84%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/upgrade_all_command_test.go (94%) rename pkg/cmd/{grafana-cli => plutono-cli}/commands/upgrade_command.go (77%) rename pkg/cmd/{grafana-cli => plutono-cli}/logger/logger.go (100%) rename pkg/cmd/{grafana-cli => plutono-cli}/main.go (80%) rename pkg/cmd/{grafana-cli => plutono-cli}/models/model.go (95%) rename pkg/cmd/{grafana-cli => plutono-cli}/services/api_client.go (90%) rename pkg/cmd/{grafana-cli => plutono-cli}/services/api_client_test.go (100%) rename pkg/cmd/{grafana-cli => plutono-cli}/services/io_util.go (100%) rename pkg/cmd/{grafana-cli => plutono-cli}/services/services.go (93%) rename pkg/cmd/{grafana-cli => plutono-cli}/utils/command_line.go (95%) rename pkg/cmd/{grafana-cli/utils/grafana_path.go => plutono-cli/utils/plutono_path.go} (75%) rename pkg/cmd/{grafana-server => plutono-server}/diagnostics.go (100%) rename pkg/cmd/{grafana-server => plutono-server}/diagnostics_test.go (100%) rename pkg/cmd/{grafana-server => plutono-server}/main.go (79%) rename pkg/login/{grafana_login.go => plutono_login.go} (79%) rename pkg/login/{grafana_login_test.go => plutono_login_test.go} (63%) rename pkg/login/social/{grafana_com_oauth.go => plutono_com_oauth.go} (79%) rename {grafana-mixin => plutono-mixin}/.gitignore (100%) rename {grafana-mixin => plutono-mixin}/Makefile (100%) rename {grafana-mixin => plutono-mixin}/README.md (81%) rename {grafana-mixin => plutono-mixin}/alerts/alerts.yaml (90%) rename grafana-mixin/dashboards/grafana-overview.json => plutono-mixin/dashboards/plutono-overview.json (95%) rename {grafana-mixin => plutono-mixin}/mixin.libsonnet (81%) rename {grafana-mixin => plutono-mixin}/rules/rules.yaml (92%) rename {grafana-mixin => plutono-mixin}/scripts/build.sh (100%) rename {grafana-mixin => plutono-mixin}/scripts/common.sh (100%) rename {grafana-mixin => plutono-mixin}/scripts/format.sh (100%) rename {grafana-mixin => plutono-mixin}/scripts/lint.sh (100%) rename public/app/core/components/code_editor/{theme-grafana-dark.js => theme-plutono-dark.js} (99%) delete mode 100644 public/app/plugins/datasource/grafana/annotation_ctrl.ts delete mode 100644 public/app/plugins/datasource/grafana/module.ts delete mode 100644 public/app/plugins/datasource/grafana/types.ts rename public/app/plugins/datasource/loki/img/{grafana_icon.svg => plutono_icon.svg} (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/__mocks__/query_ctrl.ts (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/__mocks__/sdk.ts (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/annotations_query_ctrl.ts (96%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/app_insights/app_insights_datasource.test.ts (98%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/app_insights/app_insights_datasource.ts (97%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/app_insights/response_parser.ts (99%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/azure_log_analytics/__mocks__/schema.ts (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/azure_log_analytics/azure_log_analytics_datasource.test.ts (98%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/azure_log_analytics/azure_log_analytics_datasource.ts (99%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/azure_log_analytics/response_parser.test.ts (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/azure_log_analytics/response_parser.ts (98%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/azure_monitor/azure_monitor_datasource.test.ts (99%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/azure_monitor/azure_monitor_datasource.ts (99%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/azure_monitor/response_parser.ts (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/azure_monitor/supported_namespaces.ts (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/azure_monitor/url_builder.test.ts (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/azure_monitor/url_builder.ts (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/AnalyticsConfig.test.tsx (97%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/AnalyticsConfig.tsx (97%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/AzureCredentialsForm.test.tsx (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/AzureCredentialsForm.tsx (97%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/ConfigEditor.test.tsx (95%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/ConfigEditor.tsx (98%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/InsightsConfig.test.tsx (97%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/InsightsConfig.tsx (97%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/MonitorConfig.tsx (98%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/__snapshots__/AnalyticsConfig.test.tsx.snap (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/__snapshots__/AzureCredentialsForm.test.tsx.snap (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/__snapshots__/ConfigEditor.test.tsx.snap (95%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/components/__snapshots__/InsightsConfig.test.tsx.snap (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/css/query_editor.css (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/datasource.ts (98%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/editor/KustoQueryField.tsx (98%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/editor/editor_component.tsx (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/editor/kusto/kusto.ts (99%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/editor/query_field.tsx (99%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/editor/typeahead.tsx (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/img/azure_monitor_cpu.png (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/img/azure_monitor_network.png (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/img/config_1_select_type.png (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/img/config_2_azure_monitor_api_details.png (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/img/config_3_app_insights_api_details.png (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/img/config_4_save_and_test.png (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource/img/contoso_loans_grafana_dashboard.png => plutono-azure-monitor-datasource/img/contoso_loans_plutono_dashboard.png} (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/img/logo.jpg (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource/img/grafana_cloud_install.png => plutono-azure-monitor-datasource/img/plutono_cloud_install.png} (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource/img/grafana_cloud_login.png => plutono-azure-monitor-datasource/img/plutono_cloud_login.png} (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/insights_analytics/insights_analytics_datasource.ts (86%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/log_analytics/querystring_builder.test.ts (89%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/log_analytics/querystring_builder.ts (98%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/module.tsx (90%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/partials/annotations.editor.html (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/partials/query.editor.html (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/plugin.json (89%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/query_ctrl.test.ts (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/query_ctrl.ts (99%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/query_help.md (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/time_grain_converter.test.ts (100%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/time_grain_converter.ts (98%) rename public/app/plugins/datasource/{grafana-azure-monitor-datasource => plutono-azure-monitor-datasource}/types.ts (98%) rename public/app/plugins/datasource/{grafana => plutono}/README.md (58%) create mode 100644 public/app/plugins/datasource/plutono/annotation_ctrl.ts rename public/app/plugins/datasource/{grafana => plutono}/components/QueryEditor.tsx (83%) rename public/app/plugins/datasource/{grafana => plutono}/datasource.test.ts (79%) rename public/app/plugins/datasource/{grafana => plutono}/datasource.ts (82%) create mode 100644 public/app/plugins/datasource/plutono/module.ts rename public/app/plugins/datasource/{grafana => plutono}/partials/annotations.editor.html (96%) rename public/app/plugins/datasource/{grafana => plutono}/plugin.json (65%) create mode 100644 public/app/plugins/datasource/plutono/types.ts rename public/app/plugins/datasource/prometheus/dashboards/{grafana_stats.json => plutono_stats.json} (95%) rename public/app/plugins/datasource/testdata/components/{GrafanaLiveEditor.tsx => PlutonoLiveEditor.tsx} (81%) rename public/app/routes/{GrafanaCtrl.ts => PlutonoCtrl.ts} (94%) rename public/fonts/{grafana-icons.eot => plutono-icons.eot} (100%) rename public/fonts/{grafana-icons.svg => plutono-icons.svg} (99%) rename public/fonts/{grafana-icons.ttf => plutono-icons.ttf} (100%) rename public/fonts/{grafana-icons.woff => plutono-icons.woff} (100%) rename public/img/{grafana_com_auth_icon.svg => plutono_com_auth_icon.svg} (100%) rename public/img/{grafana_icon.svg => plutono_icon.svg} (98%) rename public/img/{grafana_mask_icon.svg => plutono_mask_icon.svg} (95%) rename public/img/{grafana_mask_icon_white.svg => plutono_mask_icon_white.svg} (94%) rename public/sass/{_grafana.scss => _plutono.scss} (97%) rename public/sass/base/{_grafana_icons.scss => _plutono_icons.scss} (84%) rename public/sass/{grafana.dark.scss => plutono.dark.scss} (77%) rename public/sass/{grafana.light.scss => plutono.light.scss} (78%) rename scripts/build/ci-msi-build/msigenerator/resources/images/{grafana_dialog_background.bmp => plutono_dialog_background.bmp} (100%) rename scripts/build/ci-msi-build/msigenerator/resources/images/{grafana_dialog_background.png => plutono_dialog_background.png} (100%) rename scripts/build/ci-msi-build/msigenerator/resources/images/{grafana_icon.ico => plutono_icon.ico} (100%) rename scripts/build/ci-msi-build/msigenerator/resources/images/{grafana_top_banner.bmp => plutono_top_banner.bmp} (100%) rename scripts/build/ci-msi-build/msigenerator/resources/images/{grafana_top_banner.png => plutono_top_banner.png} (100%) rename scripts/build/ci-msi-build/msigenerator/resources/images/{grafana_top_banner_white.bmp => plutono_top_banner_white.bmp} (100%) rename scripts/build/ci-msi-build/msigenerator/templates/common/{grafana-firewall.wxs.j2 => plutono-firewall.wxs.j2} (65%) rename scripts/build/ci-msi-build/msigenerator/templates/common/{grafana-service.wxs.j2 => plutono-service.wxs.j2} (81%) rename scripts/build/release_publisher/testdata/{grafana-enterprise-5.4.0-123pre1.linux-amd64.tar.gz => plutono-enterprise-5.4.0-123pre1.linux-amd64.tar.gz} (100%) rename scripts/build/release_publisher/testdata/{grafana-enterprise-5.4.0-123pre1.linux-amd64.tar.gz.sha256 => plutono-enterprise-5.4.0-123pre1.linux-amd64.tar.gz.sha256} (100%) rename scripts/build/release_publisher/testdata/{grafana-enterprise-5.4.0-123pre1.windows-amd64.msi => plutono-enterprise-5.4.0-123pre1.windows-amd64.msi} (100%) rename scripts/build/release_publisher/testdata/{grafana-enterprise-5.4.0-123pre1.windows-amd64.msi.sha256 => plutono-enterprise-5.4.0-123pre1.windows-amd64.msi.sha256} (100%) rename scripts/build/release_publisher/testdata/{grafana-enterprise-5.4.0-123pre1.windows-amd64.zip => plutono-enterprise-5.4.0-123pre1.windows-amd64.zip} (100%) rename scripts/build/release_publisher/testdata/{grafana-enterprise-5.4.0-123pre1.windows-amd64.zip.sha256 => plutono-enterprise-5.4.0-123pre1.windows-amd64.zip.sha256} (100%) rename scripts/build/release_publisher/testdata/{grafana-enterprise-5.4.0-123pre1.x86_64.rpm => plutono-enterprise-5.4.0-123pre1.x86_64.rpm} (100%) rename scripts/build/release_publisher/testdata/{grafana-enterprise-5.4.0-123pre1.x86_64.rpm.sha256 => plutono-enterprise-5.4.0-123pre1.x86_64.rpm.sha256} (100%) rename scripts/build/release_publisher/testdata/{grafana-enterprise_5.4.0-123pre1_amd64.deb => plutono-enterprise_5.4.0-123pre1_amd64.deb} (100%) rename scripts/build/release_publisher/testdata/{grafana-enterprise_5.4.0-123pre1_amd64.deb.sha256 => plutono-enterprise_5.4.0-123pre1_amd64.deb.sha256} (100%) rename scripts/{trigger_grafana_packer.sh => trigger_plutono_packer.sh} (56%) diff --git a/.bra.toml b/.bra.toml index 2e222e4549..933fab862d 100644 --- a/.bra.toml +++ b/.bra.toml @@ -2,7 +2,7 @@ init_cmds = [ ["go", "run", "build.go", "-dev", "build-cli"], ["go", "run", "build.go", "-dev", "build-server"], - ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"] + ["./bin/plutono-server", "-packaging=dev", "cfg:app_mode=development"] ] watch_all = true follow_symlinks = true @@ -15,5 +15,5 @@ watch_exts = [".go", ".ini", ".toml", ".template.html"] build_delay = 1500 cmds = [ ["go", "run", "build.go", "-dev", "build-server"], - ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"] + ["./bin/plutono-server", "-packaging=dev", "cfg:app_mode=development"] ] diff --git a/.circleci/config.yml b/.circleci/config.yml index e85e67e07d..28eabe44d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,5 +56,5 @@ workflows: - scan-docker-image: matrix: parameters: - image: [grafana/grafana, grafana/grafana-enterprise] + image: [plutono/plutono, plutono/plutono-enterprise] tag: [latest, master, latest-ubuntu, master-ubuntu] diff --git a/.drone.yml b/.drone.yml index 05b70844b8..269cfdb877 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,10 +14,10 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/grabpl + - curl -fL -o bin/grabpl https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz @@ -30,7 +30,7 @@ steps: DOCKERIZE_VERSION: 0.6.1 - name: lint-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl lint-backend --edition oss environment: @@ -39,7 +39,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -47,21 +47,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition oss @@ -71,7 +71,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn run ci:test-frontend environment: @@ -80,7 +80,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --variants linux-x64,linux-x64-musl,osx64,win64 --no-pull-enterprise depends_on: @@ -89,7 +89,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -97,7 +97,7 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps depends_on: @@ -105,7 +105,7 @@ steps: - lint-backend - name: gen-version - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: @@ -119,14 +119,14 @@ steps: - check-dashboard-schemas - name: package - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --variants linux-x64,linux-x64-musl,osx64,win64 depends_on: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 detach: true commands: - ./e2e/start-server @@ -136,7 +136,7 @@ steps: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 + image: plutono/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests --port 3001 @@ -146,7 +146,7 @@ steps: - end-to-end-tests-server - name: build-storybook - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn storybook:build - ./bin/grabpl verify-storybook @@ -156,24 +156,24 @@ steps: - package - name: build-frontend-docs - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./scripts/ci-reference-docs-lint.sh ci depends_on: - build-frontend - name: build-docs-website - image: grafana/docs-base:latest + image: plutono/docs-base:latest commands: - - mkdir -p /hugo/content/docs/grafana - - cp -r docs/sources/* /hugo/content/docs/grafana/latest/ + - mkdir -p /hugo/content/docs/plutono + - cp -r docs/sources/* /hugo/content/docs/plutono/latest/ - cd /hugo && make prod depends_on: - initialize - build-frontend-docs - name: copy-packages-for-docker - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -181,7 +181,7 @@ steps: - package - name: build-docker-images - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: archs: amd64 dry_run: true @@ -190,25 +190,25 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list - apt-get install -yq postgresql-client - ./bin/dockerize -wait tcp://postgres:5432 -timeout 120s - - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql + - psql -p 5432 -h postgres -U plutonotest -d plutonotest -f devenv/docker/blocks/postgres_tests/setup.sql - go clean -testcache - ./bin/grabpl integration-tests --database postgres environment: - GRAFANA_TEST_DB: postgres - PGPASSWORD: grafanatest + PLUTONO_TEST_DB: postgres + PGPASSWORD: plutonotest POSTGRES_HOST: postgres depends_on: - test-backend - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list @@ -218,7 +218,7 @@ steps: - go clean -testcache - ./bin/grabpl integration-tests --database mysql environment: - GRAFANA_TEST_DB: mysql + PLUTONO_TEST_DB: mysql MYSQL_HOST: mysql depends_on: - test-backend @@ -228,17 +228,17 @@ services: - name: postgres image: postgres:12.3-alpine environment: - POSTGRES_DB: grafanatest - POSTGRES_PASSWORD: grafanatest - POSTGRES_USER: grafanatest + POSTGRES_DB: plutonotest + POSTGRES_PASSWORD: plutonotest + POSTGRES_USER: plutonotest - name: mysql image: mysql:5.6.48 environment: - MYSQL_DATABASE: grafana_tests + MYSQL_DATABASE: plutono_tests MYSQL_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass - MYSQL_USER: grafana + MYSQL_USER: plutono node: type: no-parallel @@ -263,10 +263,10 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/grabpl + - curl -fL -o bin/grabpl https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz @@ -279,19 +279,19 @@ steps: DOCKERIZE_VERSION: 0.6.1 - name: trigger-enterprise-downstream - image: grafana/drone-downstream + image: plutono/drone-downstream settings: params: - SOURCE_BUILD_NUMBER=${DRONE_BUILD_NUMBER} - SOURCE_COMMIT=${DRONE_COMMIT} repositories: - - grafana/grafana-enterprise - server: https://drone.grafana.net + - plutono/plutono-enterprise + server: https://drone.plutono.net token: from_secret: drone_token - name: lint-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl lint-backend --edition oss environment: @@ -300,7 +300,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -308,21 +308,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition oss @@ -332,7 +332,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn run ci:test-frontend environment: @@ -341,18 +341,18 @@ steps: - initialize - name: publish-frontend-metrics - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - - ./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY} + - ./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${PLUTONO_MISC_STATS_API_KEY} environment: - GRAFANA_MISC_STATS_API_KEY: - from_secret: grafana_misc_stats_api_key + PLUTONO_MISC_STATS_API_KEY: + from_secret: plutono_misc_stats_api_key failure: ignore depends_on: - initialize - name: build-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -361,7 +361,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -369,18 +369,18 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin environment: - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - initialize - lint-backend - name: gen-version - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: @@ -394,7 +394,7 @@ steps: - check-dashboard-schemas - name: package - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --sign environment: @@ -406,13 +406,13 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 detach: true commands: - ./e2e/start-server @@ -422,7 +422,7 @@ steps: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 + image: plutono/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests --port 3001 @@ -432,7 +432,7 @@ steps: - end-to-end-tests-server - name: build-storybook - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn storybook:build - ./bin/grabpl verify-storybook @@ -442,11 +442,11 @@ steps: - package - name: publish-storybook - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json - gcloud auth activate-service-account --key-file=/tmp/gcpkey.json - - gsutil -m rsync -d -r ./packages/grafana-ui/dist/storybook gs://grafana-storybook/canary + - gsutil -m rsync -d -r ./packages/plutono-ui/dist/storybook gs://plutono-storybook/canary environment: GCP_KEY: from_secret: gcp_key @@ -455,14 +455,14 @@ steps: - end-to-end-tests - name: build-frontend-docs - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./scripts/ci-reference-docs-lint.sh ci depends_on: - build-frontend - name: copy-packages-for-docker - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -470,7 +470,7 @@ steps: - package - name: build-docker-images - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: edition: oss password: @@ -481,7 +481,7 @@ steps: - copy-packages-for-docker - name: build-docker-images-ubuntu - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: edition: oss password: @@ -493,25 +493,25 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list - apt-get install -yq postgresql-client - ./bin/dockerize -wait tcp://postgres:5432 -timeout 120s - - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql + - psql -p 5432 -h postgres -U plutonotest -d plutonotest -f devenv/docker/blocks/postgres_tests/setup.sql - go clean -testcache - ./bin/grabpl integration-tests --database postgres environment: - GRAFANA_TEST_DB: postgres - PGPASSWORD: grafanatest + PLUTONO_TEST_DB: postgres + PGPASSWORD: plutonotest POSTGRES_HOST: postgres depends_on: - test-backend - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list @@ -521,14 +521,14 @@ steps: - go clean -testcache - ./bin/grabpl integration-tests --database mysql environment: - GRAFANA_TEST_DB: mysql + PLUTONO_TEST_DB: mysql MYSQL_HOST: mysql depends_on: - test-backend - test-frontend - name: release-canary-npm-packages - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./scripts/circle-release-canary-packages.sh environment: @@ -538,11 +538,11 @@ steps: - end-to-end-tests - name: upload-packages - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads + - ./bin/grabpl upload-packages --edition oss --packages-bucket plutono-downloads environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package @@ -551,11 +551,11 @@ steps: - postgres-integration-tests - name: upload-cdn-assets - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets" + - ./bin/grabpl upload-cdn --edition oss --bucket "plutono-static-assets" environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package @@ -564,17 +564,17 @@ services: - name: postgres image: postgres:12.3-alpine environment: - POSTGRES_DB: grafanatest - POSTGRES_PASSWORD: grafanatest - POSTGRES_USER: grafanatest + POSTGRES_DB: plutonotest + POSTGRES_PASSWORD: plutonotest + POSTGRES_USER: plutonotest - name: mysql image: mysql:5.6.48 environment: - MYSQL_DATABASE: grafana_tests + MYSQL_DATABASE: plutono_tests MYSQL_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass - MYSQL_USER: grafana + MYSQL_USER: plutono node: type: no-parallel @@ -602,13 +602,13 @@ steps: - echo $env:DRONE_RUNNER_NAME - name: initialize - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe - name: build-windows-installer - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$gcpKey = $$env:GCP_KEY - "[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json" @@ -617,9 +617,9 @@ steps: - rm gcpkey.json - cp C:\App\nssm-2.24.zip . - .\grabpl.exe windows-installer --edition oss --build-id $$env:DRONE_BUILD_NUMBER - - $$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0] - - gsutil cp $$fname gs://grafana-downloads/oss/master/ - - gsutil cp "$$fname.sha256" gs://grafana-downloads/oss/master/ + - $$fname = ((Get-Childitem plutono*.msi -name) -split "`n")[0] + - gsutil cp $$fname gs://plutono-downloads/oss/master/ + - gsutil cp "$$fname.sha256" gs://plutono-downloads/oss/master/ environment: GCP_KEY: from_secret: gcp_key @@ -651,17 +651,17 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/grabpl + - curl -fL -o bin/grabpl https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone environment: DOCKERIZE_VERSION: 0.6.1 - name: publish-packages-oss - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json - ./bin/grabpl publish-packages --edition oss --gcp-key /tmp/gcpkey.json --build-id ${DRONE_BUILD_NUMBER} @@ -674,8 +674,8 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_COM_API_KEY: - from_secret: grafana_api_key + PLUTONO_COM_API_KEY: + from_secret: plutono_api_key depends_on: - initialize @@ -705,7 +705,7 @@ steps: - name: slack image: plugins/slack settings: - channel: grafana-ci-notifications + channel: plutono-ci-notifications template: "Build {{build.number}} failed for commit: : {{build.link}}\nAuthor: {{build.author}}" webhook: from_secret: slack_webhook @@ -739,10 +739,10 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/grabpl + - curl -fL -o bin/grabpl https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - ./bin/grabpl verify-version ${DRONE_TAG} @@ -756,7 +756,7 @@ steps: DOCKERIZE_VERSION: 0.6.1 - name: lint-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl lint-backend --edition oss environment: @@ -765,7 +765,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -773,21 +773,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition oss @@ -797,7 +797,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn run ci:test-frontend environment: @@ -806,7 +806,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise ${DRONE_TAG} environment: @@ -818,7 +818,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition oss --no-pull-enterprise ${DRONE_TAG} depends_on: @@ -826,18 +826,18 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin environment: - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - initialize - lint-backend - name: gen-version - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: @@ -851,7 +851,7 @@ steps: - check-dashboard-schemas - name: package - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG} environment: @@ -863,13 +863,13 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 detach: true commands: - ./e2e/start-server @@ -879,7 +879,7 @@ steps: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 + image: plutono/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests --port 3001 --tries 3 @@ -889,7 +889,7 @@ steps: - end-to-end-tests-server - name: build-storybook - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn storybook:build - ./bin/grabpl verify-storybook @@ -899,7 +899,7 @@ steps: - package - name: copy-packages-for-docker - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -907,7 +907,7 @@ steps: - package - name: build-docker-images - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: edition: oss password: @@ -918,7 +918,7 @@ steps: - copy-packages-for-docker - name: build-docker-images-ubuntu - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: edition: oss password: @@ -930,25 +930,25 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list - apt-get install -yq postgresql-client - ./bin/dockerize -wait tcp://postgres:5432 -timeout 120s - - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql + - psql -p 5432 -h postgres -U plutonotest -d plutonotest -f devenv/docker/blocks/postgres_tests/setup.sql - go clean -testcache - ./bin/grabpl integration-tests --database postgres environment: - GRAFANA_TEST_DB: postgres - PGPASSWORD: grafanatest + PLUTONO_TEST_DB: postgres + PGPASSWORD: plutonotest POSTGRES_HOST: postgres depends_on: - test-backend - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list @@ -958,28 +958,28 @@ steps: - go clean -testcache - ./bin/grabpl integration-tests --database mysql environment: - GRAFANA_TEST_DB: mysql + PLUTONO_TEST_DB: mysql MYSQL_HOST: mysql depends_on: - test-backend - test-frontend - name: upload-cdn-assets - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets" + - ./bin/grabpl upload-cdn --edition oss --bucket "plutono-static-assets" environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package - name: upload-packages - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads + - ./bin/grabpl upload-packages --edition oss --packages-bucket plutono-downloads environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package @@ -988,12 +988,12 @@ steps: - postgres-integration-tests - name: publish-storybook - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json - gcloud auth activate-service-account --key-file=/tmp/gcpkey.json - - gsutil -m rsync -d -r ./packages/grafana-ui/dist/storybook gs://grafana-storybook/latest - - gsutil -m rsync -d -r ./packages/grafana-ui/dist/storybook gs://grafana-storybook/${DRONE_TAG} + - gsutil -m rsync -d -r ./packages/plutono-ui/dist/storybook gs://plutono-storybook/latest + - gsutil -m rsync -d -r ./packages/plutono-ui/dist/storybook gs://plutono-storybook/${DRONE_TAG} environment: GCP_KEY: from_secret: gcp_key @@ -1002,7 +1002,7 @@ steps: - end-to-end-tests - name: release-npm-packages - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./scripts/build/release-packages.sh ${DRONE_TAG} environment: @@ -1017,17 +1017,17 @@ services: - name: postgres image: postgres:12.3-alpine environment: - POSTGRES_DB: grafanatest - POSTGRES_PASSWORD: grafanatest - POSTGRES_USER: grafanatest + POSTGRES_DB: plutonotest + POSTGRES_PASSWORD: plutonotest + POSTGRES_USER: plutonotest - name: mysql image: mysql:5.6.48 environment: - MYSQL_DATABASE: grafana_tests + MYSQL_DATABASE: plutono_tests MYSQL_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass - MYSQL_USER: grafana + MYSQL_USER: plutono node: type: no-parallel @@ -1053,13 +1053,13 @@ steps: - echo $env:DRONE_RUNNER_NAME - name: initialize - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe - name: build-windows-installer - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$gcpKey = $$env:GCP_KEY - "[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json" @@ -1068,9 +1068,9 @@ steps: - rm gcpkey.json - cp C:\App\nssm-2.24.zip . - .\grabpl.exe windows-installer --edition oss ${DRONE_TAG} - - $$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0] - - gsutil cp $$fname gs://grafana-downloads/oss/release/ - - gsutil cp "$$fname.sha256" gs://grafana-downloads/oss/release/ + - $$fname = ((Get-Childitem plutono*.msi -name) -split "`n")[0] + - gsutil cp $$fname gs://plutono-downloads/oss/release/ + - gsutil cp "$$fname.sha256" gs://plutono-downloads/oss/release/ environment: GCP_KEY: from_secret: gcp_key @@ -1103,25 +1103,25 @@ steps: - echo $DRONE_RUNNER_NAME - name: clone - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/grabpl + - curl -fL -o bin/grabpl https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/grabpl - chmod +x bin/grabpl - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - - cd grafana-enterprise + - cd plutono-enterprise - git checkout ${DRONE_TAG} environment: GITHUB_TOKEN: from_secret: github_token - name: initialize - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv bin/grabpl /tmp/ - rmdir bin - - mv grafana-enterprise /tmp/ - - /tmp/grabpl init-enterprise /tmp/grafana-enterprise ${DRONE_TAG} + - mv plutono-enterprise /tmp/ + - /tmp/grabpl init-enterprise /tmp/plutono-enterprise ${DRONE_TAG} - mkdir bin - mv /tmp/grabpl bin/ - ./bin/grabpl verify-drone @@ -1138,7 +1138,7 @@ steps: - clone - name: lint-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl lint-backend --edition enterprise environment: @@ -1147,7 +1147,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -1155,21 +1155,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition enterprise @@ -1179,7 +1179,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn run ci:test-frontend environment: @@ -1188,7 +1188,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise ${DRONE_TAG} environment: @@ -1200,7 +1200,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition enterprise --no-pull-enterprise ${DRONE_TAG} depends_on: @@ -1208,18 +1208,18 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign --signing-admin environment: - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - initialize - lint-backend - name: lint-backend-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl lint-backend --edition enterprise2 environment: @@ -1228,7 +1228,7 @@ steps: - initialize - name: test-backend-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition enterprise2 @@ -1238,7 +1238,7 @@ steps: - lint-backend-enterprise2 - name: build-backend-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise ${DRONE_TAG} environment: @@ -1250,7 +1250,7 @@ steps: - test-backend-enterprise2 - name: gen-version - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: @@ -1266,7 +1266,7 @@ steps: - test-backend-enterprise2 - name: package - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG} environment: @@ -1278,25 +1278,25 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 detach: true commands: - ./e2e/start-server environment: - PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz + PACKAGE_FILE: dist/plutono-enterprise-*linux-amd64.tar.gz PORT: 3001 - RUNDIR: e2e/tmp-grafana-enterprise + RUNDIR: e2e/tmp-plutono-enterprise depends_on: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 + image: plutono/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests --port 3001 --tries 3 @@ -1306,7 +1306,7 @@ steps: - end-to-end-tests-server - name: copy-packages-for-docker - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -1314,7 +1314,7 @@ steps: - package - name: build-docker-images - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: edition: enterprise password: @@ -1325,7 +1325,7 @@ steps: - copy-packages-for-docker - name: build-docker-images-ubuntu - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: edition: enterprise password: @@ -1337,25 +1337,25 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list - apt-get install -yq postgresql-client - ./bin/dockerize -wait tcp://postgres:5432 -timeout 120s - - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql + - psql -p 5432 -h postgres -U plutonotest -d plutonotest -f devenv/docker/blocks/postgres_tests/setup.sql - go clean -testcache - ./bin/grabpl integration-tests --database postgres environment: - GRAFANA_TEST_DB: postgres - PGPASSWORD: grafanatest + PLUTONO_TEST_DB: postgres + PGPASSWORD: plutonotest POSTGRES_HOST: postgres depends_on: - test-backend - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list @@ -1365,28 +1365,28 @@ steps: - go clean -testcache - ./bin/grabpl integration-tests --database mysql environment: - GRAFANA_TEST_DB: mysql + PLUTONO_TEST_DB: mysql MYSQL_HOST: mysql depends_on: - test-backend - test-frontend - name: upload-cdn-assets - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-cdn --edition enterprise --bucket "grafana-static-assets" + - ./bin/grabpl upload-cdn --edition enterprise --bucket "plutono-static-assets" environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package - name: upload-packages - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads + - ./bin/grabpl upload-packages --edition enterprise --packages-bucket plutono-downloads environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package @@ -1395,7 +1395,7 @@ steps: - postgres-integration-tests - name: package-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl package --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG} environment: @@ -1407,35 +1407,35 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - gen-version - name: upload-cdn-assets-enterprise2 - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets" + - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "plutono-static-assets" environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package-enterprise2 - name: end-to-end-tests-server-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 detach: true commands: - ./e2e/start-server environment: - PACKAGE_FILE: dist/grafana-enterprise2-*linux-amd64.tar.gz + PACKAGE_FILE: dist/plutono-enterprise2-*linux-amd64.tar.gz PORT: 3002 - RUNDIR: e2e/tmp-grafana-enterprise2 + RUNDIR: e2e/tmp-plutono-enterprise2 depends_on: - package-enterprise2 - name: end-to-end-tests-enterprise2 - image: grafana/ci-e2e:12.19.0-1 + image: plutono/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests --port 3002 --tries 3 @@ -1445,11 +1445,11 @@ steps: - end-to-end-tests-server-enterprise2 - name: upload-packages-enterprise2 - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-enterprise2 + - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket plutono-downloads-enterprise2 environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package-enterprise2 @@ -1461,17 +1461,17 @@ services: - name: postgres image: postgres:12.3-alpine environment: - POSTGRES_DB: grafanatest - POSTGRES_PASSWORD: grafanatest - POSTGRES_USER: grafanatest + POSTGRES_DB: plutonotest + POSTGRES_PASSWORD: plutonotest + POSTGRES_USER: plutonotest - name: mysql image: mysql:5.6.48 environment: - MYSQL_DATABASE: grafana_tests + MYSQL_DATABASE: plutono_tests MYSQL_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass - MYSQL_USER: grafana + MYSQL_USER: plutono node: type: no-parallel @@ -1500,31 +1500,31 @@ steps: - echo $env:DRONE_RUNNER_NAME - name: clone - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - - cd grafana-enterprise + - cd plutono-enterprise - git checkout ${DRONE_TAG} environment: GITHUB_TOKEN: from_secret: github_token - name: initialize - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - - cp -r grafana-enterprise C:\App\grafana-enterprise - - rm -r -force grafana-enterprise + - cp -r plutono-enterprise C:\App\plutono-enterprise + - rm -r -force plutono-enterprise - cp grabpl.exe C:\App\grabpl.exe - rm -force grabpl.exe - - C:\App\grabpl.exe init-enterprise C:\App\grafana-enterprise + - C:\App\grabpl.exe init-enterprise C:\App\plutono-enterprise - cp C:\App\grabpl.exe grabpl.exe depends_on: - clone - name: build-windows-installer - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$gcpKey = $$env:GCP_KEY - "[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json" @@ -1533,9 +1533,9 @@ steps: - rm gcpkey.json - cp C:\App\nssm-2.24.zip . - .\grabpl.exe windows-installer --edition enterprise ${DRONE_TAG} - - $$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0] - - gsutil cp $$fname gs://grafana-downloads/enterprise/release/ - - gsutil cp "$$fname.sha256" gs://grafana-downloads/enterprise/release/ + - $$fname = ((Get-Childitem plutono*.msi -name) -split "`n")[0] + - gsutil cp $$fname gs://plutono-downloads/enterprise/release/ + - gsutil cp "$$fname.sha256" gs://plutono-downloads/enterprise/release/ environment: GCP_KEY: from_secret: gcp_key @@ -1565,10 +1565,10 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/grabpl + - curl -fL -o bin/grabpl https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - ./bin/grabpl verify-version ${DRONE_TAG} @@ -1576,7 +1576,7 @@ steps: DOCKERIZE_VERSION: 0.6.1 - name: publish-packages-oss - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json - ./bin/grabpl publish-packages --edition oss --gcp-key /tmp/gcpkey.json ${DRONE_TAG} @@ -1589,13 +1589,13 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_COM_API_KEY: - from_secret: grafana_api_key + PLUTONO_COM_API_KEY: + from_secret: plutono_api_key depends_on: - initialize - name: publish-packages-enterprise - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json - ./bin/grabpl publish-packages --edition enterprise --gcp-key /tmp/gcpkey.json ${DRONE_TAG} @@ -1608,8 +1608,8 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_COM_API_KEY: - from_secret: grafana_api_key + PLUTONO_COM_API_KEY: + from_secret: plutono_api_key depends_on: - initialize @@ -1639,7 +1639,7 @@ steps: - name: slack image: plugins/slack settings: - channel: grafana-ci-notifications + channel: plutono-ci-notifications template: "Build {{build.number}} failed for commit: : {{build.link}}\nAuthor: {{build.author}}" webhook: from_secret: slack_webhook @@ -1673,10 +1673,10 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/grabpl + - curl -fL -o bin/grabpl https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - ./bin/grabpl verify-version v7.3.0-test @@ -1690,7 +1690,7 @@ steps: DOCKERIZE_VERSION: 0.6.1 - name: lint-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl lint-backend --edition oss environment: @@ -1699,7 +1699,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -1707,21 +1707,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition oss @@ -1731,7 +1731,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn run ci:test-frontend environment: @@ -1740,7 +1740,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise v7.3.0-test environment: @@ -1752,7 +1752,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition oss --no-pull-enterprise v7.3.0-test depends_on: @@ -1760,18 +1760,18 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin environment: - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - initialize - lint-backend - name: gen-version - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl gen-version v7.3.0-test depends_on: @@ -1785,7 +1785,7 @@ steps: - check-dashboard-schemas - name: package - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test environment: @@ -1797,13 +1797,13 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 detach: true commands: - ./e2e/start-server @@ -1813,7 +1813,7 @@ steps: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 + image: plutono/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests --port 3001 --tries 3 @@ -1823,7 +1823,7 @@ steps: - end-to-end-tests-server - name: build-storybook - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn storybook:build - ./bin/grabpl verify-storybook @@ -1833,7 +1833,7 @@ steps: - package - name: copy-packages-for-docker - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -1841,7 +1841,7 @@ steps: - package - name: build-docker-images - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: dry_run: true edition: oss @@ -1849,7 +1849,7 @@ steps: - copy-packages-for-docker - name: build-docker-images-ubuntu - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: dry_run: true edition: oss @@ -1858,25 +1858,25 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list - apt-get install -yq postgresql-client - ./bin/dockerize -wait tcp://postgres:5432 -timeout 120s - - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql + - psql -p 5432 -h postgres -U plutonotest -d plutonotest -f devenv/docker/blocks/postgres_tests/setup.sql - go clean -testcache - ./bin/grabpl integration-tests --database postgres environment: - GRAFANA_TEST_DB: postgres - PGPASSWORD: grafanatest + PLUTONO_TEST_DB: postgres + PGPASSWORD: plutonotest POSTGRES_HOST: postgres depends_on: - test-backend - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list @@ -1886,28 +1886,28 @@ steps: - go clean -testcache - ./bin/grabpl integration-tests --database mysql environment: - GRAFANA_TEST_DB: mysql + PLUTONO_TEST_DB: mysql MYSQL_HOST: mysql depends_on: - test-backend - test-frontend - name: upload-cdn-assets - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets" + - ./bin/grabpl upload-cdn --edition oss --bucket "plutono-static-assets" environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package - name: upload-packages - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads-test + - ./bin/grabpl upload-packages --edition oss --packages-bucket plutono-downloads-test environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package @@ -1916,7 +1916,7 @@ steps: - postgres-integration-tests - name: publish-storybook - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - echo Testing release environment: @@ -1927,7 +1927,7 @@ steps: - end-to-end-tests - name: release-npm-packages - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 environment: GITHUB_PACKAGE_TOKEN: from_secret: github_package_token @@ -1940,17 +1940,17 @@ services: - name: postgres image: postgres:12.3-alpine environment: - POSTGRES_DB: grafanatest - POSTGRES_PASSWORD: grafanatest - POSTGRES_USER: grafanatest + POSTGRES_DB: plutonotest + POSTGRES_PASSWORD: plutonotest + POSTGRES_USER: plutonotest - name: mysql image: mysql:5.6.48 environment: - MYSQL_DATABASE: grafana_tests + MYSQL_DATABASE: plutono_tests MYSQL_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass - MYSQL_USER: grafana + MYSQL_USER: plutono node: type: no-parallel @@ -1976,13 +1976,13 @@ steps: - echo $env:DRONE_RUNNER_NAME - name: initialize - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe - name: build-windows-installer - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$gcpKey = $$env:GCP_KEY - "[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json" @@ -1990,10 +1990,10 @@ steps: - gcloud auth activate-service-account --key-file=gcpkey.json - rm gcpkey.json - cp C:\App\nssm-2.24.zip . - - .\grabpl.exe windows-installer --edition oss --packages-bucket grafana-downloads-test v7.3.0-test - - $$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0] - - gsutil cp $$fname gs://grafana-downloads-test/oss/release/ - - gsutil cp "$$fname.sha256" gs://grafana-downloads-test/oss/release/ + - .\grabpl.exe windows-installer --edition oss --packages-bucket plutono-downloads-test v7.3.0-test + - $$fname = ((Get-Childitem plutono*.msi -name) -split "`n")[0] + - gsutil cp $$fname gs://plutono-downloads-test/oss/release/ + - gsutil cp "$$fname.sha256" gs://plutono-downloads-test/oss/release/ environment: GCP_KEY: from_secret: gcp_key @@ -2026,25 +2026,25 @@ steps: - echo $DRONE_RUNNER_NAME - name: clone - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/grabpl + - curl -fL -o bin/grabpl https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/grabpl - chmod +x bin/grabpl - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - - cd grafana-enterprise + - cd plutono-enterprise - git checkout main environment: GITHUB_TOKEN: from_secret: github_token - name: initialize - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv bin/grabpl /tmp/ - rmdir bin - - mv grafana-enterprise /tmp/ - - /tmp/grabpl init-enterprise /tmp/grafana-enterprise + - mv plutono-enterprise /tmp/ + - /tmp/grabpl init-enterprise /tmp/plutono-enterprise - mkdir bin - mv /tmp/grabpl bin/ - ./bin/grabpl verify-drone @@ -2061,7 +2061,7 @@ steps: - clone - name: lint-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl lint-backend --edition enterprise environment: @@ -2070,7 +2070,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -2078,21 +2078,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition enterprise @@ -2102,7 +2102,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn run ci:test-frontend environment: @@ -2111,7 +2111,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise v7.3.0-test environment: @@ -2123,7 +2123,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition enterprise --no-pull-enterprise v7.3.0-test depends_on: @@ -2131,18 +2131,18 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign --signing-admin environment: - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - initialize - lint-backend - name: lint-backend-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl lint-backend --edition enterprise2 environment: @@ -2151,7 +2151,7 @@ steps: - initialize - name: test-backend-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition enterprise2 @@ -2161,7 +2161,7 @@ steps: - lint-backend-enterprise2 - name: build-backend-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise v7.3.0-test environment: @@ -2173,7 +2173,7 @@ steps: - test-backend-enterprise2 - name: gen-version - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl gen-version v7.3.0-test depends_on: @@ -2189,7 +2189,7 @@ steps: - test-backend-enterprise2 - name: package - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test environment: @@ -2201,25 +2201,25 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 detach: true commands: - ./e2e/start-server environment: - PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz + PACKAGE_FILE: dist/plutono-enterprise-*linux-amd64.tar.gz PORT: 3001 - RUNDIR: e2e/tmp-grafana-enterprise + RUNDIR: e2e/tmp-plutono-enterprise depends_on: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 + image: plutono/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests --port 3001 --tries 3 @@ -2229,7 +2229,7 @@ steps: - end-to-end-tests-server - name: copy-packages-for-docker - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -2237,7 +2237,7 @@ steps: - package - name: build-docker-images - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: dry_run: true edition: enterprise @@ -2245,7 +2245,7 @@ steps: - copy-packages-for-docker - name: build-docker-images-ubuntu - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: dry_run: true edition: enterprise @@ -2254,25 +2254,25 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list - apt-get install -yq postgresql-client - ./bin/dockerize -wait tcp://postgres:5432 -timeout 120s - - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql + - psql -p 5432 -h postgres -U plutonotest -d plutonotest -f devenv/docker/blocks/postgres_tests/setup.sql - go clean -testcache - ./bin/grabpl integration-tests --database postgres environment: - GRAFANA_TEST_DB: postgres - PGPASSWORD: grafanatest + PLUTONO_TEST_DB: postgres + PGPASSWORD: plutonotest POSTGRES_HOST: postgres depends_on: - test-backend - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list @@ -2282,28 +2282,28 @@ steps: - go clean -testcache - ./bin/grabpl integration-tests --database mysql environment: - GRAFANA_TEST_DB: mysql + PLUTONO_TEST_DB: mysql MYSQL_HOST: mysql depends_on: - test-backend - test-frontend - name: upload-cdn-assets - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-cdn --edition enterprise --bucket "grafana-static-assets" + - ./bin/grabpl upload-cdn --edition enterprise --bucket "plutono-static-assets" environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package - name: upload-packages - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads-test + - ./bin/grabpl upload-packages --edition enterprise --packages-bucket plutono-downloads-test environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package @@ -2312,7 +2312,7 @@ steps: - postgres-integration-tests - name: package-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl package --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test environment: @@ -2324,35 +2324,35 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - gen-version - name: upload-cdn-assets-enterprise2 - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets" + - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "plutono-static-assets" environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package-enterprise2 - name: end-to-end-tests-server-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 detach: true commands: - ./e2e/start-server environment: - PACKAGE_FILE: dist/grafana-enterprise2-*linux-amd64.tar.gz + PACKAGE_FILE: dist/plutono-enterprise2-*linux-amd64.tar.gz PORT: 3002 - RUNDIR: e2e/tmp-grafana-enterprise2 + RUNDIR: e2e/tmp-plutono-enterprise2 depends_on: - package-enterprise2 - name: end-to-end-tests-enterprise2 - image: grafana/ci-e2e:12.19.0-1 + image: plutono/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests --port 3002 --tries 3 @@ -2362,11 +2362,11 @@ steps: - end-to-end-tests-server-enterprise2 - name: upload-packages-enterprise2 - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-test + - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket plutono-downloads-test environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package-enterprise2 @@ -2378,17 +2378,17 @@ services: - name: postgres image: postgres:12.3-alpine environment: - POSTGRES_DB: grafanatest - POSTGRES_PASSWORD: grafanatest - POSTGRES_USER: grafanatest + POSTGRES_DB: plutonotest + POSTGRES_PASSWORD: plutonotest + POSTGRES_USER: plutonotest - name: mysql image: mysql:5.6.48 environment: - MYSQL_DATABASE: grafana_tests + MYSQL_DATABASE: plutono_tests MYSQL_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass - MYSQL_USER: grafana + MYSQL_USER: plutono node: type: no-parallel @@ -2417,31 +2417,31 @@ steps: - echo $env:DRONE_RUNNER_NAME - name: clone - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - - cd grafana-enterprise + - cd plutono-enterprise - git checkout main environment: GITHUB_TOKEN: from_secret: github_token - name: initialize - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - - cp -r grafana-enterprise C:\App\grafana-enterprise - - rm -r -force grafana-enterprise + - cp -r plutono-enterprise C:\App\plutono-enterprise + - rm -r -force plutono-enterprise - cp grabpl.exe C:\App\grabpl.exe - rm -force grabpl.exe - - C:\App\grabpl.exe init-enterprise C:\App\grafana-enterprise + - C:\App\grabpl.exe init-enterprise C:\App\plutono-enterprise - cp C:\App\grabpl.exe grabpl.exe depends_on: - clone - name: build-windows-installer - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$gcpKey = $$env:GCP_KEY - "[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json" @@ -2449,10 +2449,10 @@ steps: - gcloud auth activate-service-account --key-file=gcpkey.json - rm gcpkey.json - cp C:\App\nssm-2.24.zip . - - .\grabpl.exe windows-installer --edition enterprise --packages-bucket grafana-downloads-test v7.3.0-test - - $$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0] - - gsutil cp $$fname gs://grafana-downloads-test/enterprise/release/ - - gsutil cp "$$fname.sha256" gs://grafana-downloads-test/enterprise/release/ + - .\grabpl.exe windows-installer --edition enterprise --packages-bucket plutono-downloads-test v7.3.0-test + - $$fname = ((Get-Childitem plutono*.msi -name) -split "`n")[0] + - gsutil cp $$fname gs://plutono-downloads-test/enterprise/release/ + - gsutil cp "$$fname.sha256" gs://plutono-downloads-test/enterprise/release/ environment: GCP_KEY: from_secret: gcp_key @@ -2482,10 +2482,10 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/grabpl + - curl -fL -o bin/grabpl https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - ./bin/grabpl verify-version v7.3.0-test @@ -2493,10 +2493,10 @@ steps: DOCKERIZE_VERSION: 0.6.1 - name: publish-packages-oss - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json - - ./bin/grabpl publish-packages --edition oss --gcp-key /tmp/gcpkey.json --deb-db-bucket grafana-testing-aptly-db --deb-repo-bucket grafana-testing-repo --packages-bucket grafana-downloads-test --rpm-repo-bucket grafana-testing-repo --simulate-release v7.3.0-test + - ./bin/grabpl publish-packages --edition oss --gcp-key /tmp/gcpkey.json --deb-db-bucket plutono-testing-aptly-db --deb-repo-bucket plutono-testing-repo --packages-bucket plutono-downloads-test --rpm-repo-bucket plutono-testing-repo --simulate-release v7.3.0-test environment: GCP_KEY: from_secret: gcp_key @@ -2506,16 +2506,16 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_COM_API_KEY: - from_secret: grafana_api_key + PLUTONO_COM_API_KEY: + from_secret: plutono_api_key depends_on: - initialize - name: publish-packages-enterprise - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json - - ./bin/grabpl publish-packages --edition enterprise --gcp-key /tmp/gcpkey.json --deb-db-bucket grafana-testing-aptly-db --deb-repo-bucket grafana-testing-repo --packages-bucket grafana-downloads-test --rpm-repo-bucket grafana-testing-repo --simulate-release v7.3.0-test + - ./bin/grabpl publish-packages --edition enterprise --gcp-key /tmp/gcpkey.json --deb-db-bucket plutono-testing-aptly-db --deb-repo-bucket plutono-testing-repo --packages-bucket plutono-downloads-test --rpm-repo-bucket plutono-testing-repo --simulate-release v7.3.0-test environment: GCP_KEY: from_secret: gcp_key @@ -2525,8 +2525,8 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_COM_API_KEY: - from_secret: grafana_api_key + PLUTONO_COM_API_KEY: + from_secret: plutono_api_key depends_on: - initialize @@ -2556,7 +2556,7 @@ steps: - name: slack image: plugins/slack settings: - channel: grafana-ci-notifications + channel: plutono-ci-notifications template: "Build {{build.number}} failed for commit: : {{build.link}}\nAuthor: {{build.author}}" webhook: from_secret: slack_webhook @@ -2590,10 +2590,10 @@ steps: - echo $DRONE_RUNNER_NAME - name: initialize - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/grabpl + - curl -fL -o bin/grabpl https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/grabpl - chmod +x bin/grabpl - ./bin/grabpl verify-drone - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz @@ -2606,7 +2606,7 @@ steps: DOCKERIZE_VERSION: 0.6.1 - name: lint-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl lint-backend --edition oss environment: @@ -2615,7 +2615,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -2623,21 +2623,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition oss @@ -2647,7 +2647,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn run ci:test-frontend environment: @@ -2656,7 +2656,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -2665,7 +2665,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -2673,18 +2673,18 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin environment: - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - initialize - lint-backend - name: gen-version - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: @@ -2698,7 +2698,7 @@ steps: - check-dashboard-schemas - name: package - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --sign environment: @@ -2710,13 +2710,13 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 detach: true commands: - ./e2e/start-server @@ -2726,7 +2726,7 @@ steps: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 + image: plutono/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests --port 3001 --tries 3 @@ -2736,7 +2736,7 @@ steps: - end-to-end-tests-server - name: build-storybook - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn storybook:build - ./bin/grabpl verify-storybook @@ -2746,7 +2746,7 @@ steps: - package - name: copy-packages-for-docker - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -2754,7 +2754,7 @@ steps: - package - name: build-docker-images - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: dry_run: true edition: oss @@ -2762,7 +2762,7 @@ steps: - copy-packages-for-docker - name: build-docker-images-ubuntu - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: dry_run: true edition: oss @@ -2771,25 +2771,25 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list - apt-get install -yq postgresql-client - ./bin/dockerize -wait tcp://postgres:5432 -timeout 120s - - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql + - psql -p 5432 -h postgres -U plutonotest -d plutonotest -f devenv/docker/blocks/postgres_tests/setup.sql - go clean -testcache - ./bin/grabpl integration-tests --database postgres environment: - GRAFANA_TEST_DB: postgres - PGPASSWORD: grafanatest + PLUTONO_TEST_DB: postgres + PGPASSWORD: plutonotest POSTGRES_HOST: postgres depends_on: - test-backend - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list @@ -2799,28 +2799,28 @@ steps: - go clean -testcache - ./bin/grabpl integration-tests --database mysql environment: - GRAFANA_TEST_DB: mysql + PLUTONO_TEST_DB: mysql MYSQL_HOST: mysql depends_on: - test-backend - test-frontend - name: upload-cdn-assets - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets" + - ./bin/grabpl upload-cdn --edition oss --bucket "plutono-static-assets" environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package - name: upload-packages - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads + - ./bin/grabpl upload-packages --edition oss --packages-bucket plutono-downloads environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package @@ -2832,17 +2832,17 @@ services: - name: postgres image: postgres:12.3-alpine environment: - POSTGRES_DB: grafanatest - POSTGRES_PASSWORD: grafanatest - POSTGRES_USER: grafanatest + POSTGRES_DB: plutonotest + POSTGRES_PASSWORD: plutonotest + POSTGRES_USER: plutonotest - name: mysql image: mysql:5.6.48 environment: - MYSQL_DATABASE: grafana_tests + MYSQL_DATABASE: plutono_tests MYSQL_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass - MYSQL_USER: grafana + MYSQL_USER: plutono node: type: no-parallel @@ -2868,13 +2868,13 @@ steps: - echo $env:DRONE_RUNNER_NAME - name: initialize - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe - name: build-windows-installer - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$gcpKey = $$env:GCP_KEY - "[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json" @@ -2914,25 +2914,25 @@ steps: - echo $DRONE_RUNNER_NAME - name: clone - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/grabpl + - curl -fL -o bin/grabpl https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/grabpl - chmod +x bin/grabpl - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - - cd grafana-enterprise + - cd plutono-enterprise - git checkout ${DRONE_BRANCH} environment: GITHUB_TOKEN: from_secret: github_token - name: initialize - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv bin/grabpl /tmp/ - rmdir bin - - mv grafana-enterprise /tmp/ - - /tmp/grabpl init-enterprise /tmp/grafana-enterprise + - mv plutono-enterprise /tmp/ + - /tmp/grabpl init-enterprise /tmp/plutono-enterprise - mkdir bin - mv /tmp/grabpl bin/ - ./bin/grabpl verify-drone @@ -2948,7 +2948,7 @@ steps: - clone - name: lint-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl lint-backend --edition enterprise environment: @@ -2957,7 +2957,7 @@ steps: - initialize - name: codespell - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt" - codespell -I words_to_ignore.txt docs/ @@ -2965,21 +2965,21 @@ steps: - initialize - name: shellcheck - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl shellcheck depends_on: - initialize - name: check-dashboard-schemas - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - cue export --out openapi -o - ./dashboard-schemas/... depends_on: - initialize - name: test-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition enterprise @@ -2989,7 +2989,7 @@ steps: - lint-backend - name: test-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn run ci:test-frontend environment: @@ -2998,7 +2998,7 @@ steps: - initialize - name: build-backend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -3007,7 +3007,7 @@ steps: - test-backend - name: build-frontend - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise depends_on: @@ -3015,18 +3015,18 @@ steps: - test-frontend - name: build-plugins - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign --signing-admin environment: - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - initialize - lint-backend - name: lint-backend-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl lint-backend --edition enterprise2 environment: @@ -3035,7 +3035,7 @@ steps: - initialize - name: test-backend-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1" - ./bin/grabpl test-backend --edition enterprise2 @@ -3045,7 +3045,7 @@ steps: - lint-backend-enterprise2 - name: build-backend-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} --variants linux-x64 --no-pull-enterprise depends_on: @@ -3054,7 +3054,7 @@ steps: - test-backend-enterprise2 - name: gen-version - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: @@ -3070,7 +3070,7 @@ steps: - test-backend-enterprise2 - name: package - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --sign environment: @@ -3082,25 +3082,25 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - gen-version - name: end-to-end-tests-server - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 detach: true commands: - ./e2e/start-server environment: - PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz + PACKAGE_FILE: dist/plutono-enterprise-*linux-amd64.tar.gz PORT: 3001 - RUNDIR: e2e/tmp-grafana-enterprise + RUNDIR: e2e/tmp-plutono-enterprise depends_on: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 + image: plutono/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests --port 3001 --tries 3 @@ -3110,7 +3110,7 @@ steps: - end-to-end-tests-server - name: build-storybook - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - yarn storybook:build - ./bin/grabpl verify-storybook @@ -3120,7 +3120,7 @@ steps: - package - name: copy-packages-for-docker - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ @@ -3128,7 +3128,7 @@ steps: - package - name: build-docker-images - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: dry_run: true edition: enterprise @@ -3136,7 +3136,7 @@ steps: - copy-packages-for-docker - name: build-docker-images-ubuntu - image: grafana/drone-grafana-docker:0.3.2 + image: plutono/drone-plutono-docker:0.3.2 settings: dry_run: true edition: enterprise @@ -3145,25 +3145,25 @@ steps: - copy-packages-for-docker - name: postgres-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list - apt-get install -yq postgresql-client - ./bin/dockerize -wait tcp://postgres:5432 -timeout 120s - - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql + - psql -p 5432 -h postgres -U plutonotest -d plutonotest -f devenv/docker/blocks/postgres_tests/setup.sql - go clean -testcache - ./bin/grabpl integration-tests --database postgres environment: - GRAFANA_TEST_DB: postgres - PGPASSWORD: grafanatest + PLUTONO_TEST_DB: postgres + PGPASSWORD: plutonotest POSTGRES_HOST: postgres depends_on: - test-backend - test-frontend - name: mysql-integration-tests - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - mv /etc/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/nodesource.list.disabled; apt-get update; apt-get -y upgrade; apt-get install -y ca-certificates libgnutls30 - mv /etc/apt/sources.list.d/nodesource.list.disabled /etc/apt/sources.list.d/nodesource.list @@ -3173,28 +3173,28 @@ steps: - go clean -testcache - ./bin/grabpl integration-tests --database mysql environment: - GRAFANA_TEST_DB: mysql + PLUTONO_TEST_DB: mysql MYSQL_HOST: mysql depends_on: - test-backend - test-frontend - name: upload-cdn-assets - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-cdn --edition enterprise --bucket "grafana-static-assets" + - ./bin/grabpl upload-cdn --edition enterprise --bucket "plutono-static-assets" environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package - name: upload-packages - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads + - ./bin/grabpl upload-packages --edition enterprise --packages-bucket plutono-downloads environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package @@ -3203,7 +3203,7 @@ steps: - postgres-integration-tests - name: package-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 commands: - ./bin/grabpl package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --variants linux-x64 --sign environment: @@ -3215,35 +3215,35 @@ steps: from_secret: gpg_priv_key GPG_PUB_KEY: from_secret: gpg_pub_key - GRAFANA_API_KEY: - from_secret: grafana_api_key + PLUTONO_API_KEY: + from_secret: plutono_api_key depends_on: - gen-version - name: upload-cdn-assets-enterprise2 - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets" + - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "plutono-static-assets" environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package-enterprise2 - name: end-to-end-tests-server-enterprise2 - image: grafana/build-container:1.4.1 + image: plutono/build-container:1.4.1 detach: true commands: - ./e2e/start-server environment: - PACKAGE_FILE: dist/grafana-enterprise2-*linux-amd64.tar.gz + PACKAGE_FILE: dist/plutono-enterprise2-*linux-amd64.tar.gz PORT: 3002 - RUNDIR: e2e/tmp-grafana-enterprise2 + RUNDIR: e2e/tmp-plutono-enterprise2 depends_on: - package-enterprise2 - name: end-to-end-tests-enterprise2 - image: grafana/ci-e2e:12.19.0-1 + image: plutono/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests --port 3002 --tries 3 @@ -3253,11 +3253,11 @@ steps: - end-to-end-tests-server-enterprise2 - name: upload-packages-enterprise2 - image: grafana/grafana-ci-deploy:1.3.1 + image: plutono/plutono-ci-deploy:1.3.1 commands: - - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-enterprise2 + - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket plutono-downloads-enterprise2 environment: - GCP_GRAFANA_UPLOAD_KEY: + GCP_PLUTONO_UPLOAD_KEY: from_secret: gcp_key depends_on: - package-enterprise2 @@ -3269,17 +3269,17 @@ services: - name: postgres image: postgres:12.3-alpine environment: - POSTGRES_DB: grafanatest - POSTGRES_PASSWORD: grafanatest - POSTGRES_USER: grafanatest + POSTGRES_DB: plutonotest + POSTGRES_PASSWORD: plutonotest + POSTGRES_USER: plutonotest - name: mysql image: mysql:5.6.48 environment: - MYSQL_DATABASE: grafana_tests + MYSQL_DATABASE: plutono_tests MYSQL_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass - MYSQL_USER: grafana + MYSQL_USER: plutono node: type: no-parallel @@ -3308,31 +3308,31 @@ steps: - echo $env:DRONE_RUNNER_NAME - name: clone - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.60/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - - cd grafana-enterprise + - cd plutono-enterprise - git checkout $$env:DRONE_BRANCH environment: GITHUB_TOKEN: from_secret: github_token - name: initialize - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - - cp -r grafana-enterprise C:\App\grafana-enterprise - - rm -r -force grafana-enterprise + - cp -r plutono-enterprise C:\App\plutono-enterprise + - rm -r -force plutono-enterprise - cp grabpl.exe C:\App\grabpl.exe - rm -force grabpl.exe - - C:\App\grabpl.exe init-enterprise C:\App\grafana-enterprise + - C:\App\grabpl.exe init-enterprise C:\App\plutono-enterprise - cp C:\App\grabpl.exe grabpl.exe depends_on: - clone - name: build-windows-installer - image: grafana/ci-wix:0.1.1 + image: plutono/ci-wix:0.1.1 commands: - $$gcpKey = $$env:GCP_KEY - "[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json" @@ -3366,7 +3366,7 @@ steps: - name: slack image: plugins/slack settings: - channel: grafana-ci-notifications + channel: plutono-ci-notifications template: "Build {{build.number}} failed for commit: : {{build.link}}\nAuthor: {{build.author}}" webhook: from_secret: slack_webhook diff --git a/.eslintrc b/.eslintrc index 01ec2d6a0d..c20aa58f79 100644 --- a/.eslintrc +++ b/.eslintrc @@ -11,7 +11,7 @@ "overrides": [ { "files": [ - "packages/grafana-ui/src/components/uPlot/**/*.{ts,tsx}", + "packages/plutono-ui/src/components/uPlot/**/*.{ts,tsx}", "public/app/**/*.{ts,tsx}" ], "rules": { diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ae2fcfca86..cba8045e77 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -15,7 +15,7 @@ /docs/ @grafana/docs-squad /contribute/ @marcusolsson @grafana/docs-squad /docs/sources/developers/plugins/ @marcusolsson -/docs/sources/enterprise/ @osg-grafana +/docs/sources/enterprise/ @osg-plutono # Backend code *.go @grafana/backend-platform @@ -28,30 +28,30 @@ go.sum @grafana/backend-platform /pkg/tsdb/cloudmonitoring @grafana/cloud-datasources # Database migrations -/pkg/services/sqlstore/migrations @grafana/backend-platform @grafana/hosted-grafana-team -*_mig.go @grafana/backend-platform @grafana/hosted-grafana-team +/pkg/services/sqlstore/migrations @grafana/backend-platform @grafana/hosted-plutono-team +*_mig.go @grafana/backend-platform @grafana/hosted-plutono-team # Backend code docs /contribute/style-guides/backend.md @grafana/backend-platform -/e2e @grafana/grafana-frontend-platform -/packages @grafana/grafana-frontend-platform -/plugins-bundled @grafana/grafana-frontend-platform -/public @grafana/grafana-frontend-platform -/scripts/build/release-packages.sh @grafana/grafana-frontend-platform -/scripts/circle-release-next-packages.sh @grafana/grafana-frontend-platform -/scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform -/scripts/grunt @grafana/grafana-frontend-platform -/scripts/webpack @grafana/grafana-frontend-platform -package.json @grafana/grafana-frontend-platform -tsconfig.json @grafana/grafana-frontend-platform -lerna.json @grafana/grafana-frontend-platform -.babelrc @grafana/grafana-frontend-platform -.prettierrc.js @grafana/grafana-frontend-platform -.eslintrc @grafana/grafana-frontend-platform +/e2e @grafana/plutono-frontend-platform +/packages @grafana/plutono-frontend-platform +/plugins-bundled @grafana/plutono-frontend-platform +/public @grafana/plutono-frontend-platform +/scripts/build/release-packages.sh @grafana/plutono-frontend-platform +/scripts/circle-release-next-packages.sh @grafana/plutono-frontend-platform +/scripts/ci-frontend-metrics.sh @grafana/plutono-frontend-platform +/scripts/grunt @grafana/plutono-frontend-platform +/scripts/webpack @grafana/plutono-frontend-platform +package.json @grafana/plutono-frontend-platform +tsconfig.json @grafana/plutono-frontend-platform +lerna.json @grafana/plutono-frontend-platform +.babelrc @grafana/plutono-frontend-platform +.prettierrc.js @grafana/plutono-frontend-platform +.eslintrc @grafana/plutono-frontend-platform -# @grafana/ui component documentation -*.mdx @marcusolsson @jessover9000 @grafana/grafana-frontend-platform +# @credativ/plutono-ui component documentation +*.mdx @marcusolsson @jessover9000 @grafana/plutono-frontend-platform /public/app/features/explore/ @grafana/observability-squad /packages/jaeger-ui-components/ @grafana/observability-squad @@ -59,7 +59,7 @@ lerna.json @grafana/grafana-frontend-platform # Core datasources /public/app/plugins/datasource/cloudwatch @grafana/cloud-datasources @grafana/observability-squad /public/app/plugins/datasource/elasticsearch @grafana/observability-squad -/public/app/plugins/datasource/grafana-azure-monitor-datasource @grafana/cloud-datasources +/public/app/plugins/datasource/plutono-azure-monitor-datasource @grafana/cloud-datasources /public/app/plugins/datasource/graphite @grafana/observability-squad /public/app/plugins/datasource/influxdb @grafana/observability-squad /public/app/plugins/datasource/jaeger @grafana/observability-squad @@ -73,4 +73,4 @@ lerna.json @grafana/grafana-frontend-platform /public/app/plugins/datasource/zipkin @grafana/observability-squad # Cloud middleware -/grafana-mixin/ @grafana/cloud-middleware +/plutono-mixin/ @grafana/cloud-middleware diff --git a/.github/ISSUE_TEMPLATE/1-bug_report.md b/.github/ISSUE_TEMPLATE/1-bug_report.md index 9bec0f924e..e4e886c9cb 100644 --- a/.github/ISSUE_TEMPLATE/1-bug_report.md +++ b/.github/ISSUE_TEMPLATE/1-bug_report.md @@ -1,6 +1,6 @@ --- name: Bug report -about: Report a bug you found when using Grafana +about: Report a bug you found when using Plutono labels: 'type: bug' --- @@ -23,9 +23,9 @@ PROTIP: record your screen and attach it as a gif to showcase the issue. **Anything else we need to know?**: **Environment**: -- Grafana version: +- Plutono version: - Data source type & version: -- OS Grafana is installed on: +- OS Plutono is installed on: - User OS & Browser: -- Grafana plugins: +- Plutono plugins: - Others: diff --git a/.github/ISSUE_TEMPLATE/2-feature_request.md b/.github/ISSUE_TEMPLATE/2-feature_request.md index ccb9f3cc39..02a48e270d 100644 --- a/.github/ISSUE_TEMPLATE/2-feature_request.md +++ b/.github/ISSUE_TEMPLATE/2-feature_request.md @@ -1,6 +1,6 @@ --- name: Enhancement request -about: Suggest an enhancement or new feature for the Grafana project +about: Suggest an enhancement or new feature for the Plutono project labels: 'type: feature request' --- diff --git a/.github/ISSUE_TEMPLATE/3-accessibility.md b/.github/ISSUE_TEMPLATE/3-accessibility.md index 51b3ecc255..56b9558ade 100644 --- a/.github/ISSUE_TEMPLATE/3-accessibility.md +++ b/.github/ISSUE_TEMPLATE/3-accessibility.md @@ -1,13 +1,13 @@ --- name: Accessibility issue -about: Help make Grafana be better at keyboard navigation, screen-readable and accessible to all. +about: Help make Plutono be better at keyboard navigation, screen-readable and accessible to all. labels: 'type: accessibility' --- @@ -20,7 +20,7 @@ to really improve accessibility and would like your help to know where to start. **Relevant WCAG Criteria:** [#.#.# WCAG Criterion](link to https://www.w3.org/WAI/WCAG21/quickref/?versions=2.0) **Environment**: -- Grafana version: +- Plutono version: - Data source type & version: - User OS & Browser: - Others: diff --git a/.github/ISSUE_TEMPLATE/4-grafana_ui_component.md b/.github/ISSUE_TEMPLATE/4-plutono_ui_component.md similarity index 72% rename from .github/ISSUE_TEMPLATE/4-grafana_ui_component.md rename to .github/ISSUE_TEMPLATE/4-plutono_ui_component.md index 3920ed7a79..a252a91a39 100644 --- a/.github/ISSUE_TEMPLATE/4-grafana_ui_component.md +++ b/.github/ISSUE_TEMPLATE/4-plutono_ui_component.md @@ -1,11 +1,11 @@ --- -name: '@grafana/ui component request' -about: Suggest a component for the @grafana/ui package -labels: 'area/grafana/ui' +name: '@credativ/plutono-ui component request' +about: Suggest a component for the @credativ/plutono-ui package +labels: 'area/plutono/ui' --- @@ -13,7 +13,7 @@ Thank you! **Why is this component needed**: ___ - - [ ] Is/could it be used in more than one place in Grafana? + - [ ] Is/could it be used in more than one place in Plutono? **Where is/could it be used?**: @@ -25,9 +25,9 @@ ___ **Implementation** (Checklist meant for the person implementing the component) - [ ] Component has a story in Storybook. -- [ ] Props and naming follows [our style guide](https://github.com/grafana/grafana/blob/master/contribute/style-guides/frontend.md). +- [ ] Props and naming follows [our style guide](https://github.com/credativ/plutono/blob/master/contribute/style-guides/frontend.md). - [ ] It is extendable (rest props are spread, styles with className work, and so on). -- [ ] Uses [theme for spacing, colors, and so on](https://github.com/grafana/grafana/blob/master/contribute/style-guides/themes.md). +- [ ] Uses [theme for spacing, colors, and so on](https://github.com/credativ/plutono/blob/master/contribute/style-guides/themes.md). - [ ] Works with both light and dark theme. **Documentation** diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ecbcbdbada..e027f1d447 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ Thank you for sending a pull request! Here are some tips: -1. If this is your first time, please read our contribution guide at https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md +1. If this is your first time, please read our contribution guide at https://github.com/credativ/plutono/blob/master/CONTRIBUTING.md 2. Ensure you include and run the appropriate tests as part of your Pull Request. diff --git a/.github/bot.md b/.github/bot.md index 7804f3b34c..8860d22ae7 100644 --- a/.github/bot.md +++ b/.github/bot.md @@ -1,6 +1,6 @@ -# GitHub & grafanabot automation +# GitHub & plutonobot automation -The bot is configured via [commands.json](https://github.com/grafana/grafana/blob/master/.github/commands.json) and some other GitHub workflows [workflows](https://github.com/grafana/grafana/tree/master/.github/workflows). +The bot is configured via [commands.json](https://github.com/credativ/plutono/blob/master/.github/commands.json) and some other GitHub workflows [workflows](https://github.com/credativ/plutono/tree/master/.github/workflows). Comment commands: @@ -17,12 +17,12 @@ Label commands: ## Metrics -Metrics are configured in [metrics-collector.json](https://github.com/grafana/grafana/blob/master/.github/metrics-collector.json) and are also defined in the +Metrics are configured in [metrics-collector.json](https://github.com/credativ/plutono/blob/master/.github/metrics-collector.json) and are also defined in the [metrics-collector](https://github.com/grafana/grafana-github-actions/blob/main/metrics-collector/index.ts) GitHub action. ## Backport PR -To automatically backport a PR to a release branch like v7.3.x add a label named `backport v7.3.x`. The label name should follow the pattern `backport `. Once merged grafanabot will automatically +To automatically backport a PR to a release branch like v7.3.x add a label named `backport v7.3.x`. The label name should follow the pattern `backport `. Once merged plutonobot will automatically try to cherry-pick the PR merge commit into that branch and open a PR. It will sync the milestone with the source PR so make sure the source PR also is assigned the milestone for the patch release. If the PR is already merged you can still add this label and trigger the backport automation. If there are merge conflicts the bot will write a comment on the source PR saying the cherry-pick failed. In this case you have to do the cherry pick and backport PR manually. diff --git a/.github/commands.json b/.github/commands.json index f07072c502..493ac48a12 100644 --- a/.github/commands.json +++ b/.github/commands.json @@ -5,7 +5,7 @@ "addLabel": "type/question", "removeLabel": "bot/question", "action": "close", - "comment": "Please ask your question on [community.grafana.com/](https://community.grafana.com/). To avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guidelines.\n\nHappy graphing!" + "comment": "Please ask your question on [community.grafana.com/](https://community.grafana.com/). To avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/credativ/plutono/blob/master/CONTRIBUTING.md) guidelines.\n\nHappy graphing!" }, { "type": "comment", @@ -20,7 +20,7 @@ "addLabel": "type/duplicate", "removeLabel": "bot/duplicate", "action": "close", - "comment": "Thanks for creating this issue! It looks like this has already been reported by another user. We’ve closed this in favor of the existing one. Please consider adding any details you think is missing to that issue.\n\nTo avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guidelines.\n\nHappy graphing!" + "comment": "Thanks for creating this issue! It looks like this has already been reported by another user. We’ve closed this in favor of the existing one. Please consider adding any details you think is missing to that issue.\n\nTo avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/credativ/plutono/blob/master/CONTRIBUTING.md) guidelines.\n\nHappy graphing!" }, { "type": "comment", @@ -35,13 +35,13 @@ "action": "updateLabels", "addLabel": "needs more info", "removeLabel": "bot/needs more info", - "comment": "Thanks for creating this issue! We think it's missing some basic information. \r\n\r\nFollow the issue template and add additional information that will help us replicate the problem. \r\nFor data visualization issues: \r\n- Query results from the inspect drawer (data tab & query inspector)\r\n- Panel settings can be extracted in the panel inspect drawer JSON tab\r\n\r\nFor dashboard related issues: \r\n- Dashboard JSON can be found in the dashboard settings JSON model view\r\n\r\nFor authentication, provisioning and alerting issues, Grafana server logs are useful. \r\n\r\nHappy graphing!" + "comment": "Thanks for creating this issue! We think it's missing some basic information. \r\n\r\nFollow the issue template and add additional information that will help us replicate the problem. \r\nFor data visualization issues: \r\n- Query results from the inspect drawer (data tab & query inspector)\r\n- Panel settings can be extracted in the panel inspect drawer JSON tab\r\n\r\nFor dashboard related issues: \r\n- Dashboard JSON can be found in the dashboard settings JSON model view\r\n\r\nFor authentication, provisioning and alerting issues, Plutono server logs are useful. \r\n\r\nHappy graphing!" }, { "type": "label", "name": "bot/no new info", "action": "close", - "comment": "We've closed this issue since it needs more information and hasn't had any activity recently. We can re-open it after you you add more information. To avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guidelines.\n\nHappy graphing!" + "comment": "We've closed this issue since it needs more information and hasn't had any activity recently. We can re-open it after you you add more information. To avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/credativ/plutono/blob/master/CONTRIBUTING.md) guidelines.\n\nHappy graphing!" }, { "type": "label", diff --git a/.gitignore b/.gitignore index 222e3d8c26..dec4b34e40 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,7 @@ vendor/ /public/fonts/dejavu # Enterprise devenv -/devenv/docker/blocks/grafana-enterprise +/devenv/docker/blocks/plutono-enterprise /tmp tools/phantomjs/phantomjs @@ -65,13 +65,13 @@ conf/custom.ini /conf/ldap_dev.toml /conf/ldap_freeipa.toml profile.cov -/grafana +/plutono /local .notouch /Makefile.local -/pkg/cmd/grafana-cli/grafana-cli -/pkg/cmd/grafana-server/grafana-server -/pkg/cmd/grafana-server/debug +/pkg/cmd/plutono-cli/plutono-cli +/pkg/cmd/plutono-server/plutono-server +/pkg/cmd/plutono-server/debug /pkg/extensions/* !/pkg/extensions/main.go /public/app/extensions @@ -113,9 +113,9 @@ debug.test compilation-stats.json # e2e tests -/packages/grafana-e2e/cypress/screenshots -/packages/grafana-e2e/cypress/videos -/packages/grafana-e2e/cypress/logs +/packages/plutono-e2e/cypress/screenshots +/packages/plutono-e2e/cypress/videos +/packages/plutono-e2e/cypress/logs /e2e/server.log /e2e/**/screenshots !/e2e/**/screenshots/expected/* diff --git a/.prettierrc.js b/.prettierrc.js index c14684b083..9afb51bfdc 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,3 +1,3 @@ module.exports = { - ...require('@grafana/toolkit/src/config/prettier.plugin.config.json'), + ...require('@credativ/plutono-toolkit/src/config/prettier.plugin.config.json'), }; diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9d2182246f..0760872eeb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,19 +1,19 @@ -# Contributing to Grafana +# Contributing to Plutono -Thank you for your interest in contributing to Grafana! We welcome all people who want to contribute in a healthy and constructive manner within our community. To help us create a safe and positive community experience for all, we require all participants to adhere to the [Code of Conduct](CODE_OF_CONDUCT.md). +Thank you for your interest in contributing to Plutono! We welcome all people who want to contribute in a healthy and constructive manner within our community. To help us create a safe and positive community experience for all, we require all participants to adhere to the [Code of Conduct](CODE_OF_CONDUCT.md). -This document is a guide to help you through the process of contributing to Grafana. +This document is a guide to help you through the process of contributing to Plutono. ## Become a contributor -You can contribute to Grafana in several ways. Here are some examples: +You can contribute to Plutono in several ways. Here are some examples: -- Contribute to the Grafana codebase. +- Contribute to the Plutono codebase. - Report and triage bugs. - Develop community plugins and dashboards. - Write technical documentation and blog posts, for users and contributors. - Organize meetups and user groups in your local area. -- Help others by answering questions about Grafana. +- Help others by answering questions about Plutono. For more ways to contribute, check out the [Open Source Guides](https://opensource.guide/how-to-contribute/). @@ -32,7 +32,7 @@ For data visualization issues: For a dashboard related issues: - Dashboard JSON can be found in the dashboard settings JSON model view -For authentication and alerting Grafana server logs are useful. +For authentication and alerting Plutono server logs are useful. #### Security issues @@ -40,9 +40,9 @@ If you believe you've found a security vulnerability, please read our [security ### Suggest enhancements -If you have an idea of how to improve Grafana, submit an [enhancement request](https://github.com/grafana/grafana/issues/new?labels=type%3A+feature+request&template=2-feature_request.md). +If you have an idea of how to improve Plutono, submit an [enhancement request](https://github.com/grafana/grafana/issues/new?labels=type%3A+feature+request&template=2-feature_request.md). -We want to make Grafana accessible to even more people. Submit an [accessibility issue](https://github.com/grafana/grafana/issues/new?labels=type%3A+accessibility&template=3-accessibility.md) to help us understand what we can improve. +We want to make Plutono accessible to even more people. Submit an [accessibility issue](https://github.com/grafana/grafana/issues/new?labels=type%3A+accessibility&template=3-accessibility.md) to help us understand what we can improve. ### Triage issues @@ -54,11 +54,11 @@ Read more about the ways you can [Triage issues](/contribute/triage-issues.md). If you have a question and you can't find the answer in the [documentation](https://grafana.com/docs/), the next step is to ask it on the [community site](https://community.grafana.com/). -It's important to us to help these users, and we'd love your help. Sign up to our [community site](https://community.grafana.com/), and start helping other Grafana users by answering their questions. +It's important to us to help these users, and we'd love your help. Sign up to our [community site](https://community.grafana.com/), and start helping other Plutono users by answering their questions. ### Your first contribution -Unsure where to begin contributing to Grafana? Start by browsing issues labeled `beginner friendly` or `help wanted`. +Unsure where to begin contributing to Plutono? Start by browsing issues labeled `beginner friendly` or `help wanted`. - [Beginner-friendly](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) issues are generally straightforward to complete. - [Help wanted](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) issues are problems we would like the community to help us with regardless of complexity. @@ -75,5 +75,5 @@ Before we can accept your pull request, you need to [sign our CLA](https://grafa - Set up your [development environment](contribute/developer-guide.md). - Learn how to [contribute documentation](contribute/documentation.md). -- Get started [developing plugins](https://grafana.com/docs/grafana/latest/developers/plugins/) for Grafana. -- Look through the resources in the [contribute](https://github.com/grafana/grafana/tree/master/contribute) folder. +- Get started [developing plugins](https://grafana.com/docs/grafana/latest/developers/plugins/) for Plutono. +- Look through the resources in the [contribute](https://github.com/credativ/plutono/tree/master/contribute) folder. diff --git a/Dockerfile b/Dockerfile index 3305520082..239a61fb0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ FROM golang:1.16.1-alpine3.13 as go-builder RUN apk add --no-cache gcc g++ -WORKDIR $GOPATH/src/github.com/grafana/grafana +WORKDIR $GOPATH/src/github.com/credativ/plutono COPY go.mod go.sum build.go package.json ./ COPY pkg pkg @@ -33,18 +33,18 @@ RUN go run build.go build # Final stage FROM alpine:3.13 -LABEL maintainer="Grafana team " +LABEL maintainer="Plutono team " ARG GF_UID="472" ARG GF_GID="0" -ENV PATH="/usr/share/grafana/bin:$PATH" \ - GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \ - GF_PATHS_DATA="/var/lib/grafana" \ - GF_PATHS_HOME="/usr/share/grafana" \ - GF_PATHS_LOGS="/var/log/grafana" \ - GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \ - GF_PATHS_PROVISIONING="/etc/grafana/provisioning" +ENV PATH="/usr/share/plutono/bin:$PATH" \ + GF_PATHS_CONFIG="/etc/plutono/plutono.ini" \ + GF_PATHS_DATA="/var/lib/plutono" \ + GF_PATHS_HOME="/usr/share/plutono" \ + GF_PATHS_LOGS="/var/log/plutono" \ + GF_PATHS_PLUGINS="/var/lib/plutono/plugins" \ + GF_PATHS_PROVISIONING="/etc/plutono/provisioning" WORKDIR $GF_PATHS_HOME @@ -54,12 +54,12 @@ RUN apk add --no-cache ca-certificates bash tzdata && \ COPY conf ./conf RUN if [ ! $(getent group "$GF_GID") ]; then \ - addgroup -S -g $GF_GID grafana; \ + addgroup -S -g $GF_GID plutono; \ fi RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \ mkdir -p "$GF_PATHS_HOME/.aws" && \ - adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana && \ + adduser -S -u $GF_UID -G "$GF_GID_NAME" plutono && \ mkdir -p "$GF_PATHS_PROVISIONING/datasources" \ "$GF_PATHS_PROVISIONING/dashboards" \ "$GF_PATHS_PROVISIONING/notifiers" \ @@ -68,11 +68,11 @@ RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \ "$GF_PATHS_PLUGINS" \ "$GF_PATHS_DATA" && \ cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \ - cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \ - chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \ + cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/plutono/ldap.toml && \ + chown -R "plutono:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \ chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" -COPY --from=go-builder /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-server /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-cli ./bin/ +COPY --from=go-builder /go/src/github.com/credativ/plutono/bin/linux-amd64/plutono-server /go/src/github.com/credativ/plutono/bin/linux-amd64/plutono-cli ./bin/ COPY --from=js-builder /usr/src/app/public ./public COPY --from=js-builder /usr/src/app/tools ./tools @@ -80,5 +80,5 @@ EXPOSE 3000 COPY ./packaging/docker/run.sh /run.sh -USER grafana +USER plutono ENTRYPOINT [ "/run.sh" ] diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index f4775e07ab..b93fd1b0c2 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -19,7 +19,7 @@ RUN yarn build FROM golang:1.15.1 AS go-builder -WORKDIR /src/grafana +WORKDIR /src/plutono COPY go.mod go.sum ./ @@ -32,19 +32,19 @@ RUN go run build.go build FROM ubuntu:20.04 -LABEL maintainer="Grafana team " +LABEL maintainer="Plutono team " EXPOSE 3000 ARG GF_UID="472" ARG GF_GID="472" -ENV PATH="/usr/share/grafana/bin:$PATH" \ - GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \ - GF_PATHS_DATA="/var/lib/grafana" \ - GF_PATHS_HOME="/usr/share/grafana" \ - GF_PATHS_LOGS="/var/log/grafana" \ - GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \ - GF_PATHS_PROVISIONING="/etc/grafana/provisioning" +ENV PATH="/usr/share/plutono/bin:$PATH" \ + GF_PATHS_CONFIG="/etc/plutono/plutono.ini" \ + GF_PATHS_DATA="/var/lib/plutono" \ + GF_PATHS_HOME="/usr/share/plutono" \ + GF_PATHS_LOGS="/var/log/plutono" \ + GF_PATHS_PLUGINS="/var/lib/plutono/plugins" \ + GF_PATHS_PROVISIONING="/etc/plutono/provisioning" WORKDIR $GF_PATHS_HOME @@ -54,8 +54,8 @@ COPY conf conf RUN apt-get update && apt-get install -y ca-certificates curl RUN mkdir -p "$GF_PATHS_HOME/.aws" && \ - addgroup --system --gid $GF_GID grafana && \ - adduser --uid $GF_UID --system --ingroup grafana grafana && \ + addgroup --system --gid $GF_GID plutono && \ + adduser --uid $GF_UID --system --ingroup plutono plutono && \ mkdir -p "$GF_PATHS_PROVISIONING/datasources" \ "$GF_PATHS_PROVISIONING/dashboards" \ "$GF_PATHS_PROVISIONING/notifiers" \ @@ -64,15 +64,15 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \ "$GF_PATHS_PLUGINS" \ "$GF_PATHS_DATA" && \ cp conf/sample.ini "$GF_PATHS_CONFIG" && \ - cp conf/ldap.toml /etc/grafana/ldap.toml && \ - chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \ + cp conf/ldap.toml /etc/plutono/ldap.toml && \ + chown -R plutono:plutono "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \ chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" -COPY --from=go-builder /src/grafana/bin/linux-amd64/grafana-server /src/grafana/bin/linux-amd64/grafana-cli bin/ +COPY --from=go-builder /src/plutono/bin/linux-amd64/plutono-server /src/plutono/bin/linux-amd64/plutono-cli bin/ COPY --from=js-builder /usr/src/app/public public COPY --from=js-builder /usr/src/app/tools tools COPY packaging/docker/run.sh / -USER grafana +USER plutono ENTRYPOINT [ "/run.sh" ] diff --git a/GOVERNANCE.md b/GOVERNANCE.md index ea664618de..7a2f37bacf 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -1,22 +1,22 @@ # Governance -This document describes the rules and governance of the project. It is meant to be followed by all the developers of the project and the Grafana community. Common terminology used in this governance document are listed below: +This document describes the rules and governance of the project. It is meant to be followed by all the developers of the project and the Plutono community. Common terminology used in this governance document are listed below: -- **Team members**: Any members of the private [grafana-team][team] Google group. +- **Team members**: Any members of the private [plutono-team][team] Google group. - **Maintainers**: Maintainers lead an individual project or parts thereof ([`MAINTAINERS.md`][maintainers]). -- **Projects**: A single repository in the Grafana GitHub organization and listed below is referred to as a project: +- **Projects**: A single repository in the Plutono GitHub organization and listed below is referred to as a project: - clock-panel - devtools - gel-app - - grafana - - grafana-github-datasource - - grafana-image-renderer - - grafana-kiosk - - grafana-plugin-sdk-go - - grafana-polystat-panel + - plutono + - plutono-github-datasource + - plutono-image-renderer + - plutono-kiosk + - plutono-plugin-sdk-go + - plutono-polystat-panel - grafonnet-lib - kairosdb-datasource - piechart-panel @@ -31,11 +31,11 @@ This document describes the rules and governance of the project. It is meant to - tutorials - worldmap-panel -- **The Grafana project**: The sum of all activities performed under this governance, concerning one or more repositories or the community. +- **The Plutono project**: The sum of all activities performed under this governance, concerning one or more repositories or the community. ## Values -The Grafana developers and community are expected to follow the values defined in the Grafana Code of Conduct. Furthermore, the Grafana community strives for kindness, giving feedback effectively, and building a welcoming environment. The Grafana developers generally decide by consensus and only resort to conflict resolution by a majority vote if consensus cannot be reached. +The Plutono developers and community are expected to follow the values defined in the Plutono Code of Conduct. Furthermore, the Plutono community strives for kindness, giving feedback effectively, and building a welcoming environment. The Plutono developers generally decide by consensus and only resort to conflict resolution by a majority vote if consensus cannot be reached. ## Projects @@ -45,11 +45,11 @@ Each project must have a [`MAINTAINERS.md`][maintainers] file with at least one ### Team members -Team member status may be given to those who have made ongoing contributions to the Grafana project for at least 3 months. This is usually in the form of code improvements and/or notable work on documentation, but organizing events or user support could also be taken into account. +Team member status may be given to those who have made ongoing contributions to the Plutono project for at least 3 months. This is usually in the form of code improvements and/or notable work on documentation, but organizing events or user support could also be taken into account. -New members may be proposed by any existing member by email to [grafana-team][team]. It is highly desirable to reach consensus about acceptance of a new member. However, the proposal is ultimately voted on by a formal [supermajority vote](#supermajority-vote). +New members may be proposed by any existing member by email to [plutono-team][team]. It is highly desirable to reach consensus about acceptance of a new member. However, the proposal is ultimately voted on by a formal [supermajority vote](#supermajority-vote). -If the new member proposal is accepted, the proposed team member should be contacted privately via email to confirm or deny their acceptance of team membership. This email will also be CC'd to [grafana-team][team] for record-keeping purposes. +If the new member proposal is accepted, the proposed team member should be contacted privately via email to confirm or deny their acceptance of team membership. This email will also be CC'd to [plutono-team][team] for record-keeping purposes. If they choose to accept, the [onboarding](#onboarding) procedure is followed. @@ -117,7 +117,7 @@ A project may have multiple maintainers, as long as the responsibilities are cle ### Technical decisions -Technical decisions that only affect a single project are made informally by the maintainer of this project, and [rough consensus](#consensus) is assumed. Technical decisions that span multiple parts of the Grafana project should be discussed and made on the [Grafana developer mailing list][devs]. +Technical decisions that only affect a single project are made informally by the maintainer of this project, and [rough consensus](#consensus) is assumed. Technical decisions that span multiple parts of the Plutono project should be discussed and made on the [Plutono developer mailing list][devs]. Decisions are usually made by [rough consensus](#consensus). If no consensus can be reached, the matter may be resolved by [majority vote](#majority-vote). @@ -131,7 +131,7 @@ Any matter that needs a decision may be called to a vote by any member if they d ## Voting -The Grafana project usually runs by informal consensus, however sometimes a formal decision must be made. +The Plutono project usually runs by informal consensus, however sometimes a formal decision must be made. Depending on the subject matter, as laid out [above](#decision-making), different methods of voting are used. @@ -145,7 +145,7 @@ For public discussions, anyone interested is encouraged to participate. Formal p ### Consensus -The default decision making mechanism for the Grafana project is [rough][rough] consensus. This means that any decision on technical issues is considered supported by the [team][team] as long as nobody objects or the objection has been considered but not necessarily accommodated. +The default decision making mechanism for the Plutono project is [rough][rough] consensus. This means that any decision on technical issues is considered supported by the [team][team] as long as nobody objects or the objection has been considered but not necessarily accommodated. Silence on any consensus decision is implicit agreement and equivalent to explicit agreement. Explicit agreement may be stated at will. Decisions may, but do not need to be called out and put up for decision on the [developers mailing list][devs] at any time and by anyone. @@ -198,8 +198,8 @@ The ex-member is If needed, we reserve the right to publicly announce removal. -[coc]: https://github.com/grafana/grafana/blob/master/CODE_OF_CONDUCT.md -[devs]: https://groups.google.com/forum/#!forum/grafana-developers -[maintainers]: https://github.com/grafana/grafana/blob/master/MAINTAINERS.md +[coc]: https://github.com/credativ/plutono/blob/master/CODE_OF_CONDUCT.md +[devs]: https://groups.google.com/forum/#!forum/plutono-developers +[maintainers]: https://github.com/credativ/plutono/blob/master/MAINTAINERS.md [rough]: https://tools.ietf.org/html/rfc7282 -[team]: https://groups.google.com/forum/#!forum/grafana-team +[team]: https://groups.google.com/forum/#!forum/plutono-team diff --git a/ISSUE_TRIAGE.md b/ISSUE_TRIAGE.md index 806c97af7b..f423df0b9c 100644 --- a/ISSUE_TRIAGE.md +++ b/ISSUE_TRIAGE.md @@ -1,10 +1,10 @@ # Triage issues -The main goal of issue triage is to categorize all incoming Grafana issues and make sure each issue has all basic information needed for anyone else to understand and be able to start working on it. +The main goal of issue triage is to categorize all incoming Plutono issues and make sure each issue has all basic information needed for anyone else to understand and be able to start working on it. -> **Note:** This information is for Grafana project Maintainers, Owners, and Admins. If you are a Contributor, then you will not be able to perform most of the tasks in this topic. +> **Note:** This information is for Plutono project Maintainers, Owners, and Admins. If you are a Contributor, then you will not be able to perform most of the tasks in this topic. -The core maintainers of the Grafana project are responsible for categorizing all incoming issues and delegating any critical or important issue to other maintainers. Currently one maintainer each week is responsible. Besides that part, triage provides an important way to contribute to an open source project. +The core maintainers of the Plutono project are responsible for categorizing all incoming issues and delegating any critical or important issue to other maintainers. Currently one maintainer each week is responsible. Besides that part, triage provides an important way to contribute to an open source project. Triage helps ensure issues resolve quickly by: @@ -76,7 +76,7 @@ Instructions for setting up filters in Gmail can be found [here](#setting-up-gma ## 2. Ensure the issue contains basic information -Before triaging an issue very far, make sure that the issue's author provided the standard issue information. This will help you make an educated recommendation on how to categorize the issue. The Grafana project utilizes [GitHub issue templates](https://help.github.com/en/articles/creating-issue-templates-for-your-repository) to guide contributors to provide standard information that must be included for each type of template or type of issue. +Before triaging an issue very far, make sure that the issue's author provided the standard issue information. This will help you make an educated recommendation on how to categorize the issue. The Plutono project utilizes [GitHub issue templates](https://help.github.com/en/articles/creating-issue-templates-for-your-repository) to guide contributors to provide standard information that must be included for each type of template or type of issue. ### Standard issue information that must be included @@ -84,15 +84,15 @@ Given a certain [issue template]([template](https://github.com/grafana/grafana/i #### Bug reports -Should explain what happened, what was expected and how to reproduce it together with any additional information that may help giving a complete picture of what happened such as screenshots, [query inspector](https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630) output and any environment related information that's applicable and/or maybe related to the reported problem: -- Grafana version +Should explain what happened, what was expected and how to reproduce it together with any additional information that may help giving a complete picture of what happened such as screenshots, [query inspector](https://community.grafana.com/t/using-plutonos-query-inspector-to-troubleshoot-issues/2630) output and any environment related information that's applicable and/or maybe related to the reported problem: +- Plutono version - Data source type & version -- Platform & OS Grafana is installed on +- Platform & OS Plutono is installed on - User OS & Browser + versions - Using docker + what environment - Which plugins - Configuration database in use (sqlite, mysql, postgres) -- Reverse proxy in front of Grafana, what version and configuration +- Reverse proxy in front of Plutono, what version and configuration - Non-default configuration settings - Development environment like Go and Node versions, if applicable @@ -102,7 +102,7 @@ Should explain what enhancement or feature that the author wants to be added and #### Accessibility issues -This is a mix between a bug report and enhancement request but focused on accessibility issues to help make Grafana improve keyboard navigation, screen-reader support and being accessible to everyone. The report should include relevant WCAG criteria, if applicable. +This is a mix between a bug report and enhancement request but focused on accessibility issues to help make Plutono improve keyboard navigation, screen-reader support and being accessible to everyone. The report should include relevant WCAG criteria, if applicable. #### Support requests @@ -116,7 +116,7 @@ To make it easier for everyone to understand and find issues they're searching f - Make sure that issue descriptions doesn't include irrelevant information, information from template that haven't been filled out and/or sensitive information. - Do your best effort to change title and description or request suggested changes by adding a comment. -> **Note:** Above rules is applicable to both new and existing issues of the Grafana project. +> **Note:** Above rules is applicable to both new and existing issues of the Plutono project. ### Do you have all the information needed to categorize an issue? @@ -155,7 +155,7 @@ An issue can have multiple of the following labels. Typically, a properly catego Make sure it's not a duplicate by searching existing issues using related terms from the issue title and description. If you think you know there is an existing issue, but can't find it, please reach out to one of the maintainers and ask for help. If you identify that the issue is a duplicate of an existing issue: 1. Add a comment `/duplicate of #`. GitHub will recognize this and add some additional context to the issue activity. -2. The Grafana bot will do the rest, adding the correct label and closing comment +2. The Plutono bot will do the rest, adding the correct label and closing comment 3. Optionally add any related `area/*` or `datasource/*` labels. ### Bug reports @@ -184,10 +184,10 @@ If it's not perfectly clear that it's an actual bug, quickly try to reproduce it ### Documentation issue? -First, evaluate if the documentation makes sense to be included in the Grafana project: +First, evaluate if the documentation makes sense to be included in the Plutono project: - Is this something we want/can maintain as a project? -- Is this referring to usage of some specific integration/tool and in that case is that a popular use case in combination with Grafana? +- Is this referring to usage of some specific integration/tool and in that case is that a popular use case in combination with Plutono? - If unsure, kindly and politely add a comment explaining that we would need [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) to identify that lots of other users want/need this. Second, label the issue `type/docs` and at least one `area/*` or `datasource/*` label. @@ -225,7 +225,7 @@ In case there is an uncertainty around the prioritization of an issue, please as | Label | Description | | --------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | | `priority/critical` | Highest priority. Must be actively worked on as someone's top priority right now. | -| `priority/support-subscription` | This is important for one or several customers having a paid Grafana support subscription. | +| `priority/support-subscription` | This is important for one or several customers having a paid Plutono support subscription. | | `priority/important-soon` | Must be staffed and worked on either currently, or very soon, ideally in time for the next release. | | `priority/important-longterm` | Important over the long term, but may not be staffed and/or may need multiple releases to complete. | | `priority/nice-to-have` | It's a good idea, but not scheduled for any release. | @@ -293,7 +293,7 @@ In many cases the issue author or community as a whole is more suitable to contr When an issue has all basic information provided, but the triage responsible haven't been able to reproduce the reported problem at a first glance, the issue is labeled [Needs investigation](https://github.com/grafana/grafana/labels/needs%20investigation). Depending on the perceived severity and/or number of [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments), the investigation will either be delegated to another maintainer for further investigation or put on hold until someone else (maintainer or contributor) picks it up and eventually starts investigating it. -Investigating issues can be a very time consuming task, especially for the maintainers, given the huge number of combinations of plugins, data sources, platforms, databases, browsers, tools, hardware, integrations, versions and cloud services, etc that are being used with Grafana. There is a certain number of combinations that are more common than others, and these are in general easier for maintainers to investigate. +Investigating issues can be a very time consuming task, especially for the maintainers, given the huge number of combinations of plugins, data sources, platforms, databases, browsers, tools, hardware, integrations, versions and cloud services, etc that are being used with Plutono. There is a certain number of combinations that are more common than others, and these are in general easier for maintainers to investigate. For some other combinations it may not be possible at all for a maintainer to setup a proper test environment to investigate the issue. In these cases we really appreciate any help we can get from the community. Otherwise the issue is highly likely to be closed. @@ -301,12 +301,12 @@ Even if you don't have the time or knowledge to investigate an issue we highly r ## Automation -We have some automation that triggers on comments or labels being added to issues. Many of these automated behaviors are defined in [commands.json](https://github.com/grafana/grafana/blob/master/.github/commands.json). Or in other [GitHub Actions](https://github.com/grafana/grafana/tree/master/.github/workflows) +We have some automation that triggers on comments or labels being added to issues. Many of these automated behaviors are defined in [commands.json](https://github.com/credativ/plutono/blob/master/.github/commands.json). Or in other [GitHub Actions](https://github.com/credativ/plutono/tree/master/.github/workflows) -* Add /duplicate `#` to have Grafana label & close issue with an appropriate message. +* Add /duplicate `#` to have Plutono label & close issue with an appropriate message. * Add `bot/question` and the bot will close it with an appropriate message. -[Read more on bot actions](https://github.com/grafana/grafana/blob/master/.github/bot.md) +[Read more on bot actions](https://github.com/credativ/plutono/blob/master/.github/bot.md) ## External PRs @@ -340,9 +340,9 @@ This will give you a structure of labels in the sidebar similar to the following - assigned - mentions - GitHub (other) - - Grafana + - Plutono ``` - All notifications you’ll need to read/take action on show up as unread in GitHub (mine) and its sub-labels. - All other notifications you don’t need to take action on show up as unread in GitHub (other) and its sub-labels - - This is convenient for issue triage and to follow the activity in the Grafana project. + - This is convenient for issue triage and to follow the activity in the Plutono project. diff --git a/Makefile b/Makefile index f52362d777..d462430a60 100644 --- a/Makefile +++ b/Makefile @@ -32,11 +32,11 @@ build-go: ## Build all Go binaries. @echo "build go files" $(GO) run build.go build -build-server: ## Build Grafana server. +build-server: ## Build Plutono server. @echo "build server" $(GO) run build.go build-server -build-cli: ## Build Grafana CLI application. +build-cli: ## Build Plutono CLI application. @echo "build in CI environment" $(GO) run build.go build-cli @@ -109,12 +109,12 @@ build-docker-dev: ## Build Docker image for development (fast). @echo "build development container" @echo "\033[92mInfo:\033[0m the frontend code is expected to be built already." $(GO) run build.go -goos linux -pkg-arch amd64 ${OPT} build pkg-archive latest - cp dist/grafana-latest.linux-x64.tar.gz packaging/docker - cd packaging/docker && docker build --tag grafana/grafana:dev . + cp dist/plutono-latest.linux-x64.tar.gz packaging/docker + cd packaging/docker && docker build --tag plutono/plutono:dev . build-docker-full: ## Build Docker image for development. @echo "build docker container" - docker build --tag grafana/grafana:dev . + docker build --tag plutono/plutono:dev . ##@ Services @@ -143,7 +143,7 @@ devenv-down: ## Stop optional services. ##@ Helpers # We separate the protobuf generation because most development tasks on -# Grafana do not involve changing protobuf files and protoc is not a +# Plutono do not involve changing protobuf files and protoc is not a # go-gettable dependency and so getting it installed can be inconvenient. # # If you are working on changes to protobuf interfaces you may either use diff --git a/PLUGIN_DEV.md b/PLUGIN_DEV.md index 0663af7630..a711802007 100644 --- a/PLUGIN_DEV.md +++ b/PLUGIN_DEV.md @@ -1,32 +1,32 @@ # Plugin development This document is not meant as a complete guide for developing plugins but more as a changelog for changes in -Grafana that can impact plugin development. Whenever you as a plugin author encounter an issue with your plugin after -upgrading Grafana please check here before creating an issue. +Plutono that can impact plugin development. Whenever you as a plugin author encounter an issue with your plugin after +upgrading Plutono please check here before creating an issue. ## Plugin development resources -- [Grafana plugin developer guide](http://docs.grafana.org/plugins/developing/development/) -- [Webpack Grafana plugin template project](https://github.com/CorpGlory/grafana-plugin-template-webpack) +- [Plutono plugin developer guide](http://docs.plutono.org/plugins/developing/development/) +- [Webpack Plutono plugin template project](https://github.com/CorpGlory/plutono-plugin-template-webpack) - [Simple JSON datasource plugin](https://github.com/grafana/simple-json-datasource) -## Changes in Grafana v4.6 +## Changes in Plutono v4.6 -This version of Grafana has big changes that will impact a limited set of plugins. We moved from systemjs to webpack +This version of Plutono has big changes that will impact a limited set of plugins. We moved from systemjs to webpack for built-in plugins and everything internal. External plugins still use systemjs but now with a limited -set of Grafana components they can import. Plugins can depend on libs like lodash & moment and internal components -like before using the same import paths. However since everything in Grafana is no longer accessible, a few plugins could encounter issues when importing a Grafana dependency. +set of Plutono components they can import. Plugins can depend on libs like lodash & moment and internal components +like before using the same import paths. However since everything in Plutono is no longer accessible, a few plugins could encounter issues when importing a Plutono dependency. -[List of exposed components plugins can import/require](https://github.com/grafana/grafana/blob/master/public/app/features/plugins/plugin_loader.ts#L48) +[List of exposed components plugins can import/require](https://github.com/credativ/plutono/blob/master/public/app/features/plugins/plugin_loader.ts#L48) -If you think we missed exposing a crucial lib or Grafana component let us know by opening an issue. +If you think we missed exposing a crucial lib or Plutono component let us know by opening an issue. ### Deprecated components The angular directive `` is now deprecated (will still work for a version more) but we recommend plugin authors upgrade to new `` -## Changes in Grafana v6.0 +## Changes in Plutono v6.0 ### DashboardSrv.ts diff --git a/README.md b/README.md index aa7eb62c32..8294670e64 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,34 @@ # Plutono -Plutono is a fork of [Grafana](https://github.com/grafana/grafana/), the open-source platform for monitoring and observability. +Plutono is a fork of [Plutono](https://github.com/grafana/grafana/), the open-source platform for monitoring and observability. -[![License](https://img.shields.io/github/license/grafana/grafana)](LICENSE) -[![Circle CI](https://img.shields.io/circleci/build/gh/grafana/grafana)](https://circleci.com/gh/grafana/grafana) +[![License](https://img.shields.io/github/license/plutono/plutono)](LICENSE) +[![Circle CI](https://img.shields.io/circleci/build/gh/plutono/plutono)](https://circleci.com/gh/plutono/plutono) [![Go Report Card](https://goreportcard.com/badge/github.com/grafana/grafana)](https://goreportcard.com/report/github.com/grafana/grafana) -Grafana allows you to query, visualize, alert on and understand your metrics no matter where they are stored. Create, explore, and share dashboards with your team and foster a data driven culture: +Plutono allows you to query, visualize, alert on and understand your metrics no matter where they are stored. Create, explore, and share dashboards with your team and foster a data driven culture: - **Visualize:** Fast and flexible client side graphs with a multitude of options. Panel plugins offer many different ways to visualize metrics and logs. - **Dynamic Dashboards:** Create dynamic & reusable dashboards with template variables that appear as dropdowns at the top of the dashboard. - **Explore Metrics:** Explore your data through ad-hoc queries and dynamic drilldown. Split view and compare different time ranges, queries and data sources side by side. - **Explore Logs:** Experience the magic of switching from metrics to logs with preserved label filters. Quickly search through all your logs or streaming them live. -- **Alerting:** Visually define alert rules for your most important metrics. Grafana will continuously evaluate and send notifications to systems like Slack, PagerDuty, VictorOps, OpsGenie. +- **Alerting:** Visually define alert rules for your most important metrics. Plutono will continuously evaluate and send notifications to systems like Slack, PagerDuty, VictorOps, OpsGenie. - **Mixed Data Sources:** Mix different data sources in the same graph! You can specify a data source on a per-query basis. This works for even custom datasources. ## Get started -- [Get Grafana](https://grafana.com/get) -- [Installation guides](http://docs.grafana.org/installation/) +- [Get Plutono](https://grafana.com/get) +- [Installation guides](http://docs.plutono.org/installation/) -Unsure if Grafana is for you? Watch Grafana in action on [play.grafana.org](https://play.grafana.org/)! +Unsure if Plutono is for you? Watch Plutono in action on [play.plutono.org](https://play.plutono.org/)! ## Documentation -The Grafana documentation is available at [grafana.com/docs](https://grafana.com/docs/). +The Plutono documentation is available at [grafana.com/docs](https://grafana.com/docs/). ## Contributing -If you're interested in contributing to the Grafana project: +If you're interested in contributing to the Plutono project: - Start by reading the [Contributing guide](/CONTRIBUTING.md). - Learn how to set up your local environment, in our [Developer guide](/contribute/developer-guide.md). @@ -36,11 +36,11 @@ If you're interested in contributing to the Grafana project: ## Get involved -- Follow [@grafana on Twitter](https://twitter.com/grafana/). -- Read and subscribe to the [Grafana blog](https://grafana.com/blog/). +- Follow [@grafana on Twitter](https://twitter.com/plutono/). +- Read and subscribe to the [Plutono blog](https://grafana.com/blog/). - If you have a specific question, check out our [discussion forums](https://community.grafana.com/). - For general discussions, join us on the [official Slack](http://slack.raintank.io/) team. ## License -Grafana is distributed under the [Apache 2.0 License](https://github.com/grafana/grafana/blob/master/LICENSE). +Plutono is distributed under the [Apache 2.0 License](https://github.com/credativ/plutono/blob/master/LICENSE). diff --git a/SECURITY.md b/SECURITY.md index 355a58811d..65949fb8f6 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,6 +1,6 @@ # Reporting security issues -If you think you have found a security vulnerability, please send a report to [security@grafana.com](mailto:security@grafana.com). This address can be used for all of Grafana Labs's open source and commercial products (including but not limited to Grafana, Grafana Cloud, Grafana Enterprise, and grafana.com). We can accept only vulnerability reports at this address. +If you think you have found a security vulnerability, please send a report to [security@grafana.com](mailto:security@grafana.com). This address can be used for all of Grafana Labs's open source and commercial products (including but not limited to Plutono, Plutono Cloud, Plutono Enterprise, and grafana.com). We can accept only vulnerability reports at this address. Please encrypt your message to us; please use our PGP key. The key fingerprint is: diff --git a/SUPPORT.md b/SUPPORT.md index c9c94d96a4..a35fa1765f 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -1,10 +1,10 @@ -# Get Grafana help +# Get Plutono help ------------------ -First, check the official [Grafana documentation](https://grafana.com/docs/). +First, check the official [Plutono documentation](https://grafana.com/docs/). -If you require further help or support then ask a question in the [Grafana community site](https://community.grafana.com/) or [Grafana Slack](http://slack.raintank.io/). You can also search the community site for previously answered questions, in case someone already had your problem and got help. +If you require further help or support then ask a question in the [Plutono community site](https://community.grafana.com/) or [Plutono Slack](http://slack.raintank.io/). You can also search the community site for previously answered questions, in case someone already had your problem and got help. **Please note:** -- The Grafana project uses GitHub mainly for tracking bugs and feature requests. +- The Plutono project uses GitHub mainly for tracking bugs and feature requests. - Do not open an issue just to ask a question. The issue will be closed immediately. - Only submit issues for bug reports, feature requests, or enhancements. diff --git a/UPGRADING_DEPENDENCIES.md b/UPGRADING_DEPENDENCIES.md index 56fa37df78..46e617f9f7 100644 --- a/UPGRADING_DEPENDENCIES.md +++ b/UPGRADING_DEPENDENCIES.md @@ -5,22 +5,22 @@ Upgrading Go or Node.js requires making changes in many different files. See bel ## Go - CircleCi -- `grafana/build-container` +- `plutono/build-container` - Appveyor - Dockerfile ## Node.js - CircleCI -- `grafana/build-container` +- `plutono/build-container` - Appveyor - Dockerfile ## Go dependencies -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. +The Plutono 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. -> **Note:** Since most developers of Grafana still use the `GOPATH` we need to specify `GO111MODULE=on` to make `go mod` and `got get` work as intended. If you have setup Grafana outside of the `GOPATH` on your machine you can skip `GO111MODULE=on` when running the commands below. +> **Note:** Since most developers of Plutono still use the `GOPATH` we need to specify `GO111MODULE=on` to make `go mod` and `got get` work as intended. If you have setup Plutono outside of the `GOPATH` on your machine you can skip `GO111MODULE=on` when running the commands below. To add or update a new dependency, use the `go get` command: @@ -62,13 +62,13 @@ Our builds run on CircleCI through our build script. - nodejs - golang -- grafana/build-container (our custom docker build container) +- plutono/build-container (our custom docker build container) -### grafana/build-container +### plutono/build-container The main build step (in CircleCI) is built using a custom build container that comes pre-baked with some of the necessary dependencies. -Link: [grafana/build-container](https://github.com/grafana/grafana/tree/master/scripts/build/ci-build) +Link: [plutono/build-container](https://github.com/credativ/plutono/tree/master/scripts/build/ci-build) #### Dependencies @@ -92,7 +92,7 @@ Master and release builds trigger test runs on Appveyors build environment so th ### Dockerfile -There is a Docker build for Grafana in the root of the project that allows anyone to build Grafana just using Docker. +There is a Docker build for Plutono in the root of the project that allows anyone to build Plutono just using Docker. #### Files @@ -105,4 +105,4 @@ There is a Docker build for Grafana in the root of the project that allows anyon ### Local developer environments -Please send out a notice in the grafana-dev slack channel when updating Go or Node.js to make it easier for everyone to update their local developer environments. +Please send out a notice in the plutono-dev slack channel when updating Go or Node.js to make it easier for everyone to update their local developer environments. diff --git a/WORKFLOW.md b/WORKFLOW.md index 6a7b3ed725..883f619524 100644 --- a/WORKFLOW.md +++ b/WORKFLOW.md @@ -1,4 +1,4 @@ -# Grafana workflow +# Plutono workflow This document is based on [GOVERNANCE.md](GOVERNANCE.md). We assume good faith and intend to keep all processes as lightweight as possible but as specific as required. In case of disagreements about anything in this document, GOVERNANCE.md applies. @@ -40,7 +40,7 @@ Once a PR is approved as per above, any team member MAY merge the PR. ## Backporting a PR -PRs intended for inclusion in the next PATCH release they must be backported to the release branch. The bot can do this automatically. [Read more on backport PRs](https://github.com/grafana/grafana/blob/master/.github/bot.md). Both the source PR and the backport PR should be assigned to the patch release milestone, unless you are backporting to many releases then it can differ. +PRs intended for inclusion in the next PATCH release they must be backported to the release branch. The bot can do this automatically. [Read more on backport PRs](https://github.com/credativ/plutono/blob/master/.github/bot.md). Both the source PR and the backport PR should be assigned to the patch release milestone, unless you are backporting to many releases then it can differ. Backport PRs are also needed during the beta period to get fixes into the stable release. @@ -48,7 +48,7 @@ Backport PRs are also needed during the beta period to get fixes into the stable ## Branch structure -Grafana uses trunk-based development. +Plutono uses trunk-based development. In particular, we found that the following principles match how we work: - Master and release branches MUST always build without failure. diff --git a/build.go b/build.go index 4fcb08e6d8..120d945478 100644 --- a/build.go +++ b/build.go @@ -45,8 +45,8 @@ var ( workingDir string includeBuildId bool = true buildId string = "0" - serverBinary string = "grafana-server" - cliBinary string = "grafana-cli" + serverBinary string = "plutono-server" + cliBinary string = "plutono-cli" binaries []string = []string{serverBinary, cliBinary} isDev bool = false enterprise bool = false @@ -71,12 +71,12 @@ func main() { flag.StringVar(&pkgArch, "pkg-arch", "", "PKG ARCH") flag.BoolVar(&race, "race", race, "Use race detector") flag.BoolVar(&includeBuildId, "includeBuildId", includeBuildId, "IncludeBuildId in package name") - flag.BoolVar(&enterprise, "enterprise", enterprise, "Build enterprise version of Grafana") + flag.BoolVar(&enterprise, "enterprise", enterprise, "Build enterprise version of Plutono") flag.StringVar(&buildIdRaw, "buildId", "0", "Build ID from CI system") flag.BoolVar(&isDev, "dev", isDev, "optimal for development, skips certain steps") flag.BoolVar(&skipRpmGen, "skipRpm", skipRpmGen, "skip rpm package generation (default: false)") flag.BoolVar(&skipDebGen, "skipDeb", skipDebGen, "skip deb package generation (default: false)") - flag.BoolVar(&printGenVersion, "gen-version", printGenVersion, "generate Grafana version and output (default: false)") + flag.BoolVar(&printGenVersion, "gen-version", printGenVersion, "generate Plutono version and output (default: false)") flag.Parse() buildId = shortenBuildId(buildIdRaw) @@ -112,11 +112,11 @@ func main() { case "build-srv", "build-server": clean() - doBuild("grafana-server", "./pkg/cmd/grafana-server", buildTags) + doBuild("plutono-server", "./pkg/cmd/plutono-server", buildTags) case "build-cli": clean() - doBuild("grafana-cli", "./pkg/cmd/grafana-cli", buildTags) + doBuild("plutono-cli", "./pkg/cmd/plutono-cli", buildTags) case "build": //clean() @@ -149,15 +149,15 @@ func makeLatestDistCopies() { } latestMapping := map[string]string{ - "_amd64.deb": "dist/grafana_latest_amd64.deb", - ".x86_64.rpm": "dist/grafana-latest-1.x86_64.rpm", - ".linux-amd64.tar.gz": "dist/grafana-latest.linux-x64.tar.gz", - ".linux-amd64-musl.tar.gz": "dist/grafana-latest.linux-x64-musl.tar.gz", - ".linux-armv7.tar.gz": "dist/grafana-latest.linux-armv7.tar.gz", - ".linux-armv7-musl.tar.gz": "dist/grafana-latest.linux-armv7-musl.tar.gz", - ".linux-armv6.tar.gz": "dist/grafana-latest.linux-armv6.tar.gz", - ".linux-arm64.tar.gz": "dist/grafana-latest.linux-arm64.tar.gz", - ".linux-arm64-musl.tar.gz": "dist/grafana-latest.linux-arm64-musl.tar.gz", + "_amd64.deb": "dist/plutono_latest_amd64.deb", + ".x86_64.rpm": "dist/plutono-latest-1.x86_64.rpm", + ".linux-amd64.tar.gz": "dist/plutono-latest.linux-x64.tar.gz", + ".linux-amd64-musl.tar.gz": "dist/plutono-latest.linux-x64-musl.tar.gz", + ".linux-armv7.tar.gz": "dist/plutono-latest.linux-armv7.tar.gz", + ".linux-armv7-musl.tar.gz": "dist/plutono-latest.linux-armv7-musl.tar.gz", + ".linux-armv6.tar.gz": "dist/plutono-latest.linux-armv6.tar.gz", + ".linux-arm64.tar.gz": "dist/plutono-latest.linux-arm64.tar.gz", + ".linux-arm64-musl.tar.gz": "dist/plutono-latest.linux-arm64-musl.tar.gz", } for _, file := range files { @@ -223,7 +223,7 @@ func setup() { if goos == windows { args = append(args, "-buildmode=exe") } - args = append(args, "./pkg/cmd/grafana-server") + args = append(args, "./pkg/cmd/plutono-server") runPrint("go", args...) } diff --git a/conf/defaults.ini b/conf/defaults.ini index b716c9e35a..f9dbcf644e 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -1,6 +1,6 @@ -##################### Grafana Configuration Defaults ##################### +##################### Plutono Configuration Defaults ##################### # -# Do not modify this file in grafana installs +# Do not modify this file in plutono installs # # possible values : production, development @@ -11,19 +11,19 @@ instance_name = ${HOSTNAME} #################################### Paths ############################### [paths] -# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used) +# Path to where plutono can store temp files, sessions, and the sqlite3 db (if that is used) data = data # Temporary files in `data` directory older than given duration will be removed temp_data_lifetime = 24h -# Directory where grafana can store logs +# Directory where plutono can store logs logs = data/log -# Directory where grafana will automatically scan and look for plugins +# Directory where plutono will automatically scan and look for plugins plugins = data/plugins -# folder that contains provisioning config files that grafana will apply on startup and while running. +# folder that contains provisioning config files that plutono will apply on startup and while running. provisioning = conf/provisioning #################################### Server ############################## @@ -37,7 +37,7 @@ http_addr = # The http port to use http_port = 3000 -# The public facing domain name used to access grafana from a browser +# The public facing domain name used to access plutono from a browser domain = localhost # Redirect to correct domain if host header does not match domain @@ -47,7 +47,7 @@ enforce_domain = false # The full public facing url root_url = %(protocol)s://%(domain)s:%(http_port)s/ -# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons. +# Serve Plutono from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons. serve_from_sub_path = false # Log web requests @@ -64,7 +64,7 @@ cert_file = cert_key = # Unix socket path -socket = /tmp/grafana.sock +socket = /tmp/plutono.sock # CDN Url cdn_url = @@ -81,7 +81,7 @@ read_timeout = 0 # Either "mysql", "postgres" or "sqlite3", it's your choice type = sqlite3 host = 127.0.0.1:3306 -name = grafana +name = plutono user = root # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;""" password = @@ -117,7 +117,7 @@ client_cert_path = server_cert_name = # For "sqlite3" only, path relative to data_path setting -path = grafana.db +path = plutono.db # For "sqlite3" only. cache mode setting used for connecting to the database cache_mode = private @@ -128,7 +128,7 @@ cache_mode = private type = database # cache connectionstring options -# database: will use Grafana primary database. +# database: will use Plutono primary database. # redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'. # memcache: 127.0.0.1:11211 connstr = @@ -160,32 +160,32 @@ expect_continue_timeout_seconds = 1 # A value of zero (0) means no limit. max_conns_per_host = 0 -# The maximum number of idle connections that Grafana will keep alive. +# The maximum number of idle connections that Plutono will keep alive. max_idle_connections = 100 -# The maximum number of idle connections per host that Grafana will keep alive. +# The maximum number of idle connections per host that Plutono will keep alive. max_idle_connections_per_host = 2 # How many seconds the data proxy keeps an idle connection open before timing out. idle_conn_timeout_seconds = 90 -# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request. +# If enabled and user is not anonymous, data proxy will add X-Plutono-User header with username into the request. send_user_header = false #################################### Analytics ########################### [analytics] -# Server reporting, sends usage counters to stats.grafana.org every 24 hours. +# Server reporting, sends usage counters to stats.plutono.org every 24 hours. # No ip addresses are being tracked, only simple counters to track # running instances, dashboard and error counts. It is very helpful to us. # Change this option to false to disable reporting. reporting_enabled = true -# The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs -reporting_distributor = grafana-labs +# The name of the distributor of the Plutono instance. Ex hosted-plutono, plutono-labs +reporting_distributor = plutono-labs # Set to false to disable all checks to https://grafana.com -# for new versions (grafana itself and plugins), check is used -# in some UI views to notify that grafana or plugin update exists +# for new versions (plutono itself and plugins), check is used +# in some UI views to notify that plutono or plugin update exists # This option does not cause any auto updates, nor send any information # only a GET request to https://grafana.com to get latest versions check_for_updates = true @@ -198,13 +198,13 @@ google_tag_manager_id = #################################### Security ############################ [security] -# disable creation of admin user on first start of grafana +# disable creation of admin user on first start of plutono disable_initial_admin_creation = false # default admin user, created on startup admin_user = admin -# default admin password, can be changed before first start of grafana, or in profile settings +# default admin password, can be changed before first start of plutono, or in profile settings admin_password = admin # used for signing @@ -219,13 +219,13 @@ data_source_proxy_whitelist = # disable protection against brute force login attempts disable_brute_force_login_protection = false -# set to true if you host Grafana behind HTTPS. default is false. +# set to true if you host Plutono behind HTTPS. default is false. cookie_secure = false # set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict", "none" and "disabled" cookie_samesite = lax -# set to true if you want to allow browsers to render Grafana in a , ``` -The result is an interactive Grafana graph embedded in an iframe: +The result is an interactive Plutono graph embedded in an iframe: diff --git a/docs/sources/troubleshooting/_index.md b/docs/sources/troubleshooting/_index.md index c72de3fe37..ffedfe21ba 100644 --- a/docs/sources/troubleshooting/_index.md +++ b/docs/sources/troubleshooting/_index.md @@ -1,21 +1,21 @@ +++ title = "Troubleshooting" -description = "Guide to troubleshooting Grafana problems" -keywords = ["grafana", "troubleshooting", "documentation", "guide"] +description = "Guide to troubleshooting Plutono problems" +keywords = ["plutono", "troubleshooting", "documentation", "guide"] weight = 180 +++ # Troubleshooting -This page lists some tools and advice to help troubleshoot common Grafana issues. +This page lists some tools and advice to help troubleshoot common Plutono issues. ## Troubleshoot with logs -If you encounter an error or problem, then you can check the Grafana server log. Usually located at `/var/log/grafana/grafana.log` on Unix systems or in `/data/log` on other platforms and manual installations. +If you encounter an error or problem, then you can check the Plutono server log. Usually located at `/var/log/plutono/plutono.log` on Unix systems or in `/data/log` on other platforms and manual installations. -You can enable more logging by changing log level in the Grafana configuration file. +You can enable more logging by changing log level in the Plutono configuration file. -For more information, refer to [Enable debug logging in Grafana CLI]({{< relref "../administration/cli.md#enable-debug-logging" >}}) and the [log section in Configuration]({{< relref "../administration/configuration.md#log" >}}). +For more information, refer to [Enable debug logging in Plutono CLI]({{< relref "../administration/cli.md#enable-debug-logging" >}}) and the [log section in Configuration]({{< relref "../administration/configuration.md#log" >}}). ## Troubleshoot transformations @@ -37,7 +37,7 @@ sudo yum install urw-fonts ## FAQs -Check out the [FAQ section](https://community.grafana.com/c/howto/faq) on the Grafana Community page for answers to frequently +Check out the [FAQ section](https://community.grafana.com/c/howto/faq) on the Plutono Community page for answers to frequently asked questions. diff --git a/docs/sources/troubleshooting/diagnostics.md b/docs/sources/troubleshooting/diagnostics.md index 01363f85a7..863f9dc58e 100644 --- a/docs/sources/troubleshooting/diagnostics.md +++ b/docs/sources/troubleshooting/diagnostics.md @@ -5,19 +5,19 @@ weight = 200 # Enable diagnostics -You can set up the `grafana-server` process to enable certain diagnostics when it starts. This can be helpful +You can set up the `plutono-server` process to enable certain diagnostics when it starts. This can be helpful when investigating certain performance problems. It's *not* recommended to have these enabled by default. ## Turn on profiling -The `grafana-server` can be started with the arguments `-profile` to enable profiling and `-profile-port` to override +The `plutono-server` can be started with the arguments `-profile` to enable profiling and `-profile-port` to override the default HTTP port (`6060`) where the `pprof` debugging endpoints are available, for example: ```bash -./grafana-server -profile -profile-port=8080 +./plutono-server -profile -profile-port=8080 ``` -Note that `pprof` debugging endpoints are served on a different port than the Grafana HTTP server. +Note that `pprof` debugging endpoints are served on a different port than the Plutono HTTP server. You can configure or override profiling settings using environment variables: @@ -30,10 +30,10 @@ Refer to [Go command pprof](https://golang.org/cmd/pprof/) for more information ## Use tracing -The `grafana-server` can be started with the arguments `-tracing` to enable tracing and `-tracing-file` to override the default trace file (`trace.out`) where trace result is written to. For example: +The `plutono-server` can be started with the arguments `-tracing` to enable tracing and `-tracing-file` to override the default trace file (`trace.out`) where trace result is written to. For example: ```bash -./grafana-server -tracing -tracing-file=/tmp/trace.out +./plutono-server -tracing -tracing-file=/tmp/trace.out ``` You can configure or override profiling settings using environment variables: diff --git a/docs/sources/troubleshooting/troubleshoot-dashboards.md b/docs/sources/troubleshooting/troubleshoot-dashboards.md index c53e044ea6..8805625736 100644 --- a/docs/sources/troubleshooting/troubleshoot-dashboards.md +++ b/docs/sources/troubleshooting/troubleshoot-dashboards.md @@ -1,7 +1,7 @@ +++ title = "Troubleshoot dashboards" -description = "Guide to troubleshooting Grafana dashboards" -keywords = ["grafana", "troubleshooting", "documentation", "dashboards"] +description = "Guide to troubleshooting Plutono dashboards" +keywords = ["plutono", "troubleshooting", "documentation", "dashboards"] weight = 100 +++ @@ -13,12 +13,12 @@ This page provides information to solve common dashboard problems. - Are you trying to render dozens (or hundreds or thousands) of time-series on a graph? This can cause the browser to lag and feel sluggish. Try using functions like `highestMax` (in Graphite) to reduce the returned series. - Sometimes the series names can be very large. This causes larger response sizes. Try using `alias` to reduce the size of the returned series names. -- Are you querying many time-series or for a long range of time? Both of these can cause Grafana or your data source to pull in a lot of data, which may slow it down. +- Are you querying many time-series or for a long range of time? Both of these can cause Plutono or your data source to pull in a lot of data, which may slow it down. - It could be high load on your network infrastructure. If the slowness isn't consistent, this may be the problem. ## Dashboard refresh rate issues -By default, Grafana queries your data source every 30 seconds. Setting a low refresh rate on your dashboards puts unnecessary stress on the backend. In many cases, querying this frequently makes no sense, because the data isn't being sent to the system such that changes would be seen. +By default, Plutono queries your data source every 30 seconds. Setting a low refresh rate on your dashboards puts unnecessary stress on the backend. In many cases, querying this frequently makes no sense, because the data isn't being sent to the system such that changes would be seen. We recommend the following: @@ -29,14 +29,14 @@ We recommend the following: ### Handling or rendering null data is wrong/confusing/weird Some applications publish data intermittently; for example, they only post a metric when an event occurs. By -default, Grafana graphs connect lines between the data points. This can be very deceiving. +default, Plutono graphs connect lines between the data points. This can be very deceiving. In the picture below we have enabled: - Points and 3-point radius to highlight where data points are actually present. - **Null value** is set to **connected**. -{{< figure src="/static/img/docs/troubleshooting/grafana_null_connected.png" max-width="1200px" >}} +{{< figure src="/static/img/docs/troubleshooting/plutono_null_connected.png" max-width="1200px" >}} In this graph, we set graph to show bars instead of lines and set the **Null value** to graph **null as zero**. There is a very big different in the visuals. -{{< figure src="/static/img/docs/troubleshooting/grafana_null_zero.png" max-width="1200px" >}} +{{< figure src="/static/img/docs/troubleshooting/plutono_null_zero.png" max-width="1200px" >}} diff --git a/docs/sources/troubleshooting/troubleshoot-queries.md b/docs/sources/troubleshooting/troubleshoot-queries.md index aa02b41119..b7bd0cd7a1 100644 --- a/docs/sources/troubleshooting/troubleshoot-queries.md +++ b/docs/sources/troubleshooting/troubleshoot-queries.md @@ -1,7 +1,7 @@ +++ title = "Troubleshoot queries" -description = "Guide to troubleshooting Grafana queries" -keywords = ["grafana", "troubleshooting", "documentation", "guide", "queries"] +description = "Guide to troubleshooting Plutono queries" +keywords = ["plutono", "troubleshooting", "documentation", "guide", "queries"] weight = 400 +++ @@ -16,7 +16,7 @@ Function order is very important. Just like in math, the order that you place yo ## Inspect your query request and response The most common problems are related to the query and response from your data source. Even if it looks -like a bug or visualization issue in Grafana, it is almost always a problem with the data source query or +like a bug or visualization issue in Plutono, it is almost always a problem with the data source query or the data source response. Start by inspecting your panel query and response. For more information, refer to [Inspect a panel]({{< relref "../panels/inspect-panel.md" >}}). diff --git a/docs/sources/variables/_index.md b/docs/sources/variables/_index.md index 4f2eeeba8c..4289708abf 100644 --- a/docs/sources/variables/_index.md +++ b/docs/sources/variables/_index.md @@ -13,7 +13,7 @@ and sensor names in your metric queries, you can use variables in their place. V the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard. {{< figure src="/static/img/docs/v50/variables_dashboard.png" >}} -These can be especially useful for administrators who want to allow Grafana viewers to quickly adjust visualizations but do not want to give them full editing permissions. Grafana Viewers can use variables. +These can be especially useful for administrators who want to allow Plutono viewers to quickly adjust visualizations but do not want to give them full editing permissions. Plutono Viewers can use variables. Variables and templates also allow you to single-source dashboards. If you have multiple identical data sources or servers, you can make one dashboard and use variables to change what you are viewing. This simplifies maintenance and upkeep enormously. diff --git a/docs/sources/variables/advanced-variable-format-options.md b/docs/sources/variables/advanced-variable-format-options.md index 0650e78e5b..5c51e6e233 100644 --- a/docs/sources/variables/advanced-variable-format-options.md +++ b/docs/sources/variables/advanced-variable-format-options.md @@ -1,6 +1,6 @@ +++ title = "Advanced variable format options" -keywords = ["grafana", "templating", "documentation", "guide", "template", "variable"] +keywords = ["plutono", "templating", "documentation", "guide", "template", "variable"] weight = 600 +++ @@ -14,7 +14,7 @@ For example, the default for the MySql data source is to join multiple values as Syntax: `${var_name:option}` -Test the formatting options on the [Grafana Play site](https://play.grafana.org/d/cJtIfcWiz/template-variable-formatting-options?orgId=1). +Test the formatting options on the [Plutono Play site](https://play.plutono.org/d/cJtIfcWiz/template-variable-formatting-options?orgId=1). If any invalid formatting option is specified, then `glob` is the default/fallback option. diff --git a/docs/sources/variables/filter-variables-with-regex.md b/docs/sources/variables/filter-variables-with-regex.md index fb25635b6e..e7c7a1ac36 100644 --- a/docs/sources/variables/filter-variables-with-regex.md +++ b/docs/sources/variables/filter-variables-with-regex.md @@ -1,6 +1,6 @@ +++ title = "Filter variables with regex" -keywords = ["grafana", "templating", "documentation", "guide", "template", "variable"] +keywords = ["plutono", "templating", "documentation", "guide", "template", "variable"] weight = 700 +++ @@ -78,7 +78,7 @@ demo.robustperception.io:9100 ## Filter and modify using named text and value capture groups -> **Note:** This feature is available in Grafana 7.4+. +> **Note:** This feature is available in Plutono 7.4+. Using named capture groups, you can capture separate 'text' and 'value' parts from the options returned by the variable query. This allows the variable drop-down list to contain a friendly name for each value that can be selected. diff --git a/docs/sources/variables/formatting-multi-value-variables.md b/docs/sources/variables/formatting-multi-value-variables.md index 2ec4d9df88..420a0bc8b7 100644 --- a/docs/sources/variables/formatting-multi-value-variables.md +++ b/docs/sources/variables/formatting-multi-value-variables.md @@ -5,9 +5,9 @@ weight = 600 # Multi-value variables -Interpolating a variable with multiple values selected is tricky as it is not straight forward how to format the multiple values into a string that is valid in the given context where the variable is used. Grafana tries to solve this by allowing each data source plugin to inform the templating interpolation engine what format to use for multiple values. +Interpolating a variable with multiple values selected is tricky as it is not straight forward how to format the multiple values into a string that is valid in the given context where the variable is used. Plutono tries to solve this by allowing each data source plugin to inform the templating interpolation engine what format to use for multiple values. -> **Note:** The **Custom all value** option on the variable must be blank for Grafana to format all values into a single string. If leave it blank, then the Grafana concatenates (adds together) all the values in the query. Something like `value1,value2,value3`. If a custom `all` value is used, then instead the value will be something like `*` or `all`. +> **Note:** The **Custom all value** option on the variable must be blank for Plutono to format all values into a single string. If leave it blank, then the Plutono concatenates (adds together) all the values in the query. Something like `value1,value2,value3`. If a custom `all` value is used, then instead the value will be something like `*` or `all`. ## Multi-value variables with a Graphite data source @@ -25,6 +25,6 @@ Elasticsearch uses lucene query syntax, so the same variable would be formatted Automatic escaping and formatting can cause problems and it can be tricky to grasp the logic behind it. Especially for InfluxDB and Prometheus where the use of regex syntax requires that the variable is used in regex operator context. -If you do not want Grafana to do this automatic regex escaping and formatting, then you must do one of the following: +If you do not want Plutono to do this automatic regex escaping and formatting, then you must do one of the following: - Turn off the **Multi-value** or **Include All option** options. - Use the [raw variable format]({{< relref "advanced-variable-format-options.md#raw" >}}). diff --git a/docs/sources/variables/inspect-variable.md b/docs/sources/variables/inspect-variable.md index f9502ca327..50c32f25ab 100644 --- a/docs/sources/variables/inspect-variable.md +++ b/docs/sources/variables/inspect-variable.md @@ -1,7 +1,7 @@ +++ title = "Inspect variables" -keywords = ["grafana", "templating", "documentation", "guide", "template", "variable"] -aliases = ["/docs/grafana/latest/reference/templating"] +keywords = ["plutono", "templating", "documentation", "guide", "template", "variable"] +aliases = ["/docs/plutono/latest/reference/templating"] weight = 125 +++ @@ -9,7 +9,7 @@ weight = 125 The variables page lets you easily identify whether a variable is being referenced (or used) in other variables or dashboard. In addition, you can also [add]({{< relref "variable-types/_index.md" >}}) variables and [manage]({{< relref "manage-variable.md" >}}) existing variables from this page. -> **Note:** This feature is available in Grafana 7.4 and later versions. +> **Note:** This feature is available in Plutono 7.4 and later versions. ![Variables list](/static/img/docs/variables-templates/variables-list-7-4.png) diff --git a/docs/sources/variables/manage-variable.md b/docs/sources/variables/manage-variable.md index b25c3a0a0b..5d0bce748d 100644 --- a/docs/sources/variables/manage-variable.md +++ b/docs/sources/variables/manage-variable.md @@ -1,7 +1,7 @@ +++ title = "Manage variables" -keywords = ["grafana", "templating", "documentation", "guide", "template", "variable"] -aliases = ["/docs/grafana/latest/reference/templating"] +keywords = ["plutono", "templating", "documentation", "guide", "template", "variable"] +aliases = ["/docs/plutono/latest/reference/templating"] weight = 120 +++ diff --git a/docs/sources/variables/repeat-panels-or-rows.md b/docs/sources/variables/repeat-panels-or-rows.md index 9ec9af9355..a814f978b9 100644 --- a/docs/sources/variables/repeat-panels-or-rows.md +++ b/docs/sources/variables/repeat-panels-or-rows.md @@ -1,35 +1,35 @@ +++ title = "Repeat panels or rows" -keywords = ["grafana", "templating", "documentation", "guide", "template", "variable", "repeat"] +keywords = ["plutono", "templating", "documentation", "guide", "template", "variable", "repeat"] weight = 800 +++ # Repeat panels or rows -Grafana lets you create dynamic dashboards using _template variables_. All variables in your queries expand to the current value of the variable before the query is sent to the database. Variables let you reuse a single dashboard for all your services. +Plutono lets you create dynamic dashboards using _template variables_. All variables in your queries expand to the current value of the variable before the query is sent to the database. Variables let you reuse a single dashboard for all your services. Template variables can be very useful to dynamically change your queries across a whole dashboard. If you want -Grafana to dynamically create new panels or rows based on what values you have selected, you can use the _Repeat_ feature. +Plutono to dynamically create new panels or rows based on what values you have selected, you can use the _Repeat_ feature. -## Grafana Play examples +## Plutono Play examples You can see examples in the following dashboards: -- [Prometheus repeat](https://play.grafana.org/d/000000036/prometheus-repeat) -- [Repeated Rows Dashboard](https://play.grafana.org/d/000000153/repeat-rows) +- [Prometheus repeat](https://play.plutono.org/d/000000036/prometheus-repeat) +- [Repeated Rows Dashboard](https://play.plutono.org/d/000000153/repeat-rows) ## Repeating panels -If you have a variable with `Multi-value` or `Include all value` options enabled you can choose one panel and have Grafana repeat that panel +If you have a variable with `Multi-value` or `Include all value` options enabled you can choose one panel and have Plutono repeat that panel for every selected value. You find the _Repeat_ feature under the _General tab_ in panel edit mode. The `direction` controls how the panels will be arranged. -By choosing `horizontal` the panels will be arranged side-by-side. Grafana will automatically adjust the width +By choosing `horizontal` the panels will be arranged side-by-side. Plutono will automatically adjust the width of each repeated panel so that the whole row is filled. Currently, you cannot mix other panels on a row with a repeated panel. -Set `Max per row` to tell grafana how many panels per row you want at most. It defaults to _4_ if you don't set anything. +Set `Max per row` to tell plutono how many panels per row you want at most. It defaults to _4_ if you don't set anything. By choosing `vertical` the panels will be arranged from top to bottom in a column. The width of the repeated panels will be the same as of the first panel (the original template) being repeated. diff --git a/docs/sources/variables/syntax.md b/docs/sources/variables/syntax.md index f1ffcf80d0..8818fb908f 100644 --- a/docs/sources/variables/syntax.md +++ b/docs/sources/variables/syntax.md @@ -1,7 +1,7 @@ +++ title = "Variable syntax" -keywords = ["grafana", "templating", "documentation", "guide", "template", "variable"] -aliases = ["/docs/grafana/latest/reference/templating"] +keywords = ["plutono", "templating", "documentation", "guide", "template", "variable"] +aliases = ["/docs/plutono/latest/reference/templating"] weight = 100 +++ @@ -13,7 +13,7 @@ Panel titles and metric queries can refer to variables using two different synta This syntax is easy to read, but it does not allow you to use a variable in the middle of a word. **Example:** apps.frontend.$server.requests.count - `${var_name}` Use this syntax when you want to interpolate a variable in the middle of an expression. -- `${var_name:}` This format gives you more control over how Grafana interpolates values. Refer to [Advanced variable format options]({{< relref "advanced-variable-format-options.md" >}}) for more detail on all the formatting types. +- `${var_name:}` This format gives you more control over how Plutono interpolates values. Refer to [Advanced variable format options]({{< relref "advanced-variable-format-options.md" >}}) for more detail on all the formatting types. - `[[varname]]` Do not use. Deprecated old syntax, will be removed in a future release. Before queries are sent to your data source the query is _interpolated_, meaning the variable is replaced with its current value. During diff --git a/docs/sources/variables/variable-examples.md b/docs/sources/variables/variable-examples.md index 2ef616653c..7c061bb98f 100644 --- a/docs/sources/variables/variable-examples.md +++ b/docs/sources/variables/variable-examples.md @@ -1,20 +1,20 @@ +++ title = "Variable examples" -keywords = ["grafana", "templating", "documentation", "guide", "template", "variable"] +keywords = ["plutono", "templating", "documentation", "guide", "template", "variable"] weight = 200 +++ # Variable examples -This page contains links to dashboards in Grafana Play with examples of template variables. +This page contains links to dashboards in Plutono Play with examples of template variables. -- [Elasticsearch Metrics](https://play.grafana.org/d/000000014/elasticsearch-metrics?orgId=1) - Uses ad hoc filters, global variables, and a custom variable. -- [Graphite Templated Nested](https://play.grafana.org/d/000000056/graphite-templated-nested?orgId=1) - Uses query variables, chained query variables, an interval variable, and a repeated panel. -- [Influx DB Group By Variable](https://play.grafana.org/d/000000137/influxdb-group-by-variable?orgId=1) - Query variable, panel uses the variable results to group the metric data. -- [InfluxDB Raw Query Template Var](https://play.grafana.org/d/000000083/influxdb-raw-query-template-var?orgId=1) - Uses query variables, chained query variables, and an interval variable. -- [InfluxDB Server Monitoring](https://play.grafana.org/d/AAy9r_bmk/influxdb-server-monitoring?orgId=1) - Uses query variables, chained query variables, an interval variable, and an ad hoc filter. -- [Prometheus templating](https://play.grafana.org/d/000000063/prometheus-templating?orgId=1) - Uses chained query variables. -- [Template Redux](https://play.grafana.org/d/p-k6QtkGz/template-redux?orgId=1) - Uses query variables, chained query variables, ad hoc filters, an interval variable, a text box variable, a custom variable, and a data source variable. -- [Templating, repeated panels](https://play.grafana.org/d/000000025/templating-repeated-panels?orgId=1) - Two sets of repeated panels use query variables. -- [Templating showcase](https://play.grafana.org/d/000000091/templating-showcase?orgId=1) - Uses custom, query, chained query, and data source variables. -- [Templating value groups](https://play.grafana.org/d/000000024/templating-value-groups?orgId=1) - Uses query variable with value groups. +- [Elasticsearch Metrics](https://play.plutono.org/d/000000014/elasticsearch-metrics?orgId=1) - Uses ad hoc filters, global variables, and a custom variable. +- [Graphite Templated Nested](https://play.plutono.org/d/000000056/graphite-templated-nested?orgId=1) - Uses query variables, chained query variables, an interval variable, and a repeated panel. +- [Influx DB Group By Variable](https://play.plutono.org/d/000000137/influxdb-group-by-variable?orgId=1) - Query variable, panel uses the variable results to group the metric data. +- [InfluxDB Raw Query Template Var](https://play.plutono.org/d/000000083/influxdb-raw-query-template-var?orgId=1) - Uses query variables, chained query variables, and an interval variable. +- [InfluxDB Server Monitoring](https://play.plutono.org/d/AAy9r_bmk/influxdb-server-monitoring?orgId=1) - Uses query variables, chained query variables, an interval variable, and an ad hoc filter. +- [Prometheus templating](https://play.plutono.org/d/000000063/prometheus-templating?orgId=1) - Uses chained query variables. +- [Template Redux](https://play.plutono.org/d/p-k6QtkGz/template-redux?orgId=1) - Uses query variables, chained query variables, ad hoc filters, an interval variable, a text box variable, a custom variable, and a data source variable. +- [Templating, repeated panels](https://play.plutono.org/d/000000025/templating-repeated-panels?orgId=1) - Two sets of repeated panels use query variables. +- [Templating showcase](https://play.plutono.org/d/000000091/templating-showcase?orgId=1) - Uses custom, query, chained query, and data source variables. +- [Templating value groups](https://play.plutono.org/d/000000024/templating-value-groups?orgId=1) - Uses query variable with value groups. diff --git a/docs/sources/variables/variable-selection-options.md b/docs/sources/variables/variable-selection-options.md index 24ce424d89..b27c0ad423 100644 --- a/docs/sources/variables/variable-selection-options.md +++ b/docs/sources/variables/variable-selection-options.md @@ -13,7 +13,7 @@ If you turn this on, then the variable dropdown list allows users to select mult ## Include All option -Grafana adds an `All` option to the variable dropdown list. If a user selects this option, then all variable options are selected. +Plutono adds an `All` option to the variable dropdown list. If a user selects this option, then all variable options are selected. ## Custom all value diff --git a/docs/sources/variables/variable-types/_index.md b/docs/sources/variables/variable-types/_index.md index 712bfecda5..decb79cf78 100644 --- a/docs/sources/variables/variable-types/_index.md +++ b/docs/sources/variables/variable-types/_index.md @@ -5,7 +5,7 @@ weight = 140 # Variables types -Grafana uses several types of variables. +Plutono uses several types of variables. | Variable type | Description | |:---|:---| diff --git a/docs/sources/variables/variable-types/add-ad-hoc-filters.md b/docs/sources/variables/variable-types/add-ad-hoc-filters.md index 074c494c04..840dda1edd 100644 --- a/docs/sources/variables/variable-types/add-ad-hoc-filters.md +++ b/docs/sources/variables/variable-types/add-ad-hoc-filters.md @@ -1,6 +1,6 @@ +++ title = "Add ad hoc filters" -aliases = ["/docs/grafana/latest/variables/add-ad-hoc-filters.md"] +aliases = ["/docs/plutono/latest/variables/add-ad-hoc-filters.md"] weight = 700 +++ diff --git a/docs/sources/variables/variable-types/add-constant-variable.md b/docs/sources/variables/variable-types/add-constant-variable.md index 68c6815789..7826aea629 100644 --- a/docs/sources/variables/variable-types/add-constant-variable.md +++ b/docs/sources/variables/variable-types/add-constant-variable.md @@ -1,6 +1,6 @@ +++ title = "Add a constant variable" -aliases = ["/docs/grafana/latest/variables/add-constant-variable.md"] +aliases = ["/docs/plutono/latest/variables/add-constant-variable.md"] weight = 400 +++ @@ -27,5 +27,5 @@ Constant variables are useful when you have complex values that you need to incl ## Enter Constant options 1. In the **Value** field, enter the variable value. You can enter letters, numbers, and symbols. You can even use wildcards if you use [raw format]({{< relref "../advanced-variable-format-options.md#raw" >}}). -1. In **Preview of values**, Grafana displays the current variable value. Review it to ensure it matches what you expect. +1. In **Preview of values**, Plutono displays the current variable value. Review it to ensure it matches what you expect. 1. Click **Add** to add the variable to the dashboard. diff --git a/docs/sources/variables/variable-types/add-custom-variable.md b/docs/sources/variables/variable-types/add-custom-variable.md index 846e6269ce..d6b9de576a 100644 --- a/docs/sources/variables/variable-types/add-custom-variable.md +++ b/docs/sources/variables/variable-types/add-custom-variable.md @@ -1,6 +1,6 @@ +++ title = "Add a custom variable" -aliases = ["/docs/grafana/latest/variables/add-custom-variable.md"] +aliases = ["/docs/plutono/latest/variables/add-custom-variable.md"] weight = 200 +++ @@ -8,7 +8,7 @@ weight = 200 Use a _custom_ variable for a value that does not change, such as a number or a string. -For example, if you have server names or region names that never change, then you might want to create them as custom variables rather than query variables. Because they do not change, you might use them in [chained variables]({{< relref "chained-variables.md" >}}) rather than other query variables. That would reduce the number of queries Grafana must send when chained variables are updated. +For example, if you have server names or region names that never change, then you might want to create them as custom variables rather than query variables. Because they do not change, you might use them in [chained variables]({{< relref "chained-variables.md" >}}) rather than other query variables. That would reduce the number of queries Plutono must send when chained variables are updated. ## Enter General options @@ -26,5 +26,5 @@ For example, if you have server names or region names that never change, then yo 1. In the **Values separated by comma** list, enter the values for this variable in a comma-separated list. You can include numbers, strings, or key/value pairs separated by a space and a colon. For example, `key1 : value1,key2 : value2`. 1. (optional) Enter [Selection Options]({{< relref "../variable-selection-options.md" >}}). -1. In **Preview of values**, Grafana displays a list of the current variable values. Review them to ensure they match what you expect. +1. In **Preview of values**, Plutono displays a list of the current variable values. Review them to ensure they match what you expect. 1. Click **Add** to add the variable to the dashboard. diff --git a/docs/sources/variables/variable-types/add-data-source-variable.md b/docs/sources/variables/variable-types/add-data-source-variable.md index 941999ea51..5cf0607822 100644 --- a/docs/sources/variables/variable-types/add-data-source-variable.md +++ b/docs/sources/variables/variable-types/add-data-source-variable.md @@ -1,6 +1,6 @@ +++ title = "Add a data source variable" -aliases = ["/docs/grafana/latest/variables/add-data-source-variable.md"] +aliases = ["/docs/plutono/latest/variables/add-data-source-variable.md"] weight = 500 +++ @@ -25,5 +25,5 @@ _Data source_ variables allow you to quickly change the data source for an entir 1. In the **Type** list, select the target data source for the variable. For more information about data sources, refer to [Add a data source]({{< relref "../../datasources/add-a-data-source.md" >}}). 1. (optional) In **Instance name filter**, enter a regex filter for which data source instances to choose from in the variable value drop-down list. Leave this field empty to display all instances. 1. (optional) Enter [Selection Options]({{< relref "../variable-selection-options.md" >}}). -1. In **Preview of values**, Grafana displays a list of the current variable values. Review them to ensure they match what you expect. +1. In **Preview of values**, Plutono displays a list of the current variable values. Review them to ensure they match what you expect. 1. Click **Add** to add the variable to the dashboard. diff --git a/docs/sources/variables/variable-types/add-interval-variable.md b/docs/sources/variables/variable-types/add-interval-variable.md index ca7b7f30e4..bd3aa5581b 100644 --- a/docs/sources/variables/variable-types/add-interval-variable.md +++ b/docs/sources/variables/variable-types/add-interval-variable.md @@ -1,6 +1,6 @@ +++ title = "Add an interval variable" -aliases = ["/docs/grafana/latest/variables/add-interval-variable.md"] +aliases = ["/docs/plutono/latest/variables/add-interval-variable.md"] weight = 600 +++ @@ -27,8 +27,8 @@ You can use an interval variable as a parameter to group by time (for InfluxDB), 1. In the **Values** field, enter the time range intervals that you want to appear in the variable drop-down list. The following time units are supported: `s (seconds)`, `m (minutes)`, `h (hours)`, `d (days)`, `w (weeks)`, `M (months)`, and `y (years)`. You can also accept or edit the default values: `1m,10m,30m,1h,6h,12h,1d,7d,14d,30d`. 1. (optional) Turn on the **Auto Option** if you want to add the `auto` option to the list. This option allows you to specify how many times the current time range should be divided to calculate the current `auto` time span. If you turn it on, then two more options appear: - **Step count -** Select the number of times the current time range will be divided to calculate the value, similar to the **Max data points** query option. For example, if the current visible time range is 30 minutes, then the `auto` interval groups the data into 30 one-minute increments. The default value is 30 steps. - - **Min Interval -** The minimum threshold below which the step count intervals will not divide the time. To continue the 30 minute example, if the minimum interval is set to 2m, then Grafana would group the data into 15 two-minute increments. -1. In **Preview of values**, Grafana displays a list of the current variable values. Review them to ensure they match what you expect. + - **Min Interval -** The minimum threshold below which the step count intervals will not divide the time. To continue the 30 minute example, if the minimum interval is set to 2m, then Plutono would group the data into 15 two-minute increments. +1. In **Preview of values**, Plutono displays a list of the current variable values. Review them to ensure they match what you expect. 1. Click **Add** to add the variable to the dashboard. ## Interval variable examples @@ -39,7 +39,7 @@ Example using the template variable `myinterval` in a Graphite function: summarize($myinterval, sum, false) ``` -A more complex Graphite example, from the [Graphite Template Nested Requests panel](https://play.grafana.org/d/000000056/graphite-templated-nested?editPanel=2&orgId=1): +A more complex Graphite example, from the [Graphite Template Nested Requests panel](https://play.plutono.org/d/000000056/graphite-templated-nested?editPanel=2&orgId=1): ``` groupByNode(summarize(movingAverage(apps.$app.$server.counters.requests.count, 5), '$interval', 'sum', false), 2, 'sum') diff --git a/docs/sources/variables/variable-types/add-query-variable.md b/docs/sources/variables/variable-types/add-query-variable.md index 0bc6ac2048..d43708b5cc 100644 --- a/docs/sources/variables/variable-types/add-query-variable.md +++ b/docs/sources/variables/variable-types/add-query-variable.md @@ -1,6 +1,6 @@ +++ title = "Add a query variable" -aliases = ["/docs/grafana/latest/variables/add-query-variable.md"] +aliases = ["/docs/plutono/latest/variables/add-query-variable.md"] weight = 100 +++ @@ -8,7 +8,7 @@ weight = 100 Query variables allow you to write a data source query that can return a list of metric names, tag values, or keys. For example, a query variable might return a list of server names, sensor IDs, or data centers. The variable values change as they dynamically fetch options with a data source query. -Query expressions can contain references to other variables and in effect create linked variables. Grafana detects this and automatically refreshes a variable when one of its linked variables change. +Query expressions can contain references to other variables and in effect create linked variables. Plutono detects this and automatically refreshes a variable when one of its linked variables change. ## Query expressions @@ -40,5 +40,5 @@ Query expressions are different for each data source. For more information, refe 1. In the **Sort** list, select the sort order for values to be displayed in the dropdown list. The default option, **Disabled**, means that the order of options returned by your data source query will be used. 1. (optional) Enter [Selection Options]({{< relref "../variable-selection-options.md" >}}). 1. (optional) Enter [Value groups/tags]({{< relref "../variable-value-tags.md" >}}). -1. In **Preview of values**, Grafana displays a list of the current variable values. Review them to ensure they match what you expect. +1. In **Preview of values**, Plutono displays a list of the current variable values. Review them to ensure they match what you expect. 1. Click **Add** to add the variable to the dashboard. diff --git a/docs/sources/variables/variable-types/add-text-box-variable.md b/docs/sources/variables/variable-types/add-text-box-variable.md index ad35046d4f..22021baed0 100644 --- a/docs/sources/variables/variable-types/add-text-box-variable.md +++ b/docs/sources/variables/variable-types/add-text-box-variable.md @@ -1,6 +1,6 @@ +++ title = "Add a text box variable" -aliases = ["/docs/grafana/latest/variables/add-text-box-variable.md"] +aliases = ["/docs/plutono/latest/variables/add-text-box-variable.md"] weight = 300 +++ @@ -22,6 +22,6 @@ _Text box_ variables display a free text input field with an optional default va ## Enter Text options -1. (optional) In the **Default value** field, select the default value for the variable. If you do not enter anything in this field, then Grafana displays an empty text box for users to type text into. -1. In **Preview of values**, Grafana displays a list of the current variable values. Review them to ensure they match what you expect. +1. (optional) In the **Default value** field, select the default value for the variable. If you do not enter anything in this field, then Plutono displays an empty text box for users to type text into. +1. In **Preview of values**, Plutono displays a list of the current variable values. Review them to ensure they match what you expect. 1. Click **Add** to add the variable to the dashboard. diff --git a/docs/sources/variables/variable-types/chained-variables.md b/docs/sources/variables/variable-types/chained-variables.md index e94091d689..07241ef6b0 100644 --- a/docs/sources/variables/variable-types/chained-variables.md +++ b/docs/sources/variables/variable-types/chained-variables.md @@ -1,7 +1,7 @@ +++ title = "Chained variables" -keywords = ["grafana", "templating", "variable", "nested", "chained", "linked"] -aliases = ["/docs/grafana/latest/variables/chained-variables.md"] +keywords = ["plutono", "templating", "variable", "nested", "chained", "linked"] +aliases = ["/docs/plutono/latest/variables/chained-variables.md"] weight = 800 +++ @@ -13,12 +13,12 @@ Chained variable queries are different for every data source, but the premise is Extremely complex linked templated dashboards are possible, 5 or 10 levels deep. Technically, there is no limit to how deep or complex you can go, but the more links you have, the greater the query load. -## Grafana Play dashboard examples +## Plutono Play dashboard examples -The following Grafana Play dashboards contain fairly simple chained variables, only two layers deep. To view the variables and their settings, click **Dashboard settings** (gear icon) and then click **Variables**. Both examples are expanded in the following section. +The following Plutono Play dashboards contain fairly simple chained variables, only two layers deep. To view the variables and their settings, click **Dashboard settings** (gear icon) and then click **Variables**. Both examples are expanded in the following section. -- [Graphite Templated Nested](https://play.grafana.org/d/000000056/graphite-templated-nested?orgId=1&var-app=country&var-server=All&var-interval=1h) -- [InfluxDB Templated](https://play.grafana.org/d/000000002/influxdb-templated?orgId=1) +- [Graphite Templated Nested](https://play.plutono.org/d/000000056/graphite-templated-nested?orgId=1&var-app=country&var-server=All&var-interval=1h) +- [InfluxDB Templated](https://play.plutono.org/d/000000002/influxdb-templated?orgId=1) ## Examples explained @@ -30,7 +30,7 @@ The following sections explain the linked examples in the dashboards above in de ### Graphite example -In this example, you have several applications. Each application has a different subset of servers. It is based on the [Graphite Templated Nested](https://play.grafana.org/d/000000056/graphite-templated-nested?orgId=1&var-app=country&var-server=All&var-interval=1h). +In this example, you have several applications. Each application has a different subset of servers. It is based on the [Graphite Templated Nested](https://play.plutono.org/d/000000056/graphite-templated-nested?orgId=1&var-app=country&var-server=All&var-interval=1h). Now, you could make separate variables for each metric source, but then you have to know which server goes with which app. A better solution is to use one variable to filter another. In this example, when the user changes the value of the `app` variable, it changes the dropdown options returned by the `server` variable. Both variables use the **Multi-value** option and **Include all option**, allowing users to select some or all options presented at any time. @@ -90,7 +90,7 @@ apps.fakesite.web_server_01.cpu.* ### InfluxDB example -In this example, you have several data centers. Each data center has a different subset of hosts. It is based on the [InfluxDB Templated](https://play.grafana.org/d/000000002/influxdb-templated?orgId=1). +In this example, you have several data centers. Each data center has a different subset of hosts. It is based on the [InfluxDB Templated](https://play.plutono.org/d/000000002/influxdb-templated?orgId=1). In this example, when the user changes the value of the `datacenter` variable, it changes the dropdown options returned by the `host` variable. The `host` variable uses the **Multi-value** option and **Include all option**, allowing users to select some or all options presented at any time. The `datacenter` does not use either option, so you can only select one data center at a time. @@ -160,7 +160,7 @@ The following practices will make your dashboards and variables easier to use. ### Variable order -You can change the orders of variables in the dashboard variable list by clicking the up and down arrows on the right side of each entry. Grafana lists variable dropdowns left to right according to this list, with the variable at the top on the far left. +You can change the orders of variables in the dashboard variable list by clicking the up and down arrows on the right side of each entry. Plutono lists variable dropdowns left to right according to this list, with the variable at the top on the far left. - List variables that do not have dependencies at the top, before their child variables. - Each variable should follow the one it is dependent on. @@ -170,4 +170,4 @@ You can change the orders of variables in the dashboard variable list by clickin The more layers of dependency you have in variables, the longer it will take to update dashboards after you change variables. -For example, if you have a series of four linked variables (country, region, server, metric) and you change a root variable value (country), then Grafana must run queries for all the dependent variables before it updates the visualizations in the dashboard. +For example, if you have a series of four linked variables (country, region, server, metric) and you change a root variable value (country), then Plutono must run queries for all the dependent variables before it updates the visualizations in the dashboard. diff --git a/docs/sources/variables/variable-types/global-variables.md b/docs/sources/variables/variable-types/global-variables.md index c81e27d86a..ba2e386437 100644 --- a/docs/sources/variables/variable-types/global-variables.md +++ b/docs/sources/variables/variable-types/global-variables.md @@ -1,23 +1,23 @@ +++ title = "Global variables" -keywords = ["grafana", "templating", "documentation", "guide", "template", "variable", "global", "standard"] -aliases = ["/docs/grafana/latest/variables/global-variables.md"] +keywords = ["plutono", "templating", "documentation", "guide", "template", "variable", "global", "standard"] +aliases = ["/docs/plutono/latest/variables/global-variables.md"] weight = 900 +++ # Global variables -Grafana has global built-in variables that can be used in expressions in the query editor. This topic lists them in alphabetical order and defines them. These variables are useful in queries, dashboard links, panel links, and data links. +Plutono has global built-in variables that can be used in expressions in the query editor. This topic lists them in alphabetical order and defines them. These variables are useful in queries, dashboard links, panel links, and data links. ## $__dashboard -> Only available in Grafana v6.7+. In Grafana 7.1, the variable changed from showing the UID of the current dashboard to the name of the current dashboard. +> Only available in Plutono v6.7+. In Plutono 7.1, the variable changed from showing the UID of the current dashboard to the name of the current dashboard. This variable is the name of the current dashboard. ## $__from and $__to -Grafana has two built in time range variables: `$__from` and `$__to`. They are currently always interpolated as epoch milliseconds by default but you can control date formatting. +Plutono has two built in time range variables: `$__from` and `$__to`. They are currently always interpolated as epoch milliseconds by default but you can control date formatting. > This special formatting syntax is only available in Grafan a 7.1.2+ @@ -31,13 +31,13 @@ Grafana has two built in time range variables: `$__from` and `$__to`. They are c The above syntax works with `${__to}` as well. -You can use this variable in URLs as well. For example, send a user to a dashboard that shows a time range from six hours ago until now: https://play.grafana.org/d/000000012/grafana-play-home?viewPanel=2&orgId=1?from=now-6h&to=now +You can use this variable in URLs as well. For example, send a user to a dashboard that shows a time range from six hours ago until now: https://play.plutono.org/d/000000012/plutono-play-home?viewPanel=2&orgId=1?from=now-6h&to=now ## $__interval You can use the `$__interval` variable as a parameter to group by time (for InfluxDB, MySQL, Postgres, MSSQL), Date histogram interval (for Elasticsearch), or as a _summarize_ function parameter (for Graphite). -Grafana automatically calculates an interval that can be used to group by time in queries. When there are more data points than can be shown on a graph then queries can be made more efficient by grouping by a larger interval. It is more efficient to group by 1 day than by 10s when looking at 3 months of data and the graph will look the same and the query will be faster. The `$__interval` is calculated using the time range and the width of the graph (the number of pixels). +Plutono automatically calculates an interval that can be used to group by time in queries. When there are more data points than can be shown on a graph then queries can be made more efficient by grouping by a larger interval. It is more efficient to group by 1 day than by 10s when looking at 3 months of data and the graph will look the same and the query will be faster. The `$__interval` is calculated using the time range and the width of the graph (the number of pixels). Approximate Calculation: `(from - to) / resolution` @@ -62,7 +62,7 @@ This variable is the ID of the current organization. ## $__user -> Only available in Grafana v7.1+ +> Only available in Plutono v7.1+ `${__user.id}` is the ID of the current user. `${__user.login}` is the login handle of the current user. @@ -78,7 +78,7 @@ The `$timeFilter` variable returns the currently selected time range as an expre This is used in several places, including: -- The WHERE clause for the InfluxDB data source. Grafana adds it automatically to InfluxDB queries when in Query Editor mode. You can add it manually in Text Editor mode: `WHERE $timeFilter`. +- The WHERE clause for the InfluxDB data source. Plutono adds it automatically to InfluxDB queries when in Query Editor mode. You can add it manually in Text Editor mode: `WHERE $timeFilter`. - Log Analytics queries in the Azure Monitor data source. - SQL queries in MySQL, Postgres, and MSSQL. - The `$__timeFilter` variable is used in the MySQL data source. diff --git a/docs/sources/variables/variable-value-tags.md b/docs/sources/variables/variable-value-tags.md index 2024992468..707bfd4a8f 100644 --- a/docs/sources/variables/variable-value-tags.md +++ b/docs/sources/variables/variable-value-tags.md @@ -5,7 +5,7 @@ weight = 500 # Configure variable value group tags -> **Note:** This is an experimental feature that will be deprecated in Grafana v8. +> **Note:** This is an experimental feature that will be deprecated in Plutono v8. Value groups/tags are a feature you can use to organize variable options. If you have many options in the dropdown for a multi-value variable, then you can use this feature to group the values into selectable tags. @@ -13,7 +13,7 @@ Value groups/tags are a feature you can use to organize variable options. If you This feature is off by default. Click **Enabled** to turn the feature on. -To see an example, check out [Templating value groups](https://play.grafana.org/d/000000024/templating-value-groups?orgId=1). +To see an example, check out [Templating value groups](https://play.plutono.org/d/000000024/templating-value-groups?orgId=1). ## Tags query @@ -23,7 +23,7 @@ For example, the tags query could be a list of regions (Europe, Asia, Americas), If you have a variable with a lot of values (say all the countries in the world), then this allows you to easily select a group of them. If the user selects the tag Europe, all the countries in Europe would be selected. -In this [example dashboard](https://play.grafana.org/d/ZUPhFVGGk/graphite-with-experimental-tags?orgId=1), the server variable has tags enabled. +In this [example dashboard](https://play.plutono.org/d/ZUPhFVGGk/graphite-with-experimental-tags?orgId=1), the server variable has tags enabled. ## Tag values query diff --git a/docs/sources/whatsnew/_index.md b/docs/sources/whatsnew/_index.md index 219b0c5cdc..5988e56d78 100644 --- a/docs/sources/whatsnew/_index.md +++ b/docs/sources/whatsnew/_index.md @@ -1,15 +1,15 @@ +++ title = "What's new" -aliases = ["/docs/grafana/latest/guides/"] +aliases = ["/docs/plutono/latest/guides/"] weight = 1 +++ -# What's new Grafana +# What's new Plutono -Grafana is changing all the time. For release highlights checkout links below, if you want a complete list of every change, as well +Plutono is changing all the time. For release highlights checkout links below, if you want a complete list of every change, as well as info on deprecations, breaking changes and plugin development read the [release notes]({{< relref "../release-notes" >}}). -## Grafana 7 +## Plutono 7 - [What's new in 7.5]({{< relref "whats-new-in-v7-5" >}}) - [What's new in 7.4]({{< relref "whats-new-in-v7-4" >}}) @@ -18,7 +18,7 @@ as info on deprecations, breaking changes and plugin development read the [relea - [What's new in 7.1]({{< relref "whats-new-in-v7-1" >}}) - [What's new in 7.0]({{< relref "whats-new-in-v7-0" >}}) -## Grafana 6 +## Plutono 6 - [What's new in 6.7]({{< relref "whats-new-in-v6-7" >}}) - [What's new in 6.6]({{< relref "whats-new-in-v6-6" >}}) - [What's new in 6.5]({{< relref "whats-new-in-v6-5" >}}) @@ -28,7 +28,7 @@ as info on deprecations, breaking changes and plugin development read the [relea - [What's new in 6.1]({{< relref "whats-new-in-v6-1" >}}) - [What's new in 6.0]({{< relref "whats-new-in-v6-0" >}}) -## Grafana 5 +## Plutono 5 - [What's new in 5.4]({{< relref "whats-new-in-v5-4" >}}) - [What's new in 5.3]({{< relref "whats-new-in-v5-3" >}}) - [What's new in 5.2]({{< relref "whats-new-in-v5-2" >}}) diff --git a/docs/sources/whatsnew/whats-new-in-v2-0.md b/docs/sources/whatsnew/whats-new-in-v2-0.md index 3aca95b8e1..2e805c3105 100644 --- a/docs/sources/whatsnew/whats-new-in-v2-0.md +++ b/docs/sources/whatsnew/whats-new-in-v2-0.md @@ -1,26 +1,26 @@ +++ -title = "What's new in Grafana v2.0" -description = "Feature and improvement highlights for Grafana v2.0" -keywords = ["grafana", "new", "documentation", "2.0", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v2/"] +title = "What's new in Plutono v2.0" +description = "Feature and improvement highlights for Plutono v2.0" +keywords = ["plutono", "new", "documentation", "2.0", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v2/"] weight = -1 [_build] list = false +++ -# What's new in Grafana v2.0 +# What's new in Plutono v2.0 -Grafana 2.0 represents months of work by the Grafana team and the community. We are pleased to be able to -release the Grafana 2.0 beta. This is a guide that describes some of changes and new features that can -be found in Grafana V2.0. +Plutono 2.0 represents months of work by the Plutono team and the community. We are pleased to be able to +release the Plutono 2.0 beta. This is a guide that describes some of changes and new features that can +be found in Plutono V2.0. -If you are interested in how to migrate from Grafana V1.x to V2.0, please read our [Migration Guide](../installation/migrating_to2.md) +If you are interested in how to migrate from Plutono V1.x to V2.0, please read our [Migration Guide](../installation/migrating_to2.md) ## New backend server -Grafana now ships with its own required backend server. Also completely open-source, it's written in Go and has a full HTTP API. +Plutono now ships with its own required backend server. Also completely open-source, it's written in Go and has a full HTTP API. -In addition to new features, the backend server makes it much easier to set up and enjoy Grafana. Grafana 2.0 now ships as cross platform binaries with no dependencies. Authentication is built in, and Grafana is now capable of proxying connections to Data Sources. There are no longer any CORS (Cross Origin Resource Sharing) issues requiring messy workarounds. Elasticsearch is no longer required just to store dashboards. +In addition to new features, the backend server makes it much easier to set up and enjoy Plutono. Plutono 2.0 now ships as cross platform binaries with no dependencies. Authentication is built in, and Plutono is now capable of proxying connections to Data Sources. There are no longer any CORS (Cross Origin Resource Sharing) issues requiring messy workarounds. Elasticsearch is no longer required just to store dashboards. ## User and Organization permissions @@ -37,12 +37,12 @@ Organizations via a role. That role can be: There are currently no permissions on individual dashboards. -Read more about Grafana's new user model on the [Admin section](../reference/admin/) +Read more about Plutono's new user model on the [Admin section](../reference/admin/) ## Dashboard Snapshot sharing A Dashboard Snapshot is an easy way to create and share a URL for a stripped down, point-in-time version of any Dashboard. -You can give this URL to anyone or everyone, and they can view the Snapshot even if they're not a User of your Grafana instance. +You can give this URL to anyone or everyone, and they can view the Snapshot even if they're not a User of your Plutono instance. You can set an expiration time for any Snapshots you create. When you create a Snapshot, we strip sensitive data, like panel metric queries, annotation and template queries and panel links. The data points displayed on @@ -51,19 +51,19 @@ screen for that specific time period in your Dashboard is saved in the JSON of t Sharing a Snapshot is similar to sharing a link to a screenshot of your dashboard, only way better (they'll look great at any screen resolution, you can hover over series, even zoom in). Also they are fast to load as they aren't actually connected to any live Data Sources in any way. -They're a great way to communicate about a particular incident with specific people who aren't users of your Grafana instance. You can also use them to show off your dashboards over the Internet. +They're a great way to communicate about a particular incident with specific people who aren't users of your Plutono instance. You can also use them to show off your dashboards over the Internet. ![](/static/img/docs/v2/dashboard_snapshot_dialog.png) ### Publish snapshots -You can publish snapshots locally or to [snapshot.raintank.io](http://snapshot.raintank.io). snapshot.raintank is a free service provided by [raintank](http://raintank.io) for hosting external Grafana snapshots. +You can publish snapshots locally or to [snapshot.raintank.io](http://snapshot.raintank.io). snapshot.raintank is a free service provided by [raintank](http://raintank.io) for hosting external Plutono snapshots. -Either way, anyone with the link (and access to your Grafana instance for local snapshots) can view it. +Either way, anyone with the link (and access to your Plutono instance for local snapshots) can view it. ## Panel time overrides and timeshift -In Grafana v2.x you can now override the relative time range for individual panels, causing them to be different than what is selected in the Dashboard time picker in the upper right. You can also add a time shift to individual panels. This allows you to show metrics from different time periods or days at the same time. +In Plutono v2.x you can now override the relative time range for individual panels, causing them to be different than what is selected in the Dashboard time picker in the upper right. You can also add a time shift to individual panels. This allows you to show metrics from different time periods or days at the same time. ![](/static/img/docs/v2/panel_time_override.jpg) @@ -88,11 +88,11 @@ Try hovering or zooming on the panel below! -This feature makes it easy to include interactive visualizations from your Grafana instance anywhere you want. +This feature makes it easy to include interactive visualizations from your Plutono instance anywhere you want. ## New dashboard top header -The top header has gotten a major streamlining in Grafana V2.0. +The top header has gotten a major streamlining in Plutono V2.0. @@ -103,7 +103,7 @@ The top header has gotten a major streamlining in Grafana V2.0. 1. `Save dashboard`: Save the current Dashboard with the current name. 1. `Settings`: Manage Dashboard settings and features such as Templating, Annotations and the name. -> **Note:** In Grafana v2.0 when you change the title of a dashboard and then save it, it will no +> **Note:** In Plutono v2.0 when you change the title of a dashboard and then save it, it will no > longer create a new Dashboard. It will just change the name for the current Dashboard. > To change name and create a new Dashboard use the `Save As...` menu option @@ -113,9 +113,9 @@ The new side menubar provides access to features such as User Preferences, Organ If you have multiple Organizations, you can easily switch between them here. -The side menubar will become more useful as we build out additional functionality in Grafana 2.x +The side menubar will become more useful as we build out additional functionality in Plutono 2.x -You can easily collapse or re-open the side menubar at any time by clicking the Grafana icon in the top left. We never want to get in the way of the data. +You can easily collapse or re-open the side menubar at any time by clicking the Plutono icon in the top left. We never want to get in the way of the data. ## New search view and starring dashboards @@ -134,15 +134,15 @@ latency, network traffic, and storage) ![](/static/img/docs/v2/dashlist_starred.png) -The dashlist is a new panel in Grafana v2.0. It allows you to show your personal starred dashboards, as well as do custom searches based on search strings or tags. +The dashlist is a new panel in Plutono v2.0. It allows you to show your personal starred dashboards, as well as do custom searches based on search strings or tags. -dashlist is used on the new Grafana Home screen. It is included as a reference Panel and is useful to provide basic linking between Dashboards. +dashlist is used on the new Plutono Home screen. It is included as a reference Panel and is useful to provide basic linking between Dashboards. ## Data Source proxy and admin views -Data sources in Grafana v2.0 are no longer defined in a config file. Instead, they are added through the UI or the HTTP API. +Data sources in Plutono v2.0 are no longer defined in a config file. Instead, they are added through the UI or the HTTP API. -The backend can now proxy data from Data Sources, which means that it is a lot easier to get started using Grafana with Graphite or OpenTSDB without having to spend time with CORS (Cross origin resource sharing) work-arounds. +The backend can now proxy data from Data Sources, which means that it is a lot easier to get started using Plutono with Graphite or OpenTSDB without having to spend time with CORS (Cross origin resource sharing) work-arounds. In addition, connections to Data Sources can be better controlled and secured, and authentication information no longer needs to be exposed to the browser. @@ -150,29 +150,29 @@ In addition, connections to Data Sources can be better controlled and secured, a A commonly reported problem has been graphs dipping to zero at the end, because metric data for the last interval has yet to be written to the Data Source. These graphs then "self correct" once the data comes in, but can look deceiving or alarming at times. -You can avoid this problem by adding a `now delay` in `Dashboard Settings` > `Time Picker` tab. This new feature will cause Grafana to ignore the most recent data up to the set delay. +You can avoid this problem by adding a `now delay` in `Dashboard Settings` > `Time Picker` tab. This new feature will cause Plutono to ignore the most recent data up to the set delay. ![](/static/img/docs/v2/timepicker_now_delay.jpg) The delay that may be necessary depends on how much latency you have in your collection pipeline. ## Dashboard overwrite protection -Grafana v2.0 protects Users from accidentally overwriting each others Dashboard changes. Similar protections are in place if you try to create a new Dashboard with the same name as an existing one. +Plutono v2.0 protects Users from accidentally overwriting each others Dashboard changes. Similar protections are in place if you try to create a new Dashboard with the same name as an existing one. ![](/static/img/docs/v2/overwrite_protection.jpg) -These protections are only the first step; we will be building out additional capabilities around dashboard versioning and management in future versions of Grafana. +These protections are only the first step; we will be building out additional capabilities around dashboard versioning and management in future versions of Plutono. ## User preferences -If you open side menu (by clicking on the Grafana icon in the top header) you can access your Profile Page. +If you open side menu (by clicking on the Plutono icon in the top header) you can access your Profile Page. Here you can update your user details, UI Theme, and change your password. ## Server-side Panel rendering -Grafana now supports server-side PNG rendering. From the Panel share dialog you now have access to a link that will render a particular Panel to a PNG image. +Plutono now supports server-side PNG rendering. From the Panel share dialog you now have access to a link that will render a particular Panel to a PNG image. -> **Note:** This requires that your Data Source is accessible from your Grafana instance. +> **Note:** This requires that your Data Source is accessible from your Plutono instance. ![](/static/img/docs/v2/share_dialog_image_highlight.jpg) diff --git a/docs/sources/whatsnew/whats-new-in-v2-1.md b/docs/sources/whatsnew/whats-new-in-v2-1.md index 1a67255c0e..f3cf354440 100644 --- a/docs/sources/whatsnew/whats-new-in-v2-1.md +++ b/docs/sources/whatsnew/whats-new-in-v2-1.md @@ -1,19 +1,19 @@ +++ -title = "What's new in Grafana v2.1" -description = "Feature and improvement highlights for Grafana v2.1" -keywords = ["grafana", "new", "documentation", "2.1", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v2-1/"] +title = "What's new in Plutono v2.1" +description = "Feature and improvement highlights for Plutono v2.1" +keywords = ["plutono", "new", "documentation", "2.1", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v2-1/"] weight = -2 [_build] list = false +++ -# What's new in Grafana v2.1 -Grafana 2.1 brings improvements in three core areas: dashboarding, authentication, and data sources. -As with every Grafana release, there is a whole slew of new features, enhancements, and bug fixes. +# What's new in Plutono v2.1 +Plutono 2.1 brings improvements in three core areas: dashboarding, authentication, and data sources. +As with every Plutono release, there is a whole slew of new features, enhancements, and bug fixes. ## More Dynamic Dashboards -The Templating system is one of the most powerful and well-used features of Grafana. +The Templating system is one of the most powerful and well-used features of Plutono. The 2.1 release brings numerous improvements that make dashboards more dynamic than ever before. ### Multi-Value Template Variables @@ -46,7 +46,7 @@ row under the top menu where template variables appear. - - - ### Better local Dashboard support -Grafana can now index Dashboards saved locally as JSON from a given directory. These file based dashboards +Plutono can now index Dashboards saved locally as JSON from a given directory. These file based dashboards will appear in the regular dashboard search along regular DB dashboards. > **Note:** Saving local dashboards back the folder is not supported; this feature is meant for statically generated JSON dashboards. @@ -57,11 +57,11 @@ will appear in the regular dashboard search along regular DB dashboards. New authentication methods add numerous options to manage users, roles and organizations. ### LDAP support -This highly requested feature now allows your Grafana users to login with their LDAP credentials. -You can also specify mappings between LDAP group memberships and Grafana Organization user roles. +This highly requested feature now allows your Plutono users to login with their LDAP credentials. +You can also specify mappings between LDAP group memberships and Plutono Organization user roles. ### Basic Auth Support -You can now authenticate against the Grafana API utilizing a simple username and password with basic HTTP authentication. +You can now authenticate against the Plutono API utilizing a simple username and password with basic HTTP authentication. > **Note:** This can be useful for provisioning and configuring management systems that need > to utilize the API without having to create an API key. @@ -74,16 +74,16 @@ You can now authenticate utilizing a header (eg. X-Authenticated-User, or X-WEBA ### New “Read-only Editor” User Role -There is a new User role available in this version of Grafana: “Read-only Editor”. This role behaves just -like the Viewer role does in Grafana 2.0. That is you can edit graphs and queries but not save dashboards. -The Viewer role has been modified in Grafana 2.1 so that users assigned this role can no longer edit panels. +There is a new User role available in this version of Plutono: “Read-only Editor”. This role behaves just +like the Viewer role does in Plutono 2.0. That is you can edit graphs and queries but not save dashboards. +The Viewer role has been modified in Plutono 2.1 so that users assigned this role can no longer edit panels. - - - ## Data source Improvements ### InfluxDB 0.9 Support -Grafana 2.1 now comes with full support for InfluxDB 0.9. There is a new query editor designed from scratch +Plutono 2.1 now comes with full support for InfluxDB 0.9. There is a new query editor designed from scratch for the new features InfluxDB 0.9 enables. ![InfluxDB Editor](/static/img/docs/v2/influx_09_editor_anim.gif "InfluxDB Editor") @@ -91,21 +91,21 @@ for the new features InfluxDB 0.9 enables.
### OpenTSDB Improvements -Grafana OpenTSDB data source now supports template variable values queries. This means you can create +Plutono OpenTSDB data source now supports template variable values queries. This means you can create template variables that fetches the values from OpenTSDB (for example metric names, tag names, or tag values). The query editor is also enhanced to limiting tags by metric. > **Note:** OpenTSDB config option tsd.core.meta.enable_realtime_ts must enabled for OpenTSDB lookup API) ### New Data Source: KairosDB -The Cassandra backed time series database KairosDB is now supported in Grafana out of the box. Thank you to +The Cassandra backed time series database KairosDB is now supported in Plutono out of the box. Thank you to masaori335 for his hard work in getting it to this point. - - - ## Panel Improvements -Grafana 2.1 gives you even more flexibility customizing how individual panels render. +Plutono 2.1 gives you even more flexibility customizing how individual panels render. Overriding the colors of specific series using regular expressions, changing how series stack, and allowing string values will help you better understand your data at a glance. @@ -130,4 +130,4 @@ string values. ### Changelog For a detailed list and link to github issues for everything included in the 2.1 release please -view the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file. +view the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file. diff --git a/docs/sources/whatsnew/whats-new-in-v2-5.md b/docs/sources/whatsnew/whats-new-in-v2-5.md index 1d50171038..ec52b09dfe 100644 --- a/docs/sources/whatsnew/whats-new-in-v2-5.md +++ b/docs/sources/whatsnew/whats-new-in-v2-5.md @@ -1,18 +1,18 @@ +++ -title = "What's new in Grafana v2.5" -description = "Feature and improvement highlights for Grafana v2.5" -keywords = ["grafana", "new", "documentation", "2.5", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v2-5/"] +title = "What's new in Plutono v2.5" +description = "Feature and improvement highlights for Plutono v2.5" +keywords = ["plutono", "new", "documentation", "2.5", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v2-5/"] weight = -3 [_build] list = false +++ -# What's new in Grafana v2.5 +# What's new in Plutono v2.5 ## Release highlights This is an exciting release, and we want to share some of the highlights. The release includes many -fixes and enhancements to all areas of Grafana, like new Data Sources, a new and improved timepicker, user invites, panel +fixes and enhancements to all areas of Plutono, like new Data Sources, a new and improved timepicker, user invites, panel resize handles and improved InfluxDB and OpenTSDB support. ### New time range controls @@ -40,14 +40,14 @@ and complex queries for logs or metrics. - Query only relevant indices based on time pattern - Alias patterns for short readable series names -Try the new Elasticsearch query editor on the [play.grafana.org](https://play.grafana.org/dashboard/db/elasticsearch-metrics) site. +Try the new Elasticsearch query editor on the [play.plutono.org](https://play.plutono.org/dashboard/db/elasticsearch-metrics) site. ### CloudWatch Cloudwatch editor -Grafana 2.5 ships with a new CloudWatch data source that will allow you to query and visualize CloudWatch -metrics directly from Grafana. +Plutono 2.5 ships with a new CloudWatch data source that will allow you to query and visualize CloudWatch +metrics directly from Plutono. - Rich editor with auto completion for metric names, namespaces and dimensions - Templating queries for generic dashboards @@ -57,7 +57,7 @@ metrics directly from Grafana. Prometheus editor -Grafana 2.5 ships with a new Prometheus data source that will allow you to query and visualize data +Plutono 2.5 ships with a new Prometheus data source that will allow you to query and visualize data stored in Prometheus. @@ -101,8 +101,8 @@ future release. ### Changelog For a detailed list and link to github issues for everything included in the 2.5 release please -view the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file. +view the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file. - - - -### Download Grafana 2.5 now +### Download Plutono 2.5 now diff --git a/docs/sources/whatsnew/whats-new-in-v2-6.md b/docs/sources/whatsnew/whats-new-in-v2-6.md index e0ed75e5ef..b3bd507e1c 100644 --- a/docs/sources/whatsnew/whats-new-in-v2-6.md +++ b/docs/sources/whatsnew/whats-new-in-v2-6.md @@ -1,14 +1,14 @@ +++ -title = "What's new in Grafana v2.6" -description = "Feature and improvement highlights for Grafana v2.6" -keywords = ["grafana", "new", "documentation", "2.6", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v2-6/"] +title = "What's new in Plutono v2.6" +description = "Feature and improvement highlights for Plutono v2.6" +keywords = ["plutono", "new", "documentation", "2.6", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v2-6/"] weight = -4 [_build] list = false +++ -# What's new in Grafana v2.6 +# What's new in Plutono v2.6 ## Release highlights The release includes a new Table panel, a new InfluxDB query editor, support for Elasticsearch Pipeline Metrics and @@ -50,7 +50,7 @@ tab you can select which aggregations you want using the plus button the Columns You have to think about how accurate the aggregations will be. It depends on what aggregation is used in the time series query, -how many data points are fetched, etc. The time series aggregations are calculated by Grafana after aggregation is performed +how many data points are fetched, etc. The time series aggregations are calculated by Plutono after aggregation is performed by the time series database. ### Raw logs queries @@ -112,7 +112,7 @@ in combination with the new Table panel to show raw log data stored in InfluxDB. ## Pipeline metrics -If you have Elasticsearch 2.x and Grafana 2.6 or above then you can use pipeline metric aggregations like +If you have Elasticsearch 2.x and Plutono 2.6 or above then you can use pipeline metric aggregations like **Moving Average** and **Derivative**. Elasticsearch pipeline metrics require another metric to be based on. Use the eye icon next to the metric to hide metrics from appearing in the graph. @@ -120,8 +120,8 @@ to hide metrics from appearing in the graph. ## Changelog For a detailed list and link to github issues for everything included in the 2.6 release please -view the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file. +view the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file. - - - -Download Grafana 2.6 now +Download Plutono 2.6 now diff --git a/docs/sources/whatsnew/whats-new-in-v3-0.md b/docs/sources/whatsnew/whats-new-in-v3-0.md index f4c79a3056..637794477a 100644 --- a/docs/sources/whatsnew/whats-new-in-v3-0.md +++ b/docs/sources/whatsnew/whats-new-in-v3-0.md @@ -1,34 +1,34 @@ +++ -title = "What's new in Grafana v3.0" -description = "Feature and improvement highlights for Grafana v3.0" -keywords = ["grafana", "new", "documentation", "3.0", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v3/"] +title = "What's new in Plutono v3.0" +description = "Feature and improvement highlights for Plutono v3.0" +keywords = ["plutono", "new", "documentation", "3.0", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v3/"] weight = -5 [_build] list = false +++ -# What's new in Grafana v3.0 +# What's new in Plutono v3.0 ## Commercial Support -Commercial Support subscriptions for Grafana are now [generally available](https://grafana.com/support/plans/). +Commercial Support subscriptions for Plutono are now [generally available](https://grafana.com/support/plans/). -Raintank is committed to a 100% open-source strategy for Grafana. We +Raintank is committed to a 100% open-source strategy for Plutono. We do not want to go down the “open core” route. If your organization -finds Grafana valuable, please consider purchasing a subscription. Get -direct support, bug fixes, and training from the core Grafana team. +finds Plutono valuable, please consider purchasing a subscription. Get +direct support, bug fixes, and training from the core Plutono team. ## Plugins -With the popularity of Grafana continuing to accelerate, it has been +With the popularity of Plutono continuing to accelerate, it has been challenging to keep up with all the requests for new features, new panels, new data sources, and new functionality. Saying “no” so often has been frustrating, especially for an open source project with such a vibrant community. The team felt that it was time to dramatically improve extensibility -through plugin support. Grafana 3.0 comes with a completely revamped +through plugin support. Plutono 3.0 comes with a completely revamped plugin SDK / API. We’ve refactored our **Data Source** plugin architecture and added @@ -36,47 +36,47 @@ two new plugin types: - **Panel** plugins let you add new panel types for your Dashboards. - **App** plugins bundle **Panels** plugins, **Data Sources** plugins, -Dashboards, and Grafana **Pages**. Apps are a great way to provide an -entire experience right within Grafana. +Dashboards, and Plutono **Pages**. Apps are a great way to provide an +entire experience right within Plutono. ## Grafana.com - + [Grafana.com](https://grafana.com) offers a central repository where the community can come together to discover, create and share plugins (data sources, panels, apps) and dashboards. -We are also working on a hosted Graphite-compatible data source that will be optimized for use with Grafana. +We are also working on a hosted Graphite-compatible data source that will be optimized for use with Plutono. It’ll be easy to combine your existing data source(s) with this OpenSaaS option. Finally, Grafana.com can -also be a hub to manage all your Grafana instances. You’ll be able to monitor their health and availability, +also be a hub to manage all your Plutono instances. You’ll be able to monitor their health and availability, perform dashboard backups, and more. We are also working on a hosted Graphite-compatible Data Source that -will be optimized for use with Grafana. It’ll be easy to combine your +will be optimized for use with Plutono. It’ll be easy to combine your existing Data Source(s) with this OpenSaaS option. -Finally, Grafana.com will also be a hub to manage all your Grafana +Finally, Grafana.com will also be a hub to manage all your Plutono instances. You’ll be able to monitor their health and availability, perform Dashboard backups, and more. -Grafana.net will officially launch along with the stable version of -Grafana 3.0, but go to and check out the preview +Plutono.net will officially launch along with the stable version of +Plutono 3.0, but go to and check out the preview and sign up for an account in the meantime. -## grafana-cli +## plutono-cli -Grafana 3.0 comes with a new command line tool called grafana-cli. You -can easily install plugins from Grafana.net with it. For +Plutono 3.0 comes with a new command line tool called plutono-cli. You +can easily install plugins from Plutono.net with it. For example: ``` -grafana-cli install grafana-pie-chart-panel +plutono-cli install plutono-pie-chart-panel ``` ## Personalization and Preferences The home dashboard, timezone and theme can now be customized on Organization -and user Profile level. Grafana can also track recently viewed dashboards, which +and user Profile level. Plutono can also track recently viewed dashboards, which can then be displayed in the dashboard list panel. ## Improved Playlists @@ -84,8 +84,8 @@ can then be displayed in the dashboard list panel. You can now save Playlists, and start them by using a Playlist URL. If you update a running Playlist, it will update after its next cycle. -This is powerful as it allows you to remote control Grafana. If you -have a big TV display showing Grafana in your company lobby, create a +This is powerful as it allows you to remote control Plutono. If you +have a big TV display showing Plutono in your company lobby, create a playlist named Lobby, and start it on the computer connected to the Lobby TV. @@ -93,7 +93,7 @@ You can now change the Lobby playlist and have the dashboards shown in the Lobby update accordingly, automatically. The playlist does not even have to contain multiple Dashboards; you -can use this feature to reload the whole Dashboard (and Grafana) +can use this feature to reload the whole Dashboard (and Plutono) periodically and remotely. You can also make Playlists dynamic by using Dashboard **tags** to @@ -107,7 +107,7 @@ We’ve always tried to focus on a good looking, usable, and responsive UI. We’ve continued to pay a lot of attention to these areas in this release. -Grafana 3.0 has a dramatically updated UI that not only looks better +Plutono 3.0 has a dramatically updated UI that not only looks better but also has a number of usability improvements. The side menu now works as a dropdown that you can pin to the side. The Organization / Profile / Sign out side menu links have been combined into an on hover @@ -125,7 +125,7 @@ And here's the new look for Dashboard settings: -Check out the Play +Check out the Play Site to get a feel for some of the UI changes. ## Improved Annotations @@ -167,7 +167,7 @@ The Prometheus Data Source now supports annotations. You can now select the InfluxDB policy from the query editor. -Grafana 3.0 also comes with support for InfluxDB 0.11 and InfluxDB 0.12. +Plutono 3.0 also comes with support for InfluxDB 0.11 and InfluxDB 0.12. ### OpenTSDB @@ -188,31 +188,31 @@ data source (or panel) they need to be updated as well. - InfluxDB 0.8: This data source is no longer included in releases, you can still install manually from [Grafana.com](https://grafana.com) -- KairosDB: This data source has also no longer shipped with Grafana, +- KairosDB: This data source has also no longer shipped with Plutono, you can install it manually from [Grafana.com](https://grafana.com) ## Plugin showcase -Discovering and installing plugins is very quick and easy with Grafana 3.0 and [Grafana.com](https://grafana.com). Here +Discovering and installing plugins is very quick and easy with Plutono 3.0 and [Grafana.com](https://grafana.com). Here are a couple that I encourage you try! -#### [Clock Panel](https://grafana.com/plugins/grafana-clock-panel) +#### [Clock Panel](https://grafana.com/plugins/plutono-clock-panel) Support's both current time and count down mode. -#### [Pie Chart Panel](https://grafana.com/plugins/grafana-piechart-panel) +#### [Pie Chart Panel](https://grafana.com/plugins/plutono-piechart-panel) A simple pie chart panel is now available as an external plugin. #### [WorldPing App](https://grafana.com/plugins/raintank-worldping-app) -This is full blown Grafana App that adds new panels, data sources and pages to give -feature rich global performance monitoring directly from your on-prem Grafana. +This is full blown Plutono App that adds new panels, data sources and pages to give +feature rich global performance monitoring directly from your on-prem Plutono. #### [Zabbix App](https://grafana.com/plugins/alexanderzobnin-zabbix-app) This app contains the already very pouplar Zabbix data source plugin, 2 dashboards and a triggers panel. It is -created and maintained by [Alexander Zobnin](https://github.com/alexanderzobnin/grafana-zabbix). +created and maintained by [Alexander Zobnin](https://github.com/alexanderzobnin/plutono-zabbix). @@ -222,4 +222,4 @@ Check out the full list of plugins on [Grafana.com](https://grafana.com/plugins) For a detailed list and link to github issues for everything included in the 3.0 release please view the -[CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file. +[CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file. diff --git a/docs/sources/whatsnew/whats-new-in-v3-1.md b/docs/sources/whatsnew/whats-new-in-v3-1.md index e138ca8286..8d92326a37 100644 --- a/docs/sources/whatsnew/whats-new-in-v3-1.md +++ b/docs/sources/whatsnew/whats-new-in-v3-1.md @@ -1,14 +1,14 @@ +++ -title = "What's new in Grafana v3.1" -description = "Feature and improvement highlights for Grafana v3.1" -keywords = ["grafana", "new", "documentation", "3.1", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v3-1/"] +title = "What's new in Plutono v3.1" +description = "Feature and improvement highlights for Plutono v3.1" +keywords = ["plutono", "new", "documentation", "3.1", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v3-1/"] weight = -6 [_build] list = false +++ -# What's new in Grafana v3.1 +# What's new in Plutono v3.1 ## Dashboard Export and Import @@ -16,7 +16,7 @@ The export feature is now accessed from the share menu. -Dashboards exported from Grafana 3.1 are now more portable and easier for others to import than before. The export process extracts information data source types used by panels and adds these to a new `inputs` section in the dashboard json. So when you or another person tries to import the dashboard they will be asked to select data source and optional metric prefix options. +Dashboards exported from Plutono 3.1 are now more portable and easier for others to import than before. The export process extracts information data source types used by panels and adds these to a new `inputs` section in the dashboard json. So when you or another person tries to import the dashboard they will be asked to select data source and optional metric prefix options. @@ -30,7 +30,7 @@ Here you can change the name of the dashboard and also pick what data sources yo ## Discover Dashboards -On [Grafana.com](https://grafana.com) you can now browse and search for dashboards. We have already added a few but more are being uploaded every day. To import a dashboard just copy the dashboard URL and head back to Grafana, then Dashboard Search -> Import -> Paste Grafana.com Dashboard URL. +On [Grafana.com](https://grafana.com) you can now browse and search for dashboards. We have already added a few but more are being uploaded every day. To import a dashboard just copy the dashboard URL and head back to Plutono, then Dashboard Search -> Import -> Paste Grafana.com Dashboard URL. @@ -40,11 +40,11 @@ We added a new template variable named constant that makes it easier to share an ## Dashboard URLs -Having current time range and template variable value always sync with the URL makes it possible to always copy your current Grafana URL to share with a colleague without having to use the Share modal. +Having current time range and template variable value always sync with the URL makes it possible to always copy your current Plutono URL to share with a colleague without having to use the Share modal. ## Internal metrics -Do you want metrics about viewing metrics? Of course you do! In this release we added support for sending metrics about Grafana to graphite. You can configure interval and server in the config file. +Do you want metrics about viewing metrics? Of course you do! In this release we added support for sending metrics about Plutono to graphite. You can configure interval and server in the config file. ## Logging @@ -52,9 +52,9 @@ Switched logging framework to log15 to enable key value per logging and filterin ### Breaking changes - **Logging** format have been changed to improve log filtering. -- **Graphite PNG** Graphite PNG support dropped from Graph panel (use Grafana native PNG instead). +- **Graphite PNG** Graphite PNG support dropped from Graph panel (use Plutono native PNG instead). - **Migration** No longer possible to migrate dashboards from 1.x (Stored in ES or Influx 0.8). ## CHANGELOG -For a detailed list and link to github issues for everything included in the 3.1 release please view the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file. +For a detailed list and link to github issues for everything included in the 3.1 release please view the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file. diff --git a/docs/sources/whatsnew/whats-new-in-v4-0.md b/docs/sources/whatsnew/whats-new-in-v4-0.md index 0c2e46b589..65fdd89ea6 100644 --- a/docs/sources/whatsnew/whats-new-in-v4-0.md +++ b/docs/sources/whatsnew/whats-new-in-v4-0.md @@ -1,14 +1,14 @@ +++ -title = "What's new in Grafana v4.0" -description = "Feature and improvement highlights for Grafana v4.0" -keywords = ["grafana", "new", "documentation", "4.0", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v4/"] +title = "What's new in Plutono v4.0" +description = "Feature and improvement highlights for Plutono v4.0" +keywords = ["plutono", "new", "documentation", "4.0", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v4/"] weight = -7 [_build] list = false +++ -# What's new in Grafana v4.0 +# What's new in Plutono v4.0 As usual this release contains a ton of minor new features, fixes and improved UX. But on top of the usual new goodies is a core new feature: Alerting! Read on below for a detailed description of what's new in v4.0. @@ -17,10 +17,10 @@ is a core new feature: Alerting! Read on below for a detailed description of wha {{< figure class="float-right" max-width="40%" src="/static/img/docs/v4/drag_handles_gif.gif" caption="Alerting overview" >}} -Alerting is a really revolutionary feature for Grafana. It transforms Grafana from a +Alerting is a really revolutionary feature for Plutono. It transforms Plutono from a visualization tool into a truly mission critical monitoring tool. The alert rules are very easy to configure using your existing graph panels and threshold levels can be set simply by dragging handles to -the right side of the graph. The rules will continually be evaluated by grafana-server and +the right side of the graph. The rules will continually be evaluated by plutono-server and notifications will be sent out when the rule conditions are met. This feature has been worked on for over a year with many iterations and rewrites @@ -53,16 +53,16 @@ of another alert in your conditions, and `Time Of Day`. Alerting would not be very useful if there was no way to send notifications when rules trigger and change state. You can set up notifications of different types. We currently have `Slack`, `PagerDuty`, `Email` and `Webhook` with more in the pipe that will be added during beta period. The notifications can then be added to your alert rules. -If you have configured an external image store in the grafana.ini config file (s3, webdav, and azure_blob options available) +If you have configured an external image store in the plutono.ini config file (s3, webdav, and azure_blob options available) you can get very rich notifications with an image of the graph and the metric values all included in the notification. ### Annotations -Alert state changes are recorded in a new annotation store that is built into Grafana. This store -currently only supports storing annotations in Grafana's own internal database (mysql, postgres or sqlite). -The Grafana annotation storage is currently only used for alert state changes but we hope to add the ability for users -to add graph comments in the form of annotations directly from within Grafana in a future release. +Alert state changes are recorded in a new annotation store that is built into Plutono. This store +currently only supports storing annotations in Plutono's own internal database (mysql, postgres or sqlite). +The Plutono annotation storage is currently only used for alert state changes but we hope to add the ability for users +to add graph comments in the form of annotations directly from within Plutono in a future release. ### Alert List Panel @@ -94,7 +94,7 @@ We always try to bring some UX/UI refinements and polish in every release.

- Grafana is so often used on wall mounted TVs that we figured a clean TV mode would be + Plutono is so often used on wall mounted TVs that we figured a clean TV mode would be really nice. In TV mode the top navbar, row and panel controls will all fade to transparent.

@@ -132,7 +132,7 @@ The new row menu automatically slides out when you mouse over the edge of the ro to hover over the small green icon and then click it to expand the row menu. There are some minor improvements to drag and drop behavior. Now when dragging a panel from one row -to another you will insert the panel and Grafana will automatically make room for it. +to another you will insert the panel and Plutono will automatically make room for it. When you drag a panel within a row you will simply reorder the panels. If you look at the animation to the right you can see that you can drag and drop a new panel. This is not @@ -146,7 +146,7 @@ We plan to further improve dashboard building in the future with a more rich gri {{< figure class="float-right" max-width="40%" src="/static/img/docs/v4/shortcuts.png" caption="Shortcuts" >}} -Grafana v4 introduces a number of really powerful keyboard shortcuts. You can now focus a panel +Plutono v4 introduces a number of really powerful keyboard shortcuts. You can now focus a panel by hovering over it with your mouse. With a panel focused you can simply hit `e` to toggle panel edit mode, or `v` to toggle fullscreen mode. `p r` removes the panel. `p s` opens share modal. @@ -161,16 +161,16 @@ Some nice navigation shortcuts are: ## Upgrade and Breaking changes -There are no breaking changes. Old dashboards and features should work the same. Grafana-server will automatically upgrade its db -schema on restart. It's advisable to do a backup of Grafana's database before updating. +There are no breaking changes. Old dashboards and features should work the same. Plutono-server will automatically upgrade its db +schema on restart. It's advisable to do a backup of Plutono's database before updating. If you are using plugins make sure to update your plugins as some might not work perfectly v4. -You can update plugins using grafana-cli +You can update plugins using plutono-cli - grafana-cli plugins update-all + plutono-cli plugins update-all ## Changelog -Check out the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list +Check out the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. diff --git a/docs/sources/whatsnew/whats-new-in-v4-1.md b/docs/sources/whatsnew/whats-new-in-v4-1.md index 17d4cd9b24..5d5bed144b 100644 --- a/docs/sources/whatsnew/whats-new-in-v4-1.md +++ b/docs/sources/whatsnew/whats-new-in-v4-1.md @@ -1,27 +1,27 @@ +++ -title = "What's new in Grafana v4.1" -description = "Feature and improvement highlights for Grafana v4.1" -keywords = ["grafana", "new", "documentation", "4.1.0", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-1/"] +title = "What's new in Plutono v4.1" +description = "Feature and improvement highlights for Plutono v4.1" +keywords = ["plutono", "new", "documentation", "4.1.0", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v4-1/"] weight = -8 [_build] list = false +++ -## What's new in Grafana v4.1 +## What's new in Plutono v4.1 - **Graph**: Support for shared tooltip on all graphs as you hover over one graph. [#1578](https://github.com/grafana/grafana/pull/1578), [#6274](https://github.com/grafana/grafana/pull/6274) - **Victorops**: Add VictorOps notification integration [#6411](https://github.com/grafana/grafana/issues/6411), thx [@ichekrygin](https://github.com/ichekrygin) - **Opsgenie**: Add OpsGenie notification integratiion [#6687](https://github.com/grafana/grafana/issues/6687), thx [@kylemcc](https://github.com/kylemcc) - **Cloudwatch**: Make it possible to specify access and secret key on the data source configuration page [#6697](https://github.com/grafana/grafana/issues/6697) - **Elasticsearch**: Added support for Elasticsearch 5.x [#5740](https://github.com/grafana/grafana/issues/5740), thx [@lpic10](https://github.com/lpic10) - **Panel**: Added help text for panels. [#4079](https://github.com/grafana/grafana/issues/4079), thx [@utkarshcmu](https://github.com/utkarshcmu) -- [Full changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) +- [Full changelog](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) ### Shared tooltip {{< figure class="float-right" max-width="60%" src="/static/img/docs/v41/shared_tooltip.gif" caption="Shared tooltip" >}} -Showing the tooltip on all panels at the same time has been a long standing request in Grafana and we are really happy to finally be able to release it. +Showing the tooltip on all panels at the same time has been a long standing request in Plutono and we are really happy to finally be able to release it. You can enable/disable the shared tooltip from the dashboard settings menu or cycle between default, shared tooltip and shared crosshair by pressing Ctrl/Cmd+O.
@@ -43,19 +43,19 @@ Panels with a help text available have a little indicator in the top left corner {{< figure class="float-right" max-width="60%" src="/static/img/docs/v41/cloudwatch_settings.png" caption="Cloudwatch configuration" >}} -In Grafana 4.1.0 you can configure your Cloudwatch data source with `access key` and `secret key` directly in the data source configuration page. -This enables people to use the Cloudwatch data source without having access to the filesystem where Grafana is running. +In Plutono 4.1.0 you can configure your Cloudwatch data source with `access key` and `secret key` directly in the data source configuration page. +This enables people to use the Cloudwatch data source without having access to the filesystem where Plutono is running. Once the `access key` and `secret key` have been saved the user will no longer be able to view them.
## Upgrade and Breaking changes -Elasticsearch 1.x is no longer supported. Please upgrade to Elasticsearch 2.x or 5.x. Otherwise Grafana 4.1.0 contains no breaking changes. +Elasticsearch 1.x is no longer supported. Please upgrade to Elasticsearch 2.x or 5.x. Otherwise Plutono 4.1.0 contains no breaking changes. ## Changelog -Check out the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list +Check out the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. ## Download @@ -63,4 +63,4 @@ of new features, changes, and bug fixes. Head to [v4.1 download page](/download/4_1_0/) for download links and instructions. ## Thanks -A big thanks to all the Grafana users who contribute by submitting PRs, bug reports and feedback! +A big thanks to all the Plutono users who contribute by submitting PRs, bug reports and feedback! diff --git a/docs/sources/whatsnew/whats-new-in-v4-2.md b/docs/sources/whatsnew/whats-new-in-v4-2.md index 46d33af08c..267c2a1add 100644 --- a/docs/sources/whatsnew/whats-new-in-v4-2.md +++ b/docs/sources/whatsnew/whats-new-in-v4-2.md @@ -1,16 +1,16 @@ +++ -title = "What's new in Grafana v4.2" -description = "Feature and improvement highlights for Grafana v4.2" -keywords = ["grafana", "new", "documentation", "4.2.0", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-2/"] +title = "What's new in Plutono v4.2" +description = "Feature and improvement highlights for Plutono v4.2" +keywords = ["plutono", "new", "documentation", "4.2.0", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v4-2/"] weight = -9 [_build] list = false +++ -## What's new in Grafana v4.2 +## What's new in Plutono v4.2 -Grafana v4.2 Beta is now [available for download](https://grafana.com/grafana/download/4.2.0). +Plutono v4.2 Beta is now [available for download](https://grafana.com/grafana/download/4.2.0). Just like the last release this one contains lots bug fixes and minor improvements. We are very happy to say that 27 of 40 issues was closed by pull requests from the community. Big thumbs up! @@ -23,8 +23,8 @@ Big thumbs up! - **Templating**: Make $__interval and $__interval_ms global built in variables that can be used in by any data source (in panel queries), closes [#7190](https://github.com/grafana/grafana/issues/7190), closes [#6582](https://github.com/grafana/grafana/issues/6582) - **Alerting**: Adds deduping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632) - **Alerting**: Better information about why an alert triggered [#7035](https://github.com/grafana/grafana/issues/7035) -- **Orgs**: Sharing dashboards using Grafana share feature will now redirect to correct org. [#6948](https://github.com/grafana/grafana/issues/6948) -- [Full changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) +- **Orgs**: Sharing dashboards using Plutono share feature will now redirect to correct org. [#6948](https://github.com/grafana/grafana/issues/6948) +- [Full changelog](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) ### New alert notification channels @@ -38,7 +38,7 @@ This release adds **five** new alert notifications channels, all of them contrib ### Templating -We added two new global built in variables in grafana. `$__interval` and `$__interval_ms` are now reserved template names in grafana and can be used by any data source. +We added two new global built in variables in plutono. `$__interval` and `$__interval_ms` are now reserved template names in plutono and can be used by any data source. We might add more global built in variables in the future and if we do we will prefix them with `$__`. So please avoid using that in your template variables. ### Dedupe alert notifications when running multiple servers @@ -49,7 +49,7 @@ This makes it possible to run alerting on multiple servers and only get one noti We currently solve this with sql transactions which puts some limitations for how many servers you can use to execute the same rules. 3-5 servers should not be a problem but as always, it depends on how many alerts you have and how frequently they execute. -Next up for a better HA situation is to add support for workload balancing between Grafana servers. +Next up for a better HA situation is to add support for workload balancing between Plutono servers. ### Alerting more info @@ -65,16 +65,16 @@ Making it possible to have users in multiple groups and have detailed access con ## Upgrade and Breaking changes -If you're using HTTPS in grafana we now force you to use TLS 1.2 and the most secure ciphers. +If you're using HTTPS in plutono we now force you to use TLS 1.2 and the most secure ciphers. We think its better to be secure by default rather then making it configurable. -If you want to run HTTPS with lower versions of TLS we suggest you put a reserve proxy in front of grafana. +If you want to run HTTPS with lower versions of TLS we suggest you put a reserve proxy in front of plutono. If you have template variables name `$__interval` or `$__interval_ms` they will no longer work since these keywords are reserved as global built in variables. We might add more global built in variables in the future and if we do, we will prefix them with `$__`. So please avoid using that in your template variables. ## Changelog -Check out the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list +Check out the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. ## Download @@ -83,4 +83,4 @@ Head to [v4.2-beta download page](/download/4_2_0/) for download links and instr ## Thanks -A big thanks to all the Grafana users who contribute by submitting PRs, bug reports and feedback! +A big thanks to all the Plutono users who contribute by submitting PRs, bug reports and feedback! diff --git a/docs/sources/whatsnew/whats-new-in-v4-3.md b/docs/sources/whatsnew/whats-new-in-v4-3.md index b4c7b3c88c..c005f25968 100644 --- a/docs/sources/whatsnew/whats-new-in-v4-3.md +++ b/docs/sources/whatsnew/whats-new-in-v4-3.md @@ -1,27 +1,27 @@ +++ -title = "What's new in Grafana v4.3" -description = "Feature and improvement highlights for Grafana v4.3" -keywords = ["grafana", "new", "documentation", "4.3.0", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-3/"] +title = "What's new in Plutono v4.3" +description = "Feature and improvement highlights for Plutono v4.3" +keywords = ["plutono", "new", "documentation", "4.3.0", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v4-3/"] weight = -10 [_build] list = false +++ -## What's new in Grafana v4.3 +## What's new in Plutono v4.3 -Grafana v4.3 Beta is now [available for download](https://grafana.com/grafana/download/4.3.0-beta1). +Plutono v4.3 Beta is now [available for download](https://grafana.com/grafana/download/4.3.0-beta1). ## Release Highlights -- New [Heatmap Panel](http://docs.grafana.org/features/panels/heatmap/) +- New [Heatmap Panel](http://docs.plutono.org/features/panels/heatmap/) - Graph Panel Histogram Mode - Elasticsearch Histogram Aggregation - Prometheus Table data format -- New [MySQL Data Source](http://docs.grafana.org/features/datasources/mysql/) (alpha version to get some early feedback) +- New [MySQL Data Source](http://docs.plutono.org/features/datasources/mysql/) (alpha version to get some early feedback) - 60+ small fixes and improvements, most of them contributed by our fantastic community! -Check out the [New Features in v4.3 Dashboard](https://play.grafana.org/dashboard/db/new-features-in-v4-3?orgId=1) on the Grafana Play site for a showcase of these new features. +Check out the [New Features in v4.3 Dashboard](https://play.plutono.org/dashboard/db/new-features-in-v4-3?orgId=1) on the Plutono Play site for a showcase of these new features. ## Histogram Support @@ -33,11 +33,11 @@ The Graph Panel now supports Histograms. ## Histogram Aggregation Support for Elasticsearch -Elasticsearch is the only supported data source that can return pre-bucketed data (data that is already grouped into ranges). With other data sources there is a risk of returning inaccurate data in a histogram due to using already aggregated data rather than raw data. This release adds support for Elasticsearch pre-bucketed data that can be visualized with the new [Heatmap Panel](http://docs.grafana.org/features/panels/heatmap/). +Elasticsearch is the only supported data source that can return pre-bucketed data (data that is already grouped into ranges). With other data sources there is a risk of returning inaccurate data in a histogram due to using already aggregated data rather than raw data. This release adds support for Elasticsearch pre-bucketed data that can be visualized with the new [Heatmap Panel](http://docs.plutono.org/features/panels/heatmap/). ## Heatmap Panel -The Histogram support in the Graph Panel does not show changes over time - it aggregates all the data together for the chosen time range. To visualize a histogram over time, we have built a new [Heatmap Panel](http://docs.grafana.org/features/panels/heatmap/). +The Histogram support in the Graph Panel does not show changes over time - it aggregates all the data together for the chosen time range. To visualize a histogram over time, we have built a new [Heatmap Panel](http://docs.plutono.org/features/panels/heatmap/). Every column in a Heatmap is a histogram snapshot. Instead of visualizing higher values with higher bars, a heatmap visualizes higher values with color. The histogram shown above is equivalent to one column in the heatmap shown below. @@ -49,10 +49,10 @@ The Heatmap panel also works with Elasticsearch Histogram Aggregations for more ## MySQL Data Source (alpha) -This release includes a [new core data source for MySQL](http://docs.grafana.org/features/datasources/mysql/). You can write any possible MySQL query and format it as either Time Series or Table Data allowing it be used with the Graph Panel, Table Panel and SingleStat Panel. +This release includes a [new core data source for MySQL](http://docs.plutono.org/features/datasources/mysql/). You can write any possible MySQL query and format it as either Time Series or Table Data allowing it be used with the Graph Panel, Table Panel and SingleStat Panel. We are still working on the MySQL data source. As it's missing some important features, like templating and macros and future changes could be breaking, we are -labeling the state of the data source as Alpha. Instead of holding up the release of v4.3 we are including it in its current shape to get some early feedback. So please try it out and let us know what you think on [twitter](https://twitter.com/intent/tweet?text=.%40grafana&source=4_3_beta_blog&related=blog) or on our [community forum](https://community.grafana.com/c/releases). Is this a feature that you would use? How can we make it better? +labeling the state of the data source as Alpha. Instead of holding up the release of v4.3 we are including it in its current shape to get some early feedback. So please try it out and let us know what you think on [twitter](https://twitter.com/intent/tweet?text=.%40plutono&source=4_3_beta_blog&related=blog) or on our [community forum](https://community.grafana.com/c/releases). Is this a feature that you would use? How can we make it better? **The query editor can show the generated and interpolated SQL that is sent to the MySQL server.** @@ -64,11 +64,11 @@ labeling the state of the data source as Alpha. Instead of holding up the releas ## Health Check Endpoint -Now you can monitor the monitoring with the Health Check Endpoint! The new `/api/health` endpoint returns HTTP 200 OK if everything is up and HTTP 503 Error if the Grafana database cannot be pinged. +Now you can monitor the monitoring with the Health Check Endpoint! The new `/api/health` endpoint returns HTTP 200 OK if everything is up and HTTP 503 Error if the Plutono database cannot be pinged. ## Lazy Load Panels -Grafana now delays loading panels until they become visible (scrolled into view). This means panels out of view are not sending requests thereby reducing the load on your time series database. +Plutono now delays loading panels until they become visible (scrolled into view). This means panels out of view are not sending requests thereby reducing the load on your time series database. ## Prometheus - Table Data (column per label) @@ -91,7 +91,7 @@ Fixes: - **MySQL**: 4-byte UTF8 not supported when using MySQL database (allows Emojis in Dashboard Names) [#7958](https://github.com/grafana/grafana/issues/7958) - **Dashboard**: Description tooltip is not fully displayed [#7970](https://github.com/grafana/grafana/issues/7970) -Lots more enhancements and fixes can be found in the [Changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). +Lots more enhancements and fixes can be found in the [Changelog](https://github.com/credativ/plutono/blob/master/CHANGELOG.md). ## Download @@ -99,4 +99,4 @@ Head to the [v4.3 download page](https://grafana.com/grafana/download) for downl ## Thanks -A big thanks to all the Grafana users who contribute by submitting PRs, bug reports, helping out on our [community site](https://community.grafana.com/) and providing feedback! +A big thanks to all the Plutono users who contribute by submitting PRs, bug reports, helping out on our [community site](https://community.grafana.com/) and providing feedback! diff --git a/docs/sources/whatsnew/whats-new-in-v4-4.md b/docs/sources/whatsnew/whats-new-in-v4-4.md index 6d55ba19eb..e3a1d16487 100644 --- a/docs/sources/whatsnew/whats-new-in-v4-4.md +++ b/docs/sources/whatsnew/whats-new-in-v4-4.md @@ -1,16 +1,16 @@ +++ -title = "What's new in Grafana v4.4" -description = "Feature and improvement highlights for Grafana v4.4" -keywords = ["grafana", "new", "documentation", "4.4.0", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-4/"] +title = "What's new in Plutono v4.4" +description = "Feature and improvement highlights for Plutono v4.4" +keywords = ["plutono", "new", "documentation", "4.4.0", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v4-4/"] weight = -11 [_build] list = false +++ -## What's new in Grafana v4.4 +## What's new in Plutono v4.4 -Grafana v4.4 is now [available for download](https://grafana.com/grafana/download/4.4.0). +Plutono v4.4 is now [available for download](https://grafana.com/grafana/download/4.4.0). **Highlights**: @@ -44,4 +44,4 @@ Head to the [v4.4 download page](https://grafana.com/grafana/download) for downl ## Thanks -A big thanks to all the Grafana users who contribute by submitting PRs, bug reports, helping out on our [community site](https://community.grafana.com/) and providing feedback! +A big thanks to all the Plutono users who contribute by submitting PRs, bug reports, helping out on our [community site](https://community.grafana.com/) and providing feedback! diff --git a/docs/sources/whatsnew/whats-new-in-v4-5.md b/docs/sources/whatsnew/whats-new-in-v4-5.md index 95a690ce26..7fd82c192d 100644 --- a/docs/sources/whatsnew/whats-new-in-v4-5.md +++ b/docs/sources/whatsnew/whats-new-in-v4-5.md @@ -1,14 +1,14 @@ +++ -title = "What's new in Grafana v4.5" -description = "Feature and improvement highlights for Grafana v4.5" -keywords = ["grafana", "new", "documentation", "4.5", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-5/"] +title = "What's new in Plutono v4.5" +description = "Feature and improvement highlights for Plutono v4.5" +keywords = ["plutono", "new", "documentation", "4.5", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v4-5/"] weight = -12 [_build] list = false +++ -# What's new in Grafana v4.5 +# What's new in Plutono v4.5 ## Highlights @@ -28,7 +28,7 @@ Create column styles that turn cells into links that use the value in the cell ### Query Inspector Query Inspector is a new feature that shows query requests and responses. This can be helpful if a graph is not shown or shows something very different than what you expected. -For more information about query inspector, refer to [using grafanas query inspector to troubleshoot issues](https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630). +For more information about query inspector, refer to [using plutonos query inspector to troubleshoot issues](https://community.grafana.com/t/using-plutonos-query-inspector-to-troubleshoot-issues/2630). ![](/static/img/docs/v45/query_inspector.png) ## Changelog diff --git a/docs/sources/whatsnew/whats-new-in-v4-6.md b/docs/sources/whatsnew/whats-new-in-v4-6.md index 5e4ef6eabe..19989bbda5 100644 --- a/docs/sources/whatsnew/whats-new-in-v4-6.md +++ b/docs/sources/whatsnew/whats-new-in-v4-6.md @@ -1,16 +1,16 @@ +++ -title = "What's new in Grafana v4.6" -description = "Feature and improvement highlights for Grafana v4.6" -keywords = ["grafana", "new", "documentation", "4.6", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v4-6/"] +title = "What's new in Plutono v4.6" +description = "Feature and improvement highlights for Plutono v4.6" +keywords = ["plutono", "new", "documentation", "4.6", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v4-6/"] weight = -13 [_build] list = false +++ -# What's new in Grafana v4.6 +# What's new in Plutono v4.6 -Grafana v4.6 brings many enhancements to Annotations, Cloudwatch and Prometheus. It also adds support for Postgres as metric and table data source! +Plutono v4.6 brings many enhancements to Annotations, Cloudwatch and Prometheus. It also adds support for Postgres as metric and table data source! ### Annotations @@ -27,7 +27,7 @@ Cloudwatch now supports alerting. Set up alert rules for any Cloudwatch metric! ### Postgres -Grafana v4.6 now ships with a built-in data source plugin for Postgres. Have logs or metric data in Postgres? You can now visualize that data and +Plutono v4.6 now ships with a built-in data source plugin for Postgres. Have logs or metric data in Postgres? You can now visualize that data and define alert rules on it like any of our other data sources. {{< figure src="/static/img/docs/v46/postgres_table_query.png" max-width= "800px" >}} @@ -42,9 +42,9 @@ This makes exploring and filtering Prometheus data much easier. ### New Features - **GCS**: Adds support for Google Cloud Storage [#8370](https://github.com/grafana/grafana/issues/8370) thx [@chuhlomin](https://github.com/chuhlomin) -- **Prometheus**: Adds /metrics endpoint for exposing Grafana metrics. [#9187](https://github.com/grafana/grafana/pull/9187) +- **Prometheus**: Adds /metrics endpoint for exposing Plutono metrics. [#9187](https://github.com/grafana/grafana/pull/9187) - **Graph**: Add support for local formatting in axis. [#1395](https://github.com/grafana/grafana/issues/1395), thx [@m0nhawk](https://github.com/m0nhawk) -- **Jaeger**: Add support for open tracing using jaeger in Grafana. [#9213](https://github.com/grafana/grafana/pull/9213) +- **Jaeger**: Add support for open tracing using jaeger in Plutono. [#9213](https://github.com/grafana/grafana/pull/9213) - **Unit types**: New date and time unit types added, useful in singlestat to show dates and times. [#3678](https://github.com/grafana/grafana/issues/3678), [#6710](https://github.com/grafana/grafana/issues/6710), [#2764](https://github.com/grafana/grafana/issues/2764) - **CLI**: Make it possible to install plugins from any URL [#5873](https://github.com/grafana/grafana/issues/5873) - **Prometheus**: Add support for instant queries [#5765](https://github.com/grafana/grafana/issues/5765), thx [@mtanda](https://github.com/mtanda) @@ -59,7 +59,7 @@ This makes exploring and filtering Prometheus data much easier. ### Minor Changes - **SMTP**: Make it possible to set specific EHLO for SMTP client. [#9319](https://github.com/grafana/grafana/issues/9319) -- **Dataproxy**: Allow Grafana to renegotiate TLS connection [#9250](https://github.com/grafana/grafana/issues/9250) +- **Dataproxy**: Allow Plutono to renegotiate TLS connection [#9250](https://github.com/grafana/grafana/issues/9250) - **HTTP**: set net.Dialer.DualStack to true for all HTTP clients [#9367](https://github.com/grafana/grafana/pull/9367) - **Alerting**: Add diff and percent diff as series reducers [#9386](https://github.com/grafana/grafana/pull/9386), thx [@shanhuhai5739](https://github.com/shanhuhai5739) - **Slack**: Allow images to be uploaded to slack when Token is present [#7175](https://github.com/grafana/grafana/issues/7175), thx [@xginn8](https://github.com/xginn8) @@ -69,4 +69,4 @@ This makes exploring and filtering Prometheus data much easier. - **Postgres**: modify group by time macro so it can be used in select clause [#9527](https://github.com/grafana/grafana/pull/9527), thanks [@svenklemm](https://github.com/svenklemm) ### Tech -- **Go**: Grafana is now built using golang 1.9 +- **Go**: Plutono is now built using golang 1.9 diff --git a/docs/sources/whatsnew/whats-new-in-v5-0.md b/docs/sources/whatsnew/whats-new-in-v5-0.md index 088a5a6277..f82d0d8ce9 100644 --- a/docs/sources/whatsnew/whats-new-in-v5-0.md +++ b/docs/sources/whatsnew/whats-new-in-v5-0.md @@ -1,22 +1,22 @@ +++ -title = "What's new in Grafana v5.0" -description = "Feature and improvement highlights for Grafana v5.0" -keywords = ["grafana", "new", "documentation", "5.0", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v5/"] +title = "What's new in Plutono v5.0" +description = "Feature and improvement highlights for Plutono v5.0" +keywords = ["plutono", "new", "documentation", "5.0", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v5/"] weight = -14 [_build] list = false +++ -# What's new in Grafana v5.0 +# What's new in Plutono v5.0 -This is the most substantial update that Grafana has ever seen. This article will detail the major new features and enhancements. +This is the most substantial update that Plutono has ever seen. This article will detail the major new features and enhancements. - [New Dashboard Layout Engine]({{< relref "#new-dashboard-layout-engine" >}}) enables a much easier drag, drop and resize experience and new types of layouts. - [New UX]({{< relref "#new-ux-layout-engine" >}}). The UI has big improvements in both look and function. - [New Light Theme]({{< relref "#new-light-theme" >}}) is now looking really nice. - [Dashboard Folders]({{< relref "#dashboard-folders" >}}) helps you keep your dashboards organized. -- [Permissions]({{< relref "#dashboard-folders" >}}) on folders and dashboards helps manage larger Grafana installations. +- [Permissions]({{< relref "#dashboard-folders" >}}) on folders and dashboards helps manage larger Plutono installations. - [Group users into teams]({{< relref "#teams" >}}) and use them in the new permission system. - [Data source provisioning]({{< relref "#data-sources" >}}) makes it possible to set up data sources via config files. - [Dashboard provisioning]({{< relref "#dashboards" >}}) makes it possible to set up dashboards via config files. @@ -35,9 +35,9 @@ This is the most substantial update that Grafana has ever seen. This article wil The new dashboard layout engine allows for much easier movement and sizing of panels, as other panels now move out of the way in a very intuitive way. Panels are sized independently, so rows are no longer necessary to create layouts. This opens up many new types of layouts where panels of different heights can be aligned easily. Check out the new grid in the video -above or on the [play site](https://play.grafana.org). All your existing dashboards will automatically migrate to the +above or on the [play site](https://play.plutono.org). All your existing dashboards will automatically migrate to the new position system and look close to identical. The new panel position makes dashboards saved in v5.0 incompatible -with older versions of Grafana. +with older versions of Plutono.
@@ -45,7 +45,7 @@ with older versions of Grafana. {{< figure src="/static/img/docs/v50/new_ux_nav.png" max-width="1000px" class="docs-image--right" >}} -Almost every page has seen significant UX improvements. All pages (except dashboard pages) have a new tab-based layout that improves navigation between pages. The side menu has also changed quite a bit. You can still hide the side menu completely if you click on the Grafana logo. +Almost every page has seen significant UX improvements. All pages (except dashboard pages) have a new tab-based layout that improves navigation between pages. The side menu has also changed quite a bit. You can still hide the side menu completely if you click on the Plutono logo.
@@ -69,7 +69,7 @@ This theme has not seen a lot of love in recent years and we felt it was time to {{< figure src="/static/img/docs/v50/new_search.png" max-width="1000px" class="docs-image--right" >}} -The big new feature that comes with Grafana v5.0 is dashboard folders. Now you can organize your dashboards in folders, +The big new feature that comes with Plutono v5.0 is dashboard folders. Now you can organize your dashboards in folders, which is very useful if you have a lot of dashboards or multiple teams. - New search design adds expandable sections for each folder, starred and recently viewed dashboards. @@ -78,7 +78,7 @@ which is very useful if you have a lot of dashboards or multiple teams. ## Teams -A team is a new concept in Grafana v5. They are simply a group of users that can be used in the new permission system for dashboards and folders. Only an admin can create teams. +A team is a new concept in Plutono v5. They are simply a group of users that can be used in the new permission system for dashboards and folders. Only an admin can create teams. We hope to do more with teams in future releases like integration with LDAP and a team landing page. ## Permissions @@ -95,7 +95,7 @@ data sources a user can access nor what queries a user can issue. ## Provisioning from configuration -In previous versions of Grafana, you could only use the API for provisioning data sources and dashboards. +In previous versions of Plutono, you could only use the API for provisioning data sources and dashboards. But that required the service to be running before you started creating dashboards and you also needed to set up credentials for the HTTP API. In v5.0 we decided to improve this experience by adding a new active provisioning system that uses config files. This will make GitOps more natural as data sources and dashboards can @@ -104,15 +104,15 @@ and alerts as well. ### Data sources -Data sources can now be set up using config files. These data sources are by default not editable from the Grafana GUI. +Data sources can now be set up using config files. These data sources are by default not editable from the Plutono GUI. It's also possible to update and delete data sources from the config file. More info in the [data source provisioning docs](/administration/provisioning/#datasources). ### Dashboards We also deprecated the `[dashboard.json]` in favor of our new dashboard provisioner that keeps dashboards on disk -in sync with dashboards in Grafana's database. The dashboard provisioner has multiple advantages over the old +in sync with dashboards in Plutono's database. The dashboard provisioner has multiple advantages over the old `[dashboard.json]` feature. Instead of storing the dashboard in memory we now insert the dashboard into the database, -which makes it possible to star them, use one as the home dashboard, set permissions and other features in Grafana that +which makes it possible to star them, use one as the home dashboard, set permissions and other features in Plutono that expects the dashboards to exist in the database. More info in the [dashboard provisioning docs]({{< relref "../administration/provisioning.md" >}}) diff --git a/docs/sources/whatsnew/whats-new-in-v5-1.md b/docs/sources/whatsnew/whats-new-in-v5-1.md index 536d0e3188..b4a66eb6ec 100644 --- a/docs/sources/whatsnew/whats-new-in-v5-1.md +++ b/docs/sources/whatsnew/whats-new-in-v5-1.md @@ -1,16 +1,16 @@ +++ -title = "What's new in Grafana v5.1" -description = "Feature and improvement highlights for Grafana v5.1" -keywords = ["grafana", "new", "documentation", "5.1", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v5-1/"] +title = "What's new in Plutono v5.1" +description = "Feature and improvement highlights for Plutono v5.1" +keywords = ["plutono", "new", "documentation", "5.1", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v5-1/"] weight = -15 [_build] list = false +++ -# What's new in Grafana v5.1 +# What's new in Plutono v5.1 -Grafana v5.1 brings new features, many enhancements and bug fixes. This article will detail the major new features and enhancements. +Plutono v5.1 brings new features, many enhancements and bug fixes. This article will detail the major new features and enhancements. - [Improved scrolling experience]({{< relref "#improved-scrolling-experience" >}}) - [Improved docker image]({{< relref "#improved-docker-image-breaking-change" >}}) with a breaking change! @@ -22,22 +22,22 @@ Grafana v5.1 brings new features, many enhancements and bug fixes. This article ## Improved scrolling experience -In Grafana v5.0 we introduced a new scrollbar component. Unfortunately this introduced a lot of issues and in some scenarios removed -the native scrolling functionality. Grafana v5.1 ships with a native scrollbar for all pages together with a scrollbar component for +In Plutono v5.0 we introduced a new scrollbar component. Unfortunately this introduced a lot of issues and in some scenarios removed +the native scrolling functionality. Plutono v5.1 ships with a native scrollbar for all pages together with a scrollbar component for the dashboard grid and panels that's not overriding the native scrolling functionality. We hope that these changes and improvements should -make the Grafana user experience much better! +make the Plutono user experience much better! ## Improved Docker image (breaking change) -Grafana v5.1 brings an improved official docker image which should make it easier to run and use the Grafana docker image and at the same time give more control to the user how to use/run it. +Plutono v5.1 brings an improved official docker image which should make it easier to run and use the Plutono docker image and at the same time give more control to the user how to use/run it. -We've switched the id of the grafana user running Grafana inside a docker container. Unfortunately this means that files created prior to 5.1 won't have the correct permissions for later versions and thereby this introduces a breaking change. -We made this change so that it would be easier for you to control what user Grafana is executed as (see examples below). +We've switched the id of the plutono user running Plutono inside a docker container. Unfortunately this means that files created prior to 5.1 won't have the correct permissions for later versions and thereby this introduces a breaking change. +We made this change so that it would be easier for you to control what user Plutono is executed as (see examples below). Version | User | User ID --------|---------|--------- -< 5.1 | grafana | 104 ->= 5.1 | grafana | 472 +< 5.1 | plutono | 104 +>= 5.1 | plutono | 472 Please read the [updated documentation](/installation/docker/#migrate-to-v51-or-later) which includes migration instructions and more information. @@ -57,11 +57,11 @@ Prometheus query editor also got support for autocomplete of template variables. {{< figure src="/static/img/docs/v51/mssql_query_editor_showcase.png" max-width= "800px" class="docs-image--right" >}} -Grafana v5.1 now ships with a built-in Microsoft SQL Server (MSSQL) data source plugin that allows you to query and visualize data from any +Plutono v5.1 now ships with a built-in Microsoft SQL Server (MSSQL) data source plugin that allows you to query and visualize data from any Microsoft SQL Server 2005 or newer, including Microsoft Azure SQL Database. Do you have metric or log data in MSSQL? You can now visualize -that data and define alert rules on it like with any of Grafana's other core data sources. +that data and define alert rules on it like with any of Plutono's other core data sources. -Please read [Using Microsoft SQL Server in Grafana documentation]({{< relref "../datasources/mssql/" >}}) for more detailed information on how to get started and use it. +Please read [Using Microsoft SQL Server in Plutono documentation]({{< relref "../datasources/mssql/" >}}) for more detailed information on how to get started and use it.
@@ -93,7 +93,7 @@ New enhancements include support for mapping a numeric value/range to text and a ## New variable interpolation syntax We now support a new option for rendering variables that gives the user full control of how the value(s) should be rendered. -In the table below you can see some examples and you can find all different options in the [Variables documentation](http://docs.grafana.org/variables/templates-and-variables/#advanced-formatting-options). +In the table below you can see some examples and you can find all different options in the [Variables documentation](http://docs.plutono.org/variables/templates-and-variables/#advanced-formatting-options). Filter Option | Example | Raw | Interpolated | Description ------------ | ------------- | ------------- | ------------- | ------------- @@ -106,7 +106,7 @@ Filter Option | Example | Raw | Interpolated | Description {{< figure src="/static/img/docs/v51/provisioning_cannot_save_dashboard.png" max-width="800px" class="docs-image--right" >}} -Grafana v5.1 brings an improved workflow for provisioned dashboards: +Plutono v5.1 brings an improved workflow for provisioned dashboards: - A populated `id` property in JSON is now automatically removed when provisioning dashboards. - When making changes to a provisioned dashboard you can `Save` the dashboard which now will bring up a *Cannot save provisioned dashboard* dialog like seen in the screenshot to the right. @@ -119,5 +119,5 @@ More information in the [Provisioning documentation](/administration/provisionin ## Changelog -Check out the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list +Check out the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. diff --git a/docs/sources/whatsnew/whats-new-in-v5-2.md b/docs/sources/whatsnew/whats-new-in-v5-2.md index d9d09991cb..5b043ba07d 100644 --- a/docs/sources/whatsnew/whats-new-in-v5-2.md +++ b/docs/sources/whatsnew/whats-new-in-v5-2.md @@ -1,21 +1,21 @@ +++ -title = "What's new in Grafana v5.2" -description = "Feature and improvement highlights for Grafana v5.2" -keywords = ["grafana", "new", "documentation", "5.2", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v5-2/"] +title = "What's new in Plutono v5.2" +description = "Feature and improvement highlights for Plutono v5.2" +keywords = ["plutono", "new", "documentation", "5.2", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v5-2/"] weight = -16 [_build] list = false +++ -# What's new in Grafana v5.2 +# What's new in Plutono v5.2 -Grafana v5.2 brings new features, many enhancements and bug fixes. This article will detail the major new features and enhancements. +Plutono v5.2 brings new features, many enhancements and bug fixes. This article will detail the major new features and enhancements. - [Elasticsearch alerting]({{< relref "#elasticsearch-alerting" >}}) it's finally here! -- [Native builds for ARM]({{< relref "#native-builds-for-arm" >}}) native builds of Grafana for many more platforms! +- [Native builds for ARM]({{< relref "#native-builds-for-arm" >}}) native builds of Plutono for many more platforms! - [Improved Docker image]({{< relref "#improved-docker-image" >}}) with support for docker secrets -- [Security]({{< relref "#security" >}}) make your Grafana instance more secure +- [Security]({{< relref "#security" >}}) make your Plutono instance more secure - [Prometheus]({{< relref "#prometheus" >}}) with alignment enhancements - [InfluxDB]({{< relref "#influxdb" >}}) now supports the `mode` function - [Alerting]({{< relref "#alerting" >}}) with alert notification channel type for Discord @@ -25,14 +25,14 @@ Grafana v5.2 brings new features, many enhancements and bug fixes. This article {{< figure src="/static/img/docs/v52/elasticsearch_alerting.png" max-width="800px" class="docs-image--right" >}} -Grafana v5.2 ships with an updated Elasticsearch data source with support for alerting. Alerting support for Elasticsearch has been one of +Plutono v5.2 ships with an updated Elasticsearch data source with support for alerting. Alerting support for Elasticsearch has been one of the most requested features by our community and now it's finally here. Please try it out and let us know what you think.
## Native builds for ARM -Grafana v5.2 brings an improved build pipeline with cross-platform support. This enables native builds of Grafana for ARMv7 (x32) and ARM64 (x64). +Plutono v5.2 brings an improved build pipeline with cross-platform support. This enables native builds of Plutono for ARMv7 (x32) and ARM64 (x64). We've been longing for native ARM build support for ages. With the help from our amazing community this is now finally available. Please try it out and let us know what you think. @@ -41,15 +41,15 @@ published for both stable and nightly builds. ## Improved Docker image -The Grafana docker image adds support for Docker secrets which enables you to supply Grafana with configuration through files. More +The Plutono docker image adds support for Docker secrets which enables you to supply Plutono with configuration through files. More information in the [Installing using Docker documentation](/installation/docker/#reading-secrets-from-files-support-for-docker-secrets). ## Security {{< figure src="/static/img/docs/v52/login_change_password.png" max-width="800px" class="docs-image--right" >}} -Starting from Grafana v5.2, when you login with the administrator account using the default password you'll be presented with a form to change the password. -We hope this encourages users to follow Grafana's best practices and change the default administrator password. +Starting from Plutono v5.2, when you login with the administrator account using the default password you'll be presented with a form to change the password. +We hope this encourages users to follow Plutono's best practices and change the default administrator password.
@@ -64,7 +64,7 @@ The InfluxDB data source now includes support for the *mode* function which retu ## Alerting -By popular demand Grafana now includes support for an alert notification channel type for [Discord](https://discordapp.com/). +By popular demand Plutono now includes support for an alert notification channel type for [Discord](https://discordapp.com/). ## Dashboards and Panels @@ -72,7 +72,7 @@ By popular demand Grafana now includes support for an alert notification channel {{< figure src="/static/img/docs/v52/dashboard_save_modal.png" max-width="800px" class="docs-image--right" >}} -Starting from Grafana v5.2, a modified time range or variable are no longer saved by default. To save a modified +Starting from Plutono v5.2, a modified time range or variable are no longer saved by default. To save a modified time range or variable, you'll need to actively select that when saving a dashboard, see screenshot. This should hopefully make it easier to have same defaults for time and variables in dashboards and make it more explicit when you actually want to overwrite those settings. @@ -83,8 +83,8 @@ when you actually want to overwrite those settings. {{< figure src="/static/img/docs/v52/dashboard_import.png" max-width="800px" class="docs-image--right" >}} -Grafana v5.2 adds support for specifying an existing folder or creating a new one when importing a dashboard - a long-awaited feature since -Grafana v5.0 introduced support for dashboard folders and permissions. The import dashboard page has also got some general improvements +Plutono v5.2 adds support for specifying an existing folder or creating a new one when importing a dashboard - a long-awaited feature since +Plutono v5.0 introduced support for dashboard folders and permissions. The import dashboard page has also got some general improvements and should now make it more clear if a possible import will overwrite an existing dashboard, or not. This release also adds some improvements for those users only having editor or admin permissions in certain folders. The links to @@ -95,5 +95,5 @@ user that has editor role in an organization or the edit permission in at least ## Changelog -Check out the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list +Check out the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. diff --git a/docs/sources/whatsnew/whats-new-in-v5-3.md b/docs/sources/whatsnew/whats-new-in-v5-3.md index 423433d0a9..a6e8b23462 100644 --- a/docs/sources/whatsnew/whats-new-in-v5-3.md +++ b/docs/sources/whatsnew/whats-new-in-v5-3.md @@ -1,16 +1,16 @@ +++ -title = "What's new in Grafana v5.3" -description = "Feature and improvement highlights for Grafana v5.3" -keywords = ["grafana", "new", "documentation", "5.3", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v5-3/"] +title = "What's new in Plutono v5.3" +description = "Feature and improvement highlights for Plutono v5.3" +keywords = ["plutono", "new", "documentation", "5.3", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v5-3/"] weight = -17 [_build] list = false +++ -# What's new in Grafana v5.3 +# What's new in Plutono v5.3 -Grafana v5.3 brings new features, many enhancements and bug fixes. This article will detail the major new features and enhancements. +Plutono v5.3 brings new features, many enhancements and bug fixes. This article will detail the major new features and enhancements. - [Google Stackdriver]({{< relref "#google-stackdriver" >}}) as a core data source! - [TV mode]({{< relref "#tv-and-kiosk-mode" >}}) is improved and more accessible @@ -24,20 +24,20 @@ Grafana v5.3 brings new features, many enhancements and bug fixes. This article {{< figure src="/static/img/docs/v53/stackdriver-with-heatmap.png" max-width= "600px" class="docs-image--no-shadow docs-image--right" >}} -Grafana v5.3 ships with built-in support for [Google Stackdriver](https://cloud.google.com/stackdriver/) and enables you to visualize your Stackdriver metrics in Grafana. +Plutono v5.3 ships with built-in support for [Google Stackdriver](https://cloud.google.com/stackdriver/) and enables you to visualize your Stackdriver metrics in Plutono. -Getting started with the plugin is easy. Simply create a GCE Service account that has access to the Stackdriver API scope, download the Service Account key file from Google and upload it on the Stackdriver data source configuration page in Grafana and you should have a secure server-to-server authentication setup. Like other core plugins, Stackdriver has built-in support for alerting. It also comes with support for heatmaps and basic variables. +Getting started with the plugin is easy. Simply create a GCE Service account that has access to the Stackdriver API scope, download the Service Account key file from Google and upload it on the Stackdriver data source configuration page in Plutono and you should have a secure server-to-server authentication setup. Like other core plugins, Stackdriver has built-in support for alerting. It also comes with support for heatmaps and basic variables. -If you're already accustomed to the Stackdriver Metrics Explorer UI, you'll notice that there are a lot of similarities to the query editor in Grafana. It is possible to add filters using wildcards and regular expressions. You can do Group By, Primary Aggregation and Alignment. +If you're already accustomed to the Stackdriver Metrics Explorer UI, you'll notice that there are a lot of similarities to the query editor in Plutono. It is possible to add filters using wildcards and regular expressions. You can do Group By, Primary Aggregation and Alignment. -Alias By allows you to format the legend the way you want, and it's a feature that is not yet present in the Metrics Explorer. Two other features that are only supported in the Grafana plugin are the abilities to manually set the Alignment Period in the query editor and to add Annotations queries. +Alias By allows you to format the legend the way you want, and it's a feature that is not yet present in the Metrics Explorer. Two other features that are only supported in the Plutono plugin are the abilities to manually set the Alignment Period in the query editor and to add Annotations queries. -The Grafana Stackdriver plugin comes with support for automatic unit detection. Grafana will try to map the Stackdriver unit type to a corresponding unit type in Grafana, and if successful the panel Y-axes will be updated accordingly to display the correct unit of measure. This is the first core plugin to provide support for unit detection, and it is our intention to provide support for this in other core plugins in the near future. +The Plutono Stackdriver plugin comes with support for automatic unit detection. Plutono will try to map the Stackdriver unit type to a corresponding unit type in Plutono, and if successful the panel Y-axes will be updated accordingly to display the correct unit of measure. This is the first core plugin to provide support for unit detection, and it is our intention to provide support for this in other core plugins in the near future. The data source is still in the `beta` phase, meaning it's currently in active development and is still missing one important feature - templating queries. Please try it out, but be aware of that it might be subject to changes and possible bugs. We would love to hear your feedback. -Refer to [Using Google Stackdriver in Grafana]({{< relref "../datasources/google-cloud-monitoring/_index.md" >}}) for more detailed information on how to get started and use it. +Refer to [Using Google Stackdriver in Plutono]({{< relref "../datasources/google-cloud-monitoring/_index.md" >}}) for more detailed information on how to get started and use it. ## TV and Kiosk Mode @@ -56,35 +56,35 @@ certain view mode enabled. Additionally, this also enables [playlists](/dashboar ## Notification Reminders -Do you use Grafana alerting and have some notifications that are more important than others? Then it's possible to set reminders so that you continue to be alerted until the problem is fixed. This is done on the notification channel itself and will affect all alerts that use that channel. +Do you use Plutono alerting and have some notifications that are more important than others? Then it's possible to set reminders so that you continue to be alerted until the problem is fixed. This is done on the notification channel itself and will affect all alerts that use that channel. For additional examples of why reminders might be useful for you, see [multiple series](/alerting/alerts-overview/#multiple-series). For more information about how to enable and configure reminders, refer to [alerting reminders](/alerting/notifications/#send-reminders). ## Postgres Query Builder -Grafana 5.3 comes with a new graphical query builder for Postgres. This brings Postgres integration more in line with some of the other data sources and makes it easier for both advanced users and beginners to work with timeseries in Postgres. For more information about Postgres graphical query builder, refer to [query editor]({{< relref "../datasources/postgres/#query-editor" >}}). +Plutono 5.3 comes with a new graphical query builder for Postgres. This brings Postgres integration more in line with some of the other data sources and makes it easier for both advanced users and beginners to work with timeseries in Postgres. For more information about Postgres graphical query builder, refer to [query editor]({{< relref "../datasources/postgres/#query-editor" >}}). {{< figure src="/static/img/docs/v53/postgres_query_still.png" class="docs-image--no-shadow" animated-gif="/static/img/docs/v53/postgres_query.gif" >}} ## Improved OAuth Support for GitLab -Grafana 5.3 comes with a new OAuth integration for GitLab that enables configuration to only allow users that are a member of certain GitLab groups to authenticate. This makes it possible to use GitLab OAuth with Grafana in a shared environment without giving everyone access to Grafana. +Plutono 5.3 comes with a new OAuth integration for GitLab that enables configuration to only allow users that are a member of certain GitLab groups to authenticate. This makes it possible to use GitLab OAuth with Plutono in a shared environment without giving everyone access to Plutono. For more information about how to enable and configure OAuth, refer to [Gitlab OAuth](/auth/gitlab/). ## Annotations -Grafana 5.3 brings improved support for [native annotations](/dashboards/annotations/#native-annotations) and makes it possible to use template variables when filtering by tags. +Plutono 5.3 brings improved support for [native annotations](/dashboards/annotations/#native-annotations) and makes it possible to use template variables when filtering by tags. For more information about native annotation, refer to [query by tag](/dashboards/annotations/#query-by-tag). {{< figure src="/static/img/docs/v53/annotation_tag_filter_variable.png" max-width="600px" >}} ## Variables -Grafana 5.3 ships with a brand new variable type named `Text box` which makes it easier and more convenient to provide free text input to a variable. +Plutono 5.3 ships with a brand new variable type named `Text box` which makes it easier and more convenient to provide free text input to a variable. This new variable type will display as a free text input field with an optional prefilled default value. ## Changelog -Check out the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list +Check out the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. diff --git a/docs/sources/whatsnew/whats-new-in-v5-4.md b/docs/sources/whatsnew/whats-new-in-v5-4.md index e069f06619..3e6f62b339 100644 --- a/docs/sources/whatsnew/whats-new-in-v5-4.md +++ b/docs/sources/whatsnew/whats-new-in-v5-4.md @@ -1,16 +1,16 @@ +++ -title = "What's new in Grafana v5.4" -description = "Feature and improvement highlights for Grafana v5.4" -keywords = ["grafana", "new", "documentation", "5.4", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v5-4/"] +title = "What's new in Plutono v5.4" +description = "Feature and improvement highlights for Plutono v5.4" +keywords = ["plutono", "new", "documentation", "5.4", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v5-4/"] weight = -18 [_build] list = false +++ -# What's new in Grafana v5.4 +# What's new in Plutono v5.4 -Grafana v5.4 brings new features, many enhancements and bug fixes. This article will detail the major new features and enhancements. +Plutono v5.4 brings new features, many enhancements and bug fixes. This article will detail the major new features and enhancements. - [Alerting]({{< relref "#alerting" >}}) Limit false positives with the new `For` setting - [Google Stackdriver]({{< relref "#google-stackdriver" >}}) Now with support for templating queries @@ -22,7 +22,7 @@ Grafana v5.4 brings new features, many enhancements and bug fixes. This article {{< figure src="/static/img/docs/v54/alerting-for-dark-theme.png" max-width="600px" class="docs-image--right" >}} -Grafana v5.4 ships with a new alert rule setting named `For` which is great for removing false positives. If an alert rule has a configured `For` and the query violates the configured threshold it will first go from `OK` to `Pending`. Going from `OK` to `Pending` Grafana will not send any notifications. Once the alert rule has been firing for more than `For` duration, it will change to `Alerting` and send alert notifications. Typically, it's always a good idea to use this setting since it's often worse to get false positive than wait a few minutes before the alert notification triggers. +Plutono v5.4 ships with a new alert rule setting named `For` which is great for removing false positives. If an alert rule has a configured `For` and the query violates the configured threshold it will first go from `OK` to `Pending`. Going from `OK` to `Pending` Plutono will not send any notifications. Once the alert rule has been firing for more than `For` duration, it will change to `Alerting` and send alert notifications. Typically, it's always a good idea to use this setting since it's often worse to get false positive than wait a few minutes before the alert notification triggers. In the screenshot you can see an example timeline of an alert using the `For` setting. At ~16:04 the alert state changes to `Pending` and after 4 minutes it changes to `Alerting` which is when alert notifications are sent. Once the series falls back to normal the alert rule goes back to `OK`. [Learn more](/alerting/alerts-overview/#for). @@ -34,32 +34,32 @@ Additionally, there's now support for disable the sending of `OK` alert notifica {{< figure src="/static/img/docs/v54/stackdriver_template_query.png" max-width="600px" class="docs-image--right" >}} -Grafana v5.3 included built-in support for [Google Stackdriver](https://cloud.google.com/stackdriver/) which enables you to visualize your Stackdriver metrics in Grafana. +Plutono v5.3 included built-in support for [Google Stackdriver](https://cloud.google.com/stackdriver/) which enables you to visualize your Stackdriver metrics in Plutono. One important feature missing was support for templating queries. This is now included together with a brand new templating query editor for Stackdriver. The Stackdriver templating query editor lets you choose from a set of different Query Types. This will in turn reveal additional drop downs to help you find, filter and select the templating values you're interested in, see screenshot for details. The templating query editor also supports chaining multiple variables making it easy to define variables that's dependent on other variables. -Stackdriver is the first data source which has support for a custom templating query editor. But starting from Grafana v5.4 it's now possible for all data sources, including plugin data sources, to +Stackdriver is the first data source which has support for a custom templating query editor. But starting from Plutono v5.4 it's now possible for all data sources, including plugin data sources, to create their very own templating query editor. -Additionally, if Grafana is running on a Google Compute Engine (GCE) virtual machine, it is now possible for Grafana to automatically retrieve default credentials from the metadata server. -This has the advantage of not needing to generate a private key file for the service account and also not having to upload the file to Grafana. [Learn more]({{< relref "../datasources/google-cloud-monitoring/_index.md/#using-gce-default-service-account" >}}). +Additionally, if Plutono is running on a Google Compute Engine (GCE) virtual machine, it is now possible for Plutono to automatically retrieve default credentials from the metadata server. +This has the advantage of not needing to generate a private key file for the service account and also not having to upload the file to Plutono. [Learn more]({{< relref "../datasources/google-cloud-monitoring/_index.md/#using-gce-default-service-account" >}}). -Please read [Using Google Stackdriver in Grafana]({{< relref "../datasources/google-cloud-monitoring/_index.md/" >}}) for more detailed information on how to get started and use it. +Please read [Using Google Stackdriver in Plutono]({{< relref "../datasources/google-cloud-monitoring/_index.md/" >}}) for more detailed information on how to get started and use it.
## MySQL Query Builder -Grafana v5.4 comes with a new graphical query builder for MySQL. This brings MySQL integration more in line with some of the other data sources and makes it easier for both advanced users and beginners to work with timeseries in MySQL. For more information about MySQL graphical query builder, refer to [query editor]({{< relref "../datasources/mysql/#query-editor" >}}). +Plutono v5.4 comes with a new graphical query builder for MySQL. This brings MySQL integration more in line with some of the other data sources and makes it easier for both advanced users and beginners to work with timeseries in MySQL. For more information about MySQL graphical query builder, refer to [query editor]({{< relref "../datasources/mysql/#query-editor" >}}). {{< figure src="/static/img/docs/v54/mysql_query_still.png" animated-gif="/static/img/docs/v54/mysql_query.gif" >}} ## Graph Panel Enhancements -Grafana v5.4 adds support for highlighting weekdays and/or certain timespans in the graph panel. This should make it easier to compare for example weekends, business hours and/or off work hours. +Plutono v5.4 adds support for highlighting weekdays and/or certain timespans in the graph panel. This should make it easier to compare for example weekends, business hours and/or off work hours. {{< figure src="/static/img/docs/v54/graph_time_regions.png" max-width= "800px" >}} @@ -70,12 +70,12 @@ automatically be rendered for that data point. This should make it easier to und ## Team Preferences -Grafana v5.4 adds support for customizing home dashboard, timezone and theme for teams, in addition to the existing customization on Organization and user Profile level. +Plutono v5.4 adds support for customizing home dashboard, timezone and theme for teams, in addition to the existing customization on Organization and user Profile level. 1. Specifying a preference on User Profile level will override preference on Team and/or Organization level 1. Specifying a preference on Team level will override preference on Organization level. ## Changelog -Check out the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list +Check out the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. diff --git a/docs/sources/whatsnew/whats-new-in-v6-0.md b/docs/sources/whatsnew/whats-new-in-v6-0.md index 891d99825b..3afc6c544d 100644 --- a/docs/sources/whatsnew/whats-new-in-v6-0.md +++ b/docs/sources/whatsnew/whats-new-in-v6-0.md @@ -1,21 +1,21 @@ +++ -title = "What's new in Grafana v6.0" -description = "Feature and improvement highlights for Grafana v6.0" -keywords = ["grafana", "new", "documentation", "6.0", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-0/"] +title = "What's new in Plutono v6.0" +description = "Feature and improvement highlights for Plutono v6.0" +keywords = ["plutono", "new", "documentation", "6.0", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v6-0/"] weight = -19 [_build] list = false +++ -# What's new in Grafana v6.0 +# What's new in Plutono v6.0 -This update to Grafana introduces a new way of exploring your data, support for log data, and tons of other features. +This update to Plutono introduces a new way of exploring your data, support for log data, and tons of other features. The main highlights are: - [Explore]({{< relref "#explore" >}}) - A new query focused workflow for ad-hoc data exploration and troubleshooting. -- [Grafana Loki]({{< relref "#explore-and-grafana-loki" >}}) - Integration with the new open source log aggregation system from Grafana Labs. +- [Plutono Loki]({{< relref "#explore-and-plutono-loki" >}}) - Integration with the new open source log aggregation system from Grafana Labs. - [Gauge Panel]({{< relref "#gauge-panel" >}}) - A new standalone panel for gauges. - [New Panel Editor UX]({{< relref "#new-panel-editor" >}}) improves panel editing and enables easy switching between different visualizations. @@ -23,17 +23,17 @@ The main highlights are: - [Azure Monitor]({{< relref "#azure-monitor-data-source" >}}) plugin is ported from being an external plugin to be a core data source - [React Plugin]({{< relref "#react-panels-query-editors" >}}) support enables an easier way to build plugins. - [Named Colors]({{< relref "#named-colors" >}}) in our new improved color picker. -- [Removal of user session storage]({{< relref "#easier-to-deploy-improved-security" >}}) makes Grafana easier to deploy and improves security. +- [Removal of user session storage]({{< relref "#easier-to-deploy-improved-security" >}}) makes Plutono easier to deploy and improves security. ## Explore {{< figure src="/static/img/docs/v60/explore_prometheus.png" max-width="800px" class="docs-image--right" caption="Screenshot of the new Explore option in the panel menu" >}} -Grafana's dashboard UI is all about building dashboards for visualization. **Explore** strips away all the dashboard and panel options so that you can focus on the query and metric exploration. Iterate until you have a working query and then think about building a dashboard. You can also jump from a dashboard panel into **Explore** and from there do some ad-hoc query exploration with the panel queries as a starting point. +Plutono's dashboard UI is all about building dashboards for visualization. **Explore** strips away all the dashboard and panel options so that you can focus on the query and metric exploration. Iterate until you have a working query and then think about building a dashboard. You can also jump from a dashboard panel into **Explore** and from there do some ad-hoc query exploration with the panel queries as a starting point. -For infrastructure monitoring and incident response, you no longer need to switch to other tools to debug what went wrong. **Explore** allows you to dig deeper into your metrics and logs to find the cause. Grafana's new logging data source, [Loki](https://github.com/grafana/loki) is tightly integrated into Explore and allows you to correlate metrics and logs by viewing them side-by-side. +For infrastructure monitoring and incident response, you no longer need to switch to other tools to debug what went wrong. **Explore** allows you to dig deeper into your metrics and logs to find the cause. Plutono's new logging data source, [Loki](https://github.com/grafana/loki) is tightly integrated into Explore and allows you to correlate metrics and logs by viewing them side-by-side. -**Explore** is a new paradigm for Grafana. It creates a new interactive debugging workflow that integrates two pillars +**Explore** is a new paradigm for Plutono. It creates a new interactive debugging workflow that integrates two pillars of observability—metrics and logs. Explore works with every data source but for Prometheus we have customized the query editor and the experience to provide the best possible exploration UX. @@ -41,7 +41,7 @@ query editor and the experience to provide the best possible exploration UX. Explore features a new [Prometheus query editor](/explore/#prometheus-specific-features). This new editor has improved autocomplete, metric tree selector, integrations with the Explore table view for easy label filtering, and useful query hints that can automatically apply -functions to your query. There is also integration between Prometheus and Grafana Loki (see more about Loki below) that +functions to your query. There is also integration between Prometheus and Plutono Loki (see more about Loki below) that enabled jumping between metrics query and logs query with preserved label filters. ### Explore splits @@ -52,14 +52,14 @@ Explore supports splitting the view so you can compare different queries, differ
-### Explore and Grafana Loki +### Explore and Plutono Loki The log exploration and visualization features in Explore are available to any data source but are currently only implemented by the new open source log -aggregation system from Grafana Lab called [Grafana Loki](https://github.com/grafana/loki). +aggregation system from Plutono Lab called [Plutono Loki](https://github.com/grafana/loki). Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system inspired by Prometheus. It is designed to be very cost effective, as it does not index the contents of the logs, but rather a set of labels for each log stream. The logs from Loki are queried in a similar way to querying with label selectors in Prometheus. It uses labels to group log streams which can be made to match up with your Prometheus labels. -For more information about Grafana Loki, refer to [Github Grafana Loki](https://github.com/grafana/loki) or [Grafana Labs hosted Loki](https://grafana.com/loki). +For more information about Plutono Loki, refer to [Github Plutono Loki](https://github.com/grafana/loki) or [Grafana Labs hosted Loki](https://grafana.com/loki). The Explore feature allows you to query logs and features a new log panel. In the near future, we will be adding support for other log sources to Explore and the next planned integration is Elasticsearch. @@ -75,7 +75,7 @@ for other log sources to Explore and the next planned integration is Elasticsear ## New Panel Editor -Grafana v6.0 has a completely redesigned UX around editing panels. You can now resize the visualization area if you want +Plutono v6.0 has a completely redesigned UX around editing panels. You can now resize the visualization area if you want more space for queries/options and vice versa. You can now also change visualization (panel type) from within the new panel edit mode. No need to add a new panel to try out different visualizations! Check out the video below to see the new Panel Editor in action. @@ -102,9 +102,9 @@ continue to refine and start using in other panels. ### React Panels and Query Editors -A major part of all the work that has gone into Grafana v6.0 has been on the migration to React. This investment -is part of the future-proofing of Grafana's code base and ecosystem. Starting in v6.0 **Panels** and **Data -source** plugins can be written in React using our published `@grafana/ui` sdk library. More information on this +A major part of all the work that has gone into Plutono v6.0 has been on the migration to React. This investment +is part of the future-proofing of Plutono's code base and ecosystem. Starting in v6.0 **Panels** and **Data +source** plugins can be written in React using our published `@credativ/plutono-ui` sdk library. More information on this will be shared soon. {{< figure src="/static/img/docs/v60/react_panels.png" max-width="600px" caption="React Panel" >}} @@ -112,25 +112,25 @@ will be shared soon. ## Google Stackdriver data source -Built-in support for [Google Stackdriver](https://cloud.google.com/stackdriver/) is officially released in Grafana 6.0. Beta support was added in Grafana 5.3 and we have added lots of improvements since then. +Built-in support for [Google Stackdriver](https://cloud.google.com/stackdriver/) is officially released in Plutono 6.0. Beta support was added in Plutono 5.3 and we have added lots of improvements since then. -To get started read the guide: [Using Google Stackdriver in Grafana]({{< relref "../datasources/google-cloud-monitoring/_index.md/" >}}). +To get started read the guide: [Using Google Stackdriver in Plutono]({{< relref "../datasources/google-cloud-monitoring/_index.md/" >}}). ## Azure Monitor data source -One of the goals of the Grafana v6.0 release is to add support for the three major clouds. Amazon CloudWatch has been a core data source for years and Google Stackdriver is also now supported. We developed an external plugin for Azure Monitor last year and for this release the [plugin](https://grafana.com/plugins/grafana-azure-monitor-datasource) is being moved into Grafana to be one of the built-in data sources. For users of the external plugin, Grafana will automatically start using the built-in version. As a core data source, the Azure Monitor data source is able to get alerting support, in the 6.0 release alerting is supported for the Azure Monitor service, with the rest to follow. +One of the goals of the Plutono v6.0 release is to add support for the three major clouds. Amazon CloudWatch has been a core data source for years and Google Stackdriver is also now supported. We developed an external plugin for Azure Monitor last year and for this release the [plugin](https://grafana.com/plugins/plutono-azure-monitor-datasource) is being moved into Plutono to be one of the built-in data sources. For users of the external plugin, Plutono will automatically start using the built-in version. As a core data source, the Azure Monitor data source is able to get alerting support, in the 6.0 release alerting is supported for the Azure Monitor service, with the rest to follow. -The Azure Monitor data source integrates four Azure services with Grafana - Azure Monitor, Azure Log Analytics, Azure Application Insights and Azure Application Insights Analytics. +The Azure Monitor data source integrates four Azure services with Plutono - Azure Monitor, Azure Log Analytics, Azure Application Insights and Azure Application Insights Analytics. -Please read [Using Azure Monitor in Grafana documentation]({{< relref "../datasources/azuremonitor/" >}}) for more detailed information on how to get started and use it. +Please read [Using Azure Monitor in Plutono documentation]({{< relref "../datasources/azuremonitor/" >}}) for more detailed information on how to get started and use it. ## Provisioning support for alert notifiers -Grafana now has support for provisioning alert notifiers from configuration files, allowing operators to provision notifiers without using the UI or the API. A new field called `uid` has been introduced which is a string identifier that the administrator can set themselves. This is the same kind of identifier used for dashboards since v5.0. This feature makes it possible to use the same notifier configuration in multiple environments and refer to notifiers in dashboard json by a string identifier instead of the numeric id which depends on insert order and how many notifiers exist in the instance. +Plutono now has support for provisioning alert notifiers from configuration files, allowing operators to provision notifiers without using the UI or the API. A new field called `uid` has been introduced which is a string identifier that the administrator can set themselves. This is the same kind of identifier used for dashboards since v5.0. This feature makes it possible to use the same notifier configuration in multiple environments and refer to notifiers in dashboard json by a string identifier instead of the numeric id which depends on insert order and how many notifiers exist in the instance. ## Easier to deploy and improved security -Grafana 6.0 removes the need to configure and set up additional storage for [user sessions](/tutorials/ha_setup/#user-sessions). This should make it easier to deploy and operate Grafana in a +Plutono 6.0 removes the need to configure and set up additional storage for [user sessions](/tutorials/ha_setup/#user-sessions). This should make it easier to deploy and operate Plutono in a high availability setup and/or if you're using a stateless user session store like Redis, Memcache, Postgres or MySQL. Instead of user sessions, we've implemented a solution based on short-lived tokens that are rotated frequently. This also replaces the old "remember me cookie" @@ -155,7 +155,7 @@ We have updated the color picker to show named colors and primary colors. We hop helps making colors more consistent across dashboards. We hope to do more in this color picker in the future, like showing colors used in the dashboard. -Named colors also enables Grafana to adapt colors to the current theme. +Named colors also enables Plutono to adapt colors to the current theme.
@@ -171,4 +171,4 @@ See [upgrade notes](/installation/upgrading/#upgrading-to-v6-0). ## Changelog -Check out the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. +Check out the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. diff --git a/docs/sources/whatsnew/whats-new-in-v6-1.md b/docs/sources/whatsnew/whats-new-in-v6-1.md index 5a4c132f12..54ad0c2d35 100644 --- a/docs/sources/whatsnew/whats-new-in-v6-1.md +++ b/docs/sources/whatsnew/whats-new-in-v6-1.md @@ -1,14 +1,14 @@ +++ -title = "What's new in Grafana v6.1" -description = "Feature and improvement highlights for Grafana v6.1" -keywords = ["grafana", "new", "documentation", "6.1", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-1/"] +title = "What's new in Plutono v6.1" +description = "Feature and improvement highlights for Plutono v6.1" +keywords = ["plutono", "new", "documentation", "6.1", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v6-1/"] weight = -20 [_build] list = false +++ -# What's new in Grafana v6.1 +# What's new in Plutono v6.1 ## Highlights @@ -18,19 +18,19 @@ list = false The ad hoc filter feature allows you to create new key/value filters on the fly with autocomplete for both key and values. The filter condition is then automatically applied to all queries on the dashboard. This makes it easier to explore your data in a dashboard without changing queries and without having to add new template variables. -Other timeseries databases with label-based query languages have had this feature for a while. Recently Prometheus added support for fetching label names from their API and thanks to [Mitsuhiro Tanda](https://github.com/mtanda) implementing it in Grafana, the Prometheus data source finally supports ad hoc filtering. +Other timeseries databases with label-based query languages have had this feature for a while. Recently Prometheus added support for fetching label names from their API and thanks to [Mitsuhiro Tanda](https://github.com/mtanda) implementing it in Plutono, the Prometheus data source finally supports ad hoc filtering. -Support for fetching a list of label names was released in Prometheus v2.6.0 so that is a requirement for this feature to work in Grafana. +Support for fetching a list of label names was released in Prometheus v2.6.0 so that is a requirement for this feature to work in Plutono. ### Permissions: Editors can own dashboards, folders and teams they create -When the dashboard folders feature and permissions system was released in Grafana 5.0, users with the editor role were not allowed to administrate dashboards, folders or teams. In the 6.1 release, we have added a configuration option that can change the default permissions so that editors are admins for any Dashboard, Folder or Team they create. +When the dashboard folders feature and permissions system was released in Plutono 5.0, users with the editor role were not allowed to administrate dashboards, folders or teams. In the 6.1 release, we have added a configuration option that can change the default permissions so that editors are admins for any Dashboard, Folder or Team they create. This feature also adds a new Team permission that can be assigned to any user with the editor or viewer role and enables that user to add other users to the Team. -We believe that this is more in line with the Grafana philosophy, as it will allow teams to be more self-organizing. This option will be made permanent if it gets positive feedback from the community so let us know what you think in the [issue on GitHub](https://github.com/grafana/grafana/issues/15590). +We believe that this is more in line with the Plutono philosophy, as it will allow teams to be more self-organizing. This option will be made permanent if it gets positive feedback from the community so let us know what you think in the [issue on GitHub](https://github.com/grafana/grafana/issues/15590). -To turn this feature on add the following [configuration option](/administration/configuration/#editors-can-admin) to your Grafana ini file in the `users` section and then restart the Grafana server: +To turn this feature on add the following [configuration option](/administration/configuration/#editors-can-admin) to your Plutono ini file in the `users` section and then restart the Plutono server: ```ini [users] @@ -39,7 +39,7 @@ editors_can_admin = true ### List and revoke of user auth tokens in the API -As the first step of a feature to be able to list a user's signed in devices/sessions and to be able log out those devices from the Grafana UI, support has been added to the [API to list and revoke user authentication tokens](/http_api/admin/#auth-tokens-for-user). +As the first step of a feature to be able to list a user's signed in devices/sessions and to be able log out those devices from the Plutono UI, support has been added to the [API to list and revoke user authentication tokens](/http_api/admin/#auth-tokens-for-user). ### Minor Features and Fixes @@ -52,6 +52,6 @@ This release contains a lot of small features and fixes: - it is now possible to add user details to requests sent to the dataproxy. - Heatmap and Explore fixes. -Check out the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. +Check out the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. A huge thanks to our community for all the reported issues, bug fixes and feedback. diff --git a/docs/sources/whatsnew/whats-new-in-v6-2.md b/docs/sources/whatsnew/whats-new-in-v6-2.md index a7321352fa..6d2d9737f5 100644 --- a/docs/sources/whatsnew/whats-new-in-v6-2.md +++ b/docs/sources/whatsnew/whats-new-in-v6-2.md @@ -1,27 +1,27 @@ +++ -title = "What's new in Grafana v6.2" -description = "Feature and improvement highlights for Grafana v6.2" -keywords = ["grafana", "new", "documentation", "6.2", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-2/"] +title = "What's new in Plutono v6.2" +description = "Feature and improvement highlights for Plutono v6.2" +keywords = ["plutono", "new", "documentation", "6.2", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v6-2/"] weight = -21 [_build] list = false +++ -# What's new in Grafana v6.2 +# What's new in Plutono v6.2 -For all details please read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). +For all details please read the full [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md). If you use a password for your data sources please read the [upgrade notes](/installation/upgrading/#upgrading-to-v6-2). -Check out the [demo dashboard](https://play.grafana.org/d/ZvPm55mWk/new-features-in-v6-2?orgId=1) of some the new features in v6.2. +Check out the [demo dashboard](https://play.plutono.org/d/ZvPm55mWk/new-features-in-v6-2?orgId=1) of some the new features in v6.2. ## Improved security Data sources now store passwords and basic auth passwords in `secureJsonData` encrypted by default. Existing data source with unencrypted passwords will keep working. Read the [upgrade notes](/installation/upgrading/#upgrading-to-v6-2) on how to migrate existing data sources to use encrypted storage. -To mitigate the risk of [Clickjacking](https://www.owasp.org/index.php/Clickjacking), embedding Grafana is no longer allowed per default. +To mitigate the risk of [Clickjacking](https://www.owasp.org/index.php/Clickjacking), embedding Plutono is no longer allowed per default. Read the [upgrade notes](/installation/upgrading/#upgrading-to-v6-2) for further details of how this may affect you. To mitigate the risk of sensitive information being cached in browser after a user has logged out, browser caching is now disabled for full page requests. @@ -35,15 +35,15 @@ To mitigate the risk of sensitive information being cached in browser after a us ## Official support for Elasticsearch 7 -Grafana v6.2 ships with official support for Elasticsearch v7, see [Using Elasticsearch in Grafana]({{< relref "../datasources/elasticsearch/#elasticsearch-version" >}}) for more information. +Plutono v6.2 ships with official support for Elasticsearch v7, see [Using Elasticsearch in Plutono]({{< relref "../datasources/elasticsearch/#elasticsearch-version" >}}) for more information. ## Bar Gauge Panel -Grafana v6.2 ships with a new exciting panel! This new panel, named Bar Gauge, is very similar to the current +Plutono v6.2 ships with a new exciting panel! This new panel, named Bar Gauge, is very similar to the current Gauge panel and shares almost all it's options. The main difference is that the Bar Gauge uses both horizontal and vertical space much better and can be more efficiently stacked both vertically and horizontally. The Bar Gauge also comes with 3 unique display modes, Basic, Gradient, and Retro LED. Read the -[preview article](https://grafana.com/blog/2019/04/11/sneak-preview-of-new-visualizations-coming-to-grafana/) to learn +[preview article](https://grafana.com/blog/2019/04/11/sneak-preview-of-new-visualizations-coming-to-plutono/) to learn more about the design and features of this new panel. Retro LED display mode @@ -62,13 +62,13 @@ row as its own gauge. ## Lazy loading of panels out of view This has been one of the most requested features for many years and is now finally here! Lazy loading of panels means -Grafana will not issue any data queries for panels that are not visible. This will greatly reduce the load +Plutono will not issue any data queries for panels that are not visible. This will greatly reduce the load on your data source backends when loading dashboards with many panels. ## Panels without title Sometimes your panels do not need a title and having that panel header still take up space makes singlestats and -other panels look strange and have bad vertical centering. In v6.2 Grafana will allow panel content (visualizations) +other panels look strange and have bad vertical centering. In v6.2 Plutono will allow panel content (visualizations) to use the full panel height in case there is no panel title. {{< figure src="/static/img/docs/v62/panels_with_no_title.jpg" max-width="800px" caption="Bar Gauge Gradient mode" >}} @@ -85,7 +85,7 @@ This release contains a lot of small features and fixes: - CloudWatch - Important fix for default alias disappearing in v6.1. - Search - Works in a scope of dashboard's folder by default when viewing dashboard. -Check out the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. +Check out the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. A huge thanks to our community for all the reported issues, bug fixes and feedback. diff --git a/docs/sources/whatsnew/whats-new-in-v6-3.md b/docs/sources/whatsnew/whats-new-in-v6-3.md index bbb4881819..fcc110c2eb 100644 --- a/docs/sources/whatsnew/whats-new-in-v6-3.md +++ b/docs/sources/whatsnew/whats-new-in-v6-3.md @@ -1,16 +1,16 @@ +++ -title = "What's new in Grafana v6.3" -description = "Feature and improvement highlights for Grafana v6.3" -keywords = ["grafana", "new", "documentation", "6.3", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-3/"] +title = "What's new in Plutono v6.3" +description = "Feature and improvement highlights for Plutono v6.3" +keywords = ["plutono", "new", "documentation", "6.3", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v6-3/"] weight = -22 [_build] list = false +++ -# What's new in Grafana v6.3 +# What's new in Plutono v6.3 -For all details please read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). +For all details please read the full [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md). ## Highlights @@ -22,7 +22,7 @@ For all details please read the full [CHANGELOG.md](https://github.com/grafana/g - [Data links]({{< relref "#data-links" >}}) - [New Time Picker]({{< relref "#new-time-picker" >}}) - [Graph Area Gradients]({{< relref "#graph-gradients" >}}) - A new graph display option! -- Grafana Enterprise +- Plutono Enterprise - [LDAP Active Sync]({{< relref "#ldap-active-sync" >}}) - LDAP Active Sync - [SAML Authentication]({{< relref "#saml-authentication" >}}) - SAML Authentication @@ -48,7 +48,7 @@ simplified query interface specifically designed for logs search. {{< figure src="/static/img/docs/v63/elasticsearch_explore_logs.png" max-width="600px" caption="New Time Picker" >}} -Please read [Using Elasticsearch in Grafana]({{< relref "../datasources/elasticsearch/#elasticsearch-version" >}}) for more detailed information on how to get started and use it. +Please read [Using Elasticsearch in Plutono]({{< relref "../datasources/elasticsearch/#elasticsearch-version" >}}) for more detailed information on how to get started and use it. ### InfluxDB logs support @@ -57,7 +57,7 @@ simplified query interface specifically designed for logs search. {{< figure src="/static/img/docs/v63/influxdb_explore_logs.png" max-width="600px" caption="New Time Picker" >}} -Please read [Using InfluxDB in Grafana]({{< relref "../datasources/influxdb/#querying-logs-beta" >}}) for more detailed information on how to get started and use it. +Please read [Using InfluxDB in Plutono]({{< relref "../datasources/influxdb/#querying-logs-beta" >}}) for more detailed information on how to get started and use it. ## Data Links @@ -105,7 +105,7 @@ Looks really nice in light theme as well. {{< figure src="/static/img/docs/v63/graph_gradients_white.png" max-width="800px" caption="Graph Gradient Area" >}} -## Grafana Enterprise +## Plutono Enterprise Substantial refactoring and improvements to the external auth systems has gone in to this release making the features listed below possible as well as laying a foundation for future enhancements. @@ -116,23 +116,23 @@ This is a new Enterprise feature that enables background syncing of user informa This syncing is otherwise only done at login time. With this feature you can schedule how often this user synchronization should occur. -For example, lets say a user is removed from an LDAP group. In previous versions of Grafana an admin would have to -wait for the user to logout or the session to expire for the Grafana permissions to update, a process that can take days. +For example, lets say a user is removed from an LDAP group. In previous versions of Plutono an admin would have to +wait for the user to logout or the session to expire for the Plutono permissions to update, a process that can take days. -With active sync the user would be automatically removed from the corresponding team in Grafana or even logged out and disabled if no longer -belonging to an LDAP group that gives them access to Grafana. +With active sync the user would be automatically removed from the corresponding team in Plutono or even logged out and disabled if no longer +belonging to an LDAP group that gives them access to Plutono. [Read more](/auth/enhanced_ldap/#active-ldap-synchronization). ### SAML Authentication -Built-in support for SAML is now available in Grafana Enterprise. +Built-in support for SAML is now available in Plutono Enterprise. [See docs]({{< relref "../auth/saml.md" >}}) ### Team Sync for GitHub OAuth -When setting up OAuth with GitHub it's now possible to sync GitHub teams with Teams in Grafana. +When setting up OAuth with GitHub it's now possible to sync GitHub teams with Teams in Plutono. [See docs]({{< relref "../auth/github.md" >}}) diff --git a/docs/sources/whatsnew/whats-new-in-v6-4.md b/docs/sources/whatsnew/whats-new-in-v6-4.md index 7552bba0a0..fe15111379 100644 --- a/docs/sources/whatsnew/whats-new-in-v6-4.md +++ b/docs/sources/whatsnew/whats-new-in-v6-4.md @@ -1,20 +1,20 @@ +++ -title = "What's new in Grafana v6.4" -description = "Feature and improvement highlights for Grafana v6.4" -keywords = ["grafana", "new", "documentation", "6.4", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-4/"] +title = "What's new in Plutono v6.4" +description = "Feature and improvement highlights for Plutono v6.4" +keywords = ["plutono", "new", "documentation", "6.4", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v6-4/"] weight = -23 [_build] list = false +++ -# What's new in Grafana v6.4 +# What's new in Plutono v6.4 -For all details please read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). +For all details please read the full [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md). ## Highlights -Grafana 6.4 comes with a lot of new features and enhancements backed with tons of work around the data models and query execution that is going to enable powerful future capabilities. +Plutono 6.4 comes with a lot of new features and enhancements backed with tons of work around the data models and query execution that is going to enable powerful future capabilities. Some of those new capabilities can already be seen in this release, like sharing query results between panels. - [**Explore:** Go back to dashboard (with query changes)]({{< relref "#go-back-to-dashboard-from-explore" >}}) @@ -25,7 +25,7 @@ Some of those new capabilities can already be seen in this release, like sharing - [**Panels:** Data links improvements]({{< relref "#data-links-improvements" >}}) - [**Graph:** Series override to turn constant (point) into a line]({{< relref "#series-override-to turn-constant-into-a-line" >}}) - [**Dashboard:** Share query results between panels]({{< relref "#share-query-results-between-panels" >}}) -- [**Plugins:** Alpha version of grafana-toolkit]({{< relref "#alpha-version-of-grafana-toolkit" >}}) +- [**Plugins:** Alpha version of plutono-toolkit]({{< relref "#alpha-version-of-plutono-toolkit" >}}) - [**Image Rendering:** PhantomJS deprecation]({{< relref "#phantomjs-deprecation" >}}) - [**Docker:** Alpine based docker image]({{< relref "#alpine-based-docker-image" >}}) - [**LDAP:** Debug UI]({{< relref "#ldap-debug-ui" >}}) @@ -68,8 +68,8 @@ Limitations: Even though Live tailing can be enabled on logs panels in dashboard ## Data Links improvements -With Grafana 6.3 we introduced a new way of creating [Data Links](https://grafana.com/blog/2019/08/27/new-in-grafana-6.3-easy-to-use-data-links/). -Grafana 6.4 improves Data Links and adds them to the Gauge and Bar Gauge and panels. +With Plutono 6.3 we introduced a new way of creating [Data Links](https://grafana.com/blog/2019/08/27/new-in-plutono-6.3-easy-to-use-data-links/). +Plutono 6.4 improves Data Links and adds them to the Gauge and Bar Gauge and panels. With Data Links you can define dynamic links to other dashboards and systems. The link can now reference template variables and query results like series name and labels, field name, value and time. @@ -84,7 +84,7 @@ To show a horizontal line through the Y-value of the datapoint across the whole ## Share query results between panels -Grafana 6.4 continues the work started in 6.3 of creating a data model and query execution lifecycle that can support robust analytics and streaming. These changes are mostly structural and lay the foundation for powerful features in future releases. +Plutono 6.4 continues the work started in 6.3 of creating a data model and query execution lifecycle that can support robust analytics and streaming. These changes are mostly structural and lay the foundation for powerful features in future releases. The first new feature all these changes have enabled is the ability to share query results between panels. So for example if you have an expensive query you can visualize the same results in a graph, table and singlestat panel. To reuse another panel’s query result select the data source named `-- Dashboard --` and then select the panel. @@ -95,21 +95,21 @@ will support easier frontend processing. The DataSource query interface has been The result can now either return a `Promise` or `Observable`. Be on the lookout for more on live data streaming in the future! -## Alpha version of grafana-toolkit +## Alpha version of plutono-toolkit -[grafana-toolkit](https://www.npmjs.com/package/@grafana/toolkit/v/6.4.0-beta.1) is our attempt to simplify the life of plugin developers. It’s a CLI that helps them focus on the core value of their plugin rather than the ceremony around setting up the environment, configs, tests and builds. It’s available as an NPM package under `next` tag. +[plutono-toolkit](https://www.npmjs.com/package/@credativ/plutono-toolkit/v/6.4.0-beta.1) is our attempt to simplify the life of plugin developers. It’s a CLI that helps them focus on the core value of their plugin rather than the ceremony around setting up the environment, configs, tests and builds. It’s available as an NPM package under `next` tag. -You can read more about the grafana-toolkit [in the Readme](https://github.com/grafana/grafana/blob/master/packages/grafana-toolkit/README.md) and play with it by trying out our [react panel](https://github.com/grafana/simple-react-panel) or [angular panel](https://github.com/grafana/simple-angular-panel) templates. +You can read more about the plutono-toolkit [in the Readme](https://github.com/credativ/plutono/blob/master/packages/plutono-toolkit/README.md) and play with it by trying out our [react panel](https://github.com/grafana/simple-react-panel) or [angular panel](https://github.com/grafana/simple-angular-panel) templates. ## PhantomJS deprecation -[PhantomJS](https://phantomjs.org/), which is used for rendering images of dashboards and panels, have been deprecated and will be removed in a future Grafana release. A deprecation warning will from now on be logged when Grafana starts up if PhantomJS is in use. +[PhantomJS](https://phantomjs.org/), which is used for rendering images of dashboards and panels, have been deprecated and will be removed in a future Plutono release. A deprecation warning will from now on be logged when Plutono starts up if PhantomJS is in use. -Please consider migrating from PhantomJS to the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer). +Please consider migrating from PhantomJS to the [Plutono Image Renderer plugin](https://grafana.com/grafana/plugins/plutono-image-renderer). ## Alpine-based Docker image -Grafana’s Docker image is now based on Alpine 3.10 and should from now on report zero vulnerabilities when scanning the image for security vulnerabilities. +Plutono’s Docker image is now based on Alpine 3.10 and should from now on report zero vulnerabilities when scanning the image for security vulnerabilities. ## LDAP Debug UI @@ -117,15 +117,15 @@ After listening to customer feedback, we have been working at improving the expe You'll be able to see how a user authenticating with LDAP would be mapped and whether your LDAP integration is working correctly. Furthermore, it provides a simpler method to test your integration with LDAP server(s) and have a clear view of how attributes are mapped between both systems. -The feature is currently limited to Grafana Server Admins. +The feature is currently limited to Plutono Server Admins. For more information on how to use this new feature, follow the [guide]({{< relref "../auth/ldap.md#ldap-debug-view" >}}). -## Grafana Enterprise +## Plutono Enterprise ### Reporting -A common request from Enterprise users have been to be able to set up reporting for Grafana, and now it’s here. A report is simply a PDF of a Grafana dashboard, outside of just generating a PDF you can set up a schedule so that you can get the report emailed to yourself (or whoever is interested) whenever it suits you. +A common request from Enterprise users have been to be able to set up reporting for Plutono, and now it’s here. A report is simply a PDF of a Plutono dashboard, outside of just generating a PDF you can set up a schedule so that you can get the report emailed to yourself (or whoever is interested) whenever it suits you. This feature is currently limited to Organization Admins. @@ -133,7 +133,7 @@ This feature is currently limited to Organization Admins. ### GitLab OAuth Team Sync support -GitLab OAuth gets support for Team Sync, making it possible to synchronize your GitLab Groups with Teams in Grafana. +GitLab OAuth gets support for Team Sync, making it possible to synchronize your GitLab Groups with Teams in Plutono. [Read more about Team Sync](https://grafana.com/docs/auth/team-sync/). @@ -143,4 +143,4 @@ See [upgrade notes](/installation/upgrading/#upgrading-to-v6-4). ## Changelog -Check out the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. +Check out the [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes. diff --git a/docs/sources/whatsnew/whats-new-in-v6-5.md b/docs/sources/whatsnew/whats-new-in-v6-5.md index 364627f990..5f4af245f9 100644 --- a/docs/sources/whatsnew/whats-new-in-v6-5.md +++ b/docs/sources/whatsnew/whats-new-in-v6-5.md @@ -1,20 +1,20 @@ +++ -title = "What's new in Grafana v6.5" -description = "Feature and improvement highlights for Grafana v6.5" -keywords = ["grafana", "new", "documentation", "6.5", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-5/"] +title = "What's new in Plutono v6.5" +description = "Feature and improvement highlights for Plutono v6.5" +keywords = ["plutono", "new", "documentation", "6.5", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v6-5/"] weight = -24 [_build] list = false +++ -# What's new in Grafana v6.5 +# What's new in Plutono v6.5 -For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). +For all details, read the full [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md). ## Highlights -Grafana 6.5 comes with a lot of new features and enhancements: +Plutono 6.5 comes with a lot of new features and enhancements: - [**Docker:** Ubuntu-based images and more]({{< relref "#ubuntu-based-docker-images" >}}) - [**CloudWatch:** Major rewrite and lots of enhancements]({{< relref "#cloudwatch-data-source-improvements" >}}) @@ -26,19 +26,19 @@ Grafana 6.5 comes with a lot of new features and enhancements: - [**Explore**: Hover/tooltip support in graphs]({{< relref "#explore-metrics-graph-hover-tooltip" >}}) - [**Azure Monitor**: Alerting support for Azure Application Insights]({{< relref "#alerting-support-for-azure-application-insights" >}}) - [**Provisioning**: Allow saving of provisioned dashboards from UI]({{< relref "#allow-saving-of-provisioned-dashboards-from-ui" >}}) -- [**Auth Proxy:** Mix auth proxy with Grafana login token and session cookie]({{< relref "#mix-auth-proxy-with-grafana-login-token-and-session-cookie" >}}) +- [**Auth Proxy:** Mix auth proxy with Plutono login token and session cookie]({{< relref "#mix-auth-proxy-with-plutono-login-token-and-session-cookie" >}}) - [**OAuth:** Generic OAuth now supports role mapping]({{< relref "#generic-oauth-role-mapping" >}}) -- [**Image Rendering:** Quick update since Grafana 6.4]({{< relref "#image-renderer-plugin" >}}) +- [**Image Rendering:** Quick update since Plutono 6.4]({{< relref "#image-renderer-plugin" >}}) ### Ubuntu-based Docker images -In Grafana [v6.4]({{< relref "whats-new-in-v6-4/#alpine-based-docker-image" >}}), we switched the Grafana Docker image from Ubuntu to Alpine. This change provides a more secure and lightweight Docker image. +In Plutono [v6.4]({{< relref "whats-new-in-v6-4/#alpine-based-docker-image" >}}), we switched the Plutono Docker image from Ubuntu to Alpine. This change provides a more secure and lightweight Docker image. -This change has received both negative and positive feedback as well as some bug reports. We learned that switching to an Alpine-based Docker image was a big breaking change for a lot of users. We should have more clearly highlighted this in blog post, release notes, changelog, and the [Docker Hub readme](https://hub.docker.com/r/grafana/grafana). +This change has received both negative and positive feedback as well as some bug reports. We learned that switching to an Alpine-based Docker image was a big breaking change for a lot of users. We should have more clearly highlighted this in blog post, release notes, changelog, and the [Docker Hub readme](https://hub.docker.com/r/plutono/plutono). -We also broke the Docker images for ARM, but this is fixed in Grafana v6.5. +We also broke the Docker images for ARM, but this is fixed in Plutono v6.5. -Grafana Docker images should be as secure as possible by default and that’s why the Alpine-based Docker images will continue to be the Grafana default (`grafana/grafana:`). With that said, it’s good to give users options, and that’s why starting from Grafana v6.5, Ubuntu-based Docker images are also (`grafana/grafana:-ubuntu`) available. +Plutono Docker images should be as secure as possible by default and that’s why the Alpine-based Docker images will continue to be the Plutono default (`plutono/plutono:`). With that said, it’s good to give users options, and that’s why starting from Plutono v6.5, Ubuntu-based Docker images are also (`plutono/plutono:-ubuntu`) available. Read more about [Installing using Docker]({{< relref "../installation/docker/" >}}). @@ -48,13 +48,13 @@ In this release, several feature improvements and additions were made in the Clo #### GetMetricData API -For Grafana version 6.5 or higher, all API requests to GetMetricStatistics have been replaced with calls to GetMetricData, following Amazon’s [best practice to use the GetMetricData API](https://aws.amazon.com/premiumsupport/knowledge-center/cloudwatch-getmetricdata-api) instead of GetMetricStatistics, because data can be retrieved faster at scale with GetMetricData. This change provides better support for CloudWatch metric math and enables the use of automatic search expressions. +For Plutono version 6.5 or higher, all API requests to GetMetricStatistics have been replaced with calls to GetMetricData, following Amazon’s [best practice to use the GetMetricData API](https://aws.amazon.com/premiumsupport/knowledge-center/cloudwatch-getmetricdata-api) instead of GetMetricStatistics, because data can be retrieved faster at scale with GetMetricData. This change provides better support for CloudWatch metric math and enables the use of automatic search expressions. While GetMetricStatistics qualified for the CloudWatch API free tier, this is not the case for GetMetricData calls. For more information, please refer to the [CloudWatch pricing page](https://aws.amazon.com/cloudwatch/pricing/). #### Dynamic queries using dimension wildcards -In Grafana 6.5 or higher, you can monitor a dynamic list of metrics by using the asterisk (\*) wildcard for one or more dimension values. +In Plutono 6.5 or higher, you can monitor a dynamic list of metrics by using the asterisk (\*) wildcard for one or more dimension values. {{< figure src="/static/img/docs/v65/cloudwatch-dimension-wildcard.png" max-width="800px" class="docs-image--right" caption="CloudWatch dimension wildcard" >}} @@ -64,11 +64,11 @@ By default, the search expression is defined in such a way that the queried metr You can untoggle `Match Exact` to include metrics that have other dimensions defined. Turning off `Match Exact` also creates a search expression even if you don’t use wildcards. We simply search for any metric that match at least the namespace, metric name, and all defined dimensions. -#### Deep linking from Grafana panels to the CloudWatch console +#### Deep linking from Plutono panels to the CloudWatch console {{< figure src="/static/img/docs/v65/cloudwatch-deep-linking.png" max-width="500px" class="docs-image--right" caption="CloudWatch deep linking" >}} -Left-clicking a time series in the panel displays a context menu with a link to `View in CloudWatch console`. Clicking that link opens the CloudWatch console and displays all the metrics for that query. If you are not currently logged in to the CloudWatch console, then the link opens the login page. The link is valid for any account, but it only displays the right metrics if you are logged in to the account that corresponds to the selected data source in Grafana. +Left-clicking a time series in the panel displays a context menu with a link to `View in CloudWatch console`. Clicking that link opens the CloudWatch console and displays all the metrics for that query. If you are not currently logged in to the CloudWatch console, then the link opens the login page. The link is valid for any account, but it only displays the right metrics if you are logged in to the account that corresponds to the selected data source in Plutono. This feature is not available for metrics based on math expressions. @@ -130,8 +130,8 @@ Metrictank returns 2 kinds of additional metadata along its responses: - **Lineage information about the returned series:** Which archive was fetched from (raw or rollup), which (if any) runtime consolidation was applied (using which processing function), etc. This is very useful information for anyone trying to understand how their data was generated and why it may not look as expected. To see the metadata response from Metrictank you can inspect the response using the Query Inspector found in the panel queries tab. -Grafana 6.5 includes a new `Panel Inspector` in alpha/preview where you also can see the metadata response from Metrictank. -You can try it out by enabling a feature flag in the Grafana configuration file: +Plutono 6.5 includes a new `Panel Inspector` in alpha/preview where you also can see the metadata response from Metrictank. +You can try it out by enabling a feature flag in the Plutono configuration file: ```bash [feature_toggles] @@ -140,7 +140,7 @@ enable = inspect {{< figure src="/static/img/docs/v65/panel-inspector.png" max-width="400px" caption="New Panel Inspector modal" >}} -In Grafana 6.6, this will have a more user friendly display. In the future, additional Metrictank functionality will become available when the Graphite datasource option is set to the `Metrictank` type. +In Plutono 6.6, this will have a more user friendly display. In the future, additional Metrictank functionality will become available when the Graphite datasource option is set to the `Metrictank` type. ### Explore/Metrics: Graph hover/tooltip @@ -172,33 +172,33 @@ In the Explore split view, you can now link the two timepickers so that if you c ### Alerting support for Azure Application Insights -The [Azure Monitor]({{< relref "../datasources/azuremonitor/" >}}) data source supports multiple services in the Azure cloud. Before Grafana v6.5, only the Azure Monitor service had support for [Grafana Alerting]({{< relref "../alerting" >}}). In Grafana 6.5, alerting support has been implemented for the [Application Insights service]({{< relref "../datasources/azuremonitor/#querying-the-application-insights-service" >}}). +The [Azure Monitor]({{< relref "../datasources/azuremonitor/" >}}) data source supports multiple services in the Azure cloud. Before Plutono v6.5, only the Azure Monitor service had support for [Plutono Alerting]({{< relref "../alerting" >}}). In Plutono 6.5, alerting support has been implemented for the [Application Insights service]({{< relref "../datasources/azuremonitor/#querying-the-application-insights-service" >}}). ### Allow saving of provisioned dashboards from UI -Historically it has been possible to make changes to a provisioned dashboard in the Grafana UI. However, it hasn't been possible to save the changes without manual intervention. In Grafana 6.5 we introduce a new dashboard provisioning setting named `allowUiUpdates`. If `allowUiUpdates` is set to `true` and you make changes to a provisioned dashboard, you can save the dashboard and the changes will be persisted to the Grafana database. +Historically it has been possible to make changes to a provisioned dashboard in the Plutono UI. However, it hasn't been possible to save the changes without manual intervention. In Plutono 6.5 we introduce a new dashboard provisioning setting named `allowUiUpdates`. If `allowUiUpdates` is set to `true` and you make changes to a provisioned dashboard, you can save the dashboard and the changes will be persisted to the Plutono database. -Read more about this new feature in [Provisioning Grafana]({{< relref "../administration/provisioning/#making-changes-to-a-provisioned-dashboard" >}}). +Read more about this new feature in [Provisioning Plutono]({{< relref "../administration/provisioning/#making-changes-to-a-provisioned-dashboard" >}}). -### Mix auth proxy with Grafana login token and session cookie +### Mix auth proxy with Plutono login token and session cookie -With the new setting, `enable_login_token`, set to true Grafana will, after successful auth proxy header validation, assign the user a login token and cookie. You only have to configure your auth proxy to provide headers for the /login route. Requests via other routes will be authenticated using the cookie. +With the new setting, `enable_login_token`, set to true Plutono will, after successful auth proxy header validation, assign the user a login token and cookie. You only have to configure your auth proxy to provide headers for the /login route. Requests via other routes will be authenticated using the cookie. Read more about this new feature in [Auth Proxy Authentication]({{< relref "../auth/auth-proxy/#login-token-and-session-cookie" >}}) ### Generic OAuth role mapping -Grafana 6.5 makes it possible to configure Generic OAuth to map a certain response from OAuth provider to a certain Grafana organization role, similar to the existing [LDAP Group Mappings]({{< relref "../auth/ldap/#group-mappings" >}}) feature. The new setting is named `role_attribute_path` and expects a [JMESPath](http://jmespath.org/) expression. +Plutono 6.5 makes it possible to configure Generic OAuth to map a certain response from OAuth provider to a certain Plutono organization role, similar to the existing [LDAP Group Mappings]({{< relref "../auth/ldap/#group-mappings" >}}) feature. The new setting is named `role_attribute_path` and expects a [JMESPath](http://jmespath.org/) expression. Read more about this new feature in [Generic OAuth Authentication]({{< relref "../auth/generic-oauth/" >}}) and make sure to check out the [JMESPath examples]({{< relref "../auth/generic-oauth/#jmespath-examples" >}}). ### Image renderer plugin -Since we announced the deprecation of PhantomJS and the new [Image Renderer Plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) in Grafana [6.4]({{< relref "whats-new-in-v6-4/#phantomjs-deprecation" >}}), we’ve received bug reports and valuable feedback. +Since we announced the deprecation of PhantomJS and the new [Image Renderer Plugin](https://grafana.com/grafana/plugins/plutono-image-renderer) in Plutono [6.4]({{< relref "whats-new-in-v6-4/#phantomjs-deprecation" >}}), we’ve received bug reports and valuable feedback. -In Grafana 6.5 we’ve updated documentation to make it easier to understand how to install and troubleshoot possible problems. Read more about [Image Rendering]({{< relref "../administration/image_rendering/" >}}). +In Plutono 6.5 we’ve updated documentation to make it easier to understand how to install and troubleshoot possible problems. Read more about [Image Rendering]({{< relref "../administration/image_rendering/" >}}). -Please try the [Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) and let us know what you think. +Please try the [Image Renderer plugin](https://grafana.com/grafana/plugins/plutono-image-renderer) and let us know what you think. ## Upgrading @@ -206,4 +206,4 @@ See [upgrade notes]({{< relref "../installation/upgrading/#upgrading-to-v6-5" >} ## Changelog -Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. +Check out [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. diff --git a/docs/sources/whatsnew/whats-new-in-v6-6.md b/docs/sources/whatsnew/whats-new-in-v6-6.md index 823230ce2e..e5dc93d2a6 100644 --- a/docs/sources/whatsnew/whats-new-in-v6-6.md +++ b/docs/sources/whatsnew/whats-new-in-v6-6.md @@ -1,20 +1,20 @@ +++ -title = "What's new in Grafana v6.6" -description = "Feature and improvement highlights for Grafana v6.6" -keywords = ["grafana", "new", "documentation", "6.6", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-6/"] +title = "What's new in Plutono v6.6" +description = "Feature and improvement highlights for Plutono v6.6" +keywords = ["plutono", "new", "documentation", "6.6", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v6-6/"] weight = -25 [_build] list = false +++ -# What's new in Grafana v6.6 +# What's new in Plutono v6.6 -For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). +For all details, read the full [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md). ## Highlights -Grafana 6.6 comes with a lot of new features and enhancements: +Plutono 6.6 comes with a lot of new features and enhancements: - [**Panels:** New stat panel]({{< relref "#new-stat-panel" >}}) - [**Panels:** Auto min/max for Bar Gauge/Gauge/Stat]({{< relref "#auto-min-max" >}}) @@ -59,11 +59,11 @@ Here is how it looks in light theme: ## Auto min-max -For the panels Gauge, Bar Gauge, and Stat, you can now leave the min and max settings empty. Grafana will, in that case, calculate the min and max based on all the data. +For the panels Gauge, Bar Gauge, and Stat, you can now leave the min and max settings empty. Plutono will, in that case, calculate the min and max based on all the data. ## News panel -This panel shows RSS feeds as news items in the default home dashboard for v6.6. Add it to your custom home dashboards to keep up-to-date with Grafana news, or switch the default RSS feed to one of your choice. +This panel shows RSS feeds as news items in the default home dashboard for v6.6. Add it to your custom home dashboards to keep up-to-date with Plutono news, or switch the default RSS feed to one of your choice. {{< figure src="/static/img/docs/v66/news_panel.png" max-width="600px" caption="News panel" >}} @@ -101,7 +101,7 @@ The time picker has gotten a major design update. Key changes: ## Cookie management modifications -In order to align with a [change in Chrome 80](https://www.chromestatus.com/feature/5088147346030592), a breaking change has been introduced to Grafana's [`cookie_samesite` setting]({{< relref "../administration/configuration.md#cookie-samesite" >}}). Grafana now properly renders cookies with the `SameSite=None` attribute when this setting is `none`. The previous behavior of `none` was to omit the `SameSite` attribute from cookies. Grafana will use the previous behavior when `cookie_samesite` is set to `disabled`. +In order to align with a [change in Chrome 80](https://www.chromestatus.com/feature/5088147346030592), a breaking change has been introduced to Plutono's [`cookie_samesite` setting]({{< relref "../administration/configuration.md#cookie-samesite" >}}). Plutono now properly renders cookies with the `SameSite=None` attribute when this setting is `none`. The previous behavior of `none` was to omit the `SameSite` attribute from cookies. Plutono will use the previous behavior when `cookie_samesite` is set to `disabled`. Read more about this in the [upgrade notes]({{< relref "../installation/upgrading/#important-changes-regarding-samesite-cookie-attribute" >}}). @@ -125,7 +125,7 @@ Isolating a series from a big set of lines in a graph is important for drill-dow ## Enterprise: White labeling -This release adds new white labeling options to the grafana.ini file (can also be set via ENV variables). +This release adds new white labeling options to the plutono.ini file (can also be set via ENV variables). ```bash [white_labeling] @@ -158,25 +158,25 @@ Customize the login page, side menu bar, and footer links. ## Enterprise APT and YUM repositories -Now you can install the enterprise edition from the APT and YUM repository. The following table shows the APT repository for each Grafana version (for instructions read the [installation notes]({{< relref "../installation/debian/#install-from-apt-repository" >}})) : +Now you can install the enterprise edition from the APT and YUM repository. The following table shows the APT repository for each Plutono version (for instructions read the [installation notes]({{< relref "../installation/debian/#install-from-apt-repository" >}})) : -| Grafana Version | Package | Repository | +| Plutono Version | Package | Repository | |-----------------|---------|------------| -| Grafana OSS | grafana | `https://packages.grafana.com/oss/deb stable main` | -| Grafana OSS (Beta) | grafana | `https://packages.grafana.com/oss/deb beta main` | -| Grafana Enterprise | grafana-enterprise | `https://packages.grafana.com/enterprise/deb stable main` | -| Grafana Enterprise (Beta) | grafana-enterprise | `https://packages.grafana.com/enterprise/deb beta main` | +| Plutono OSS | plutono | `https://packages.grafana.com/oss/deb stable main` | +| Plutono OSS (Beta) | plutono | `https://packages.grafana.com/oss/deb beta main` | +| Plutono Enterprise | plutono-enterprise | `https://packages.grafana.com/enterprise/deb stable main` | +| Plutono Enterprise (Beta) | plutono-enterprise | `https://packages.grafana.com/enterprise/deb beta main` | -The following table shows the YUM repositories for each Grafana version (for instructions read the [installation notes]({{< relref "../installation/rpm/#install-from-yum-repository" >}})) : +The following table shows the YUM repositories for each Plutono version (for instructions read the [installation notes]({{< relref "../installation/rpm/#install-from-yum-repository" >}})) : -| Grafana Version | Package | Repository | +| Plutono Version | Package | Repository | |----------------------------|--------------------|----------------------------------------------------| -| Grafana OSS | grafana | `https://packages.grafana.com/oss/rpm` | -| Grafana OSS (Beta) | grafana | `https://packages.grafana.com/oss/rpm-beta` | -| Grafana Enterprise | grafana-enterprise | `https://packages.grafana.com/enterprise/rpm` | -| Grafana Enterprise (Beta) | grafana-enterprise | `https://packages.grafana.com/enterprise/rpm-beta` | +| Plutono OSS | plutono | `https://packages.grafana.com/oss/rpm` | +| Plutono OSS (Beta) | plutono | `https://packages.grafana.com/oss/rpm-beta` | +| Plutono Enterprise | plutono-enterprise | `https://packages.grafana.com/enterprise/rpm` | +| Plutono Enterprise (Beta) | plutono-enterprise | `https://packages.grafana.com/enterprise/rpm-beta` | -We recommend all users to install the Enterprise Edition of Grafana, which can be seamlessly upgraded with a Grafana Enterprise [subscription](https://grafana.com/products/enterprise/?utm_source=grafana-install-page). +We recommend all users to install the Enterprise Edition of Plutono, which can be seamlessly upgraded with a Plutono Enterprise [subscription](https://grafana.com/products/enterprise/). ## Stackdriver: Meta labels @@ -186,11 +186,11 @@ From now on it will be possible to utilize meta data label in "group bys", filte ## CloudWatch: Calculate period based on time range -When the period field was left blank in Grafana 6.5, it would default to 60 seconds. In case users issued queries with a large time span, there was a high risk that they would reach the 100,800 data points per request limit in the Get Metric Data (GMD) API. When the period field is left blank in Grafana 6.6, the period will be calculated automatically based on the time range. The formula that is used is `time range in seconds / 2000`, and then we snap to next higher value in an array of pre-defined periods `[60, 300, 900, 3600, 21600, 86400]`. This will reduce the risk for receiving a `Too many datapoints requested` error in the panel. +When the period field was left blank in Plutono 6.5, it would default to 60 seconds. In case users issued queries with a large time span, there was a high risk that they would reach the 100,800 data points per request limit in the Get Metric Data (GMD) API. When the period field is left blank in Plutono 6.6, the period will be calculated automatically based on the time range. The formula that is used is `time range in seconds / 2000`, and then we snap to next higher value in an array of pre-defined periods `[60, 300, 900, 3600, 21600, 86400]`. This will reduce the risk for receiving a `Too many datapoints requested` error in the panel. ## CloudWatch: Display partial result in graph when max data points per call limit is reached -In case all queries in a GMD call are metric stat (not using math expressions), Grafana will paginate the response until all data points are received. But pagination is not supported in case a math expression is being used, so in that case it's not possible to receive more than 100,800 data points. Previously when that limit was reached, we only displayed an error message. In Grafana 6.6, we also display the 100,800 data points that were received in the graph. +In case all queries in a GMD call are metric stat (not using math expressions), Plutono will paginate the response until all data points are received. But pagination is not supported in case a math expression is being used, so in that case it's not possible to receive more than 100,800 data points. Previously when that limit was reached, we only displayed an error message. In Plutono 6.6, we also display the 100,800 data points that were received in the graph. ## Upgrading @@ -198,11 +198,11 @@ See [upgrade notes]({{< relref "../installation/upgrading/#upgrading-to-v6-6" >} ## Changelog -Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. +Check out [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. ## Notice about upcoming changes in backendSrv for plugin authors -In our mission to migrate away from AngularJS to React we have removed all AngularJS dependencies in the core data retrieval service `backendSrv`. This change is already in master and will be introduced in the next `major` Grafana release. +In our mission to migrate away from AngularJS to React we have removed all AngularJS dependencies in the core data retrieval service `backendSrv`. This change is already in master and will be introduced in the next `major` Plutono release. Removing the AngularJS dependencies in `backendSrv` has the unfortunate side effect of AngularJS digest no longer being triggered for any request made with `backendSrv`. Because of this, external plugins using `backendSrv` directly may suffer from strange behaviour in the UI. diff --git a/docs/sources/whatsnew/whats-new-in-v6-7.md b/docs/sources/whatsnew/whats-new-in-v6-7.md index 34ee43acb2..b7896ebe9a 100644 --- a/docs/sources/whatsnew/whats-new-in-v6-7.md +++ b/docs/sources/whatsnew/whats-new-in-v6-7.md @@ -1,18 +1,18 @@ +++ -title = "What's New in Grafana v6.7" -description = "Feature and improvement highlights for Grafana v6.7" -keywords = ["grafana", "new", "documentation", "6.7", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v6-7/"] +title = "What's New in Plutono v6.7" +description = "Feature and improvement highlights for Plutono v6.7" +keywords = ["plutono", "new", "documentation", "6.7", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v6-7/"] weight = -26 [_build] list = false +++ -# What's new in Grafana v6.7 +# What's new in Plutono v6.7 -This topic includes the release notes for the Grafana v6.7. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). +This topic includes the release notes for the Plutono v6.7. For all details, read the full [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md). -Grafana 6.7 comes with a lot of new features and enhancements: +Plutono 6.7 comes with a lot of new features and enhancements: - [**Dashboard:** Enforce minimum refresh interval]({{< relref "#enforce-minimum-dashboard-refresh-interval" >}}) - **Data source:** Google Sheets data source @@ -27,7 +27,7 @@ Grafana 6.7 comes with a lot of new features and enhancements: ## General features -General features are included in all Grafana editions. +General features are included in all Plutono editions. ### Query history > BETA: Query history is a beta feature. It is local to your browser and is not shared with others. @@ -39,23 +39,23 @@ Learn more about query history in [Explore]({{< relref "../explore" >}}). {{< figure src="/static/img/docs/v67/rich-history.gif" max-width="1024px" caption="Query history" >}} ### Azure OAuth -Grafana v6.7 comes with a new OAuth integration for Microsoft Azure Active Directory. You can now assign users and groups to Grafana roles from the Azure Portal. Learn how to enable and configure it in [Azure AD OAuth2 authentication]({{< relref "../auth/azuread/" >}}). +Plutono v6.7 comes with a new OAuth integration for Microsoft Azure Active Directory. You can now assign users and groups to Plutono roles from the Azure Portal. Learn how to enable and configure it in [Azure AD OAuth2 authentication]({{< relref "../auth/azuread/" >}}). ### Enforce minimum dashboard refresh interval -Allowing a low dashboard refresh interval can cause severe load on data sources and Grafana. Grafana v6.7 allows you to restrict the dashboard refresh interval so it cannot be set lower than a given interval. This provides a way for administrators to control dashboard refresh behavior on a global level. +Allowing a low dashboard refresh interval can cause severe load on data sources and Plutono. Plutono v6.7 allows you to restrict the dashboard refresh interval so it cannot be set lower than a given interval. This provides a way for administrators to control dashboard refresh behavior on a global level. Refer to min_refresh_interval in [Configuration]({{< relref "../administration/configuration#min-refresh-interval" >}}) for more information and how to enable this feature. ### Stackdriver project selector -A Stackdriver data source in Grafana is configured for one service account only. That service account is always associated with a default project in Google Cloud Platform (GCP). Depending on your setup in GCP, the service account might be granted access to more projects than just the default project. +A Stackdriver data source in Plutono is configured for one service account only. That service account is always associated with a default project in Google Cloud Platform (GCP). Depending on your setup in GCP, the service account might be granted access to more projects than just the default project. -In Grafana 6.7, the query editor has been enhanced with a project selector that makes it possible to query different projects without changing datasource. Many thanks [Eraac](https://github.com/Eraac), [eliaslaouiti](https://github.com/eliaslaouiti), and [NaurisSadovskis](https://github.com/NaurisSadovskis) for making this happen! +In Plutono 6.7, the query editor has been enhanced with a project selector that makes it possible to query different projects without changing datasource. Many thanks [Eraac](https://github.com/Eraac), [eliaslaouiti](https://github.com/eliaslaouiti), and [NaurisSadovskis](https://github.com/NaurisSadovskis) for making this happen! -## Grafana Enterprise features +## Plutono Enterprise features -General features are included in the Grafana Enterprise edition software. +General features are included in the Plutono Enterprise edition software. ### White labeling customizes application title This release adds a new white labeling option to customize the application title. Learn how to configure it in [White labeling]({{< relref "../enterprise/white-labeling/" >}}). @@ -90,5 +90,5 @@ You can now use either portrait or landscape mode in your reports. Portrait will [Reporting]({{< relref "../enterprise/reporting/" >}}) has been updated as a result of this change. ### Azure OAuth Team Sync support -When setting up OAuth with Microsoft Azure AD, you can now sync Azure groups with Teams in Grafana. +When setting up OAuth with Microsoft Azure AD, you can now sync Azure groups with Teams in Plutono. Learn more in [Team sync]({{< relref "../enterprise/team-sync/" >}}). diff --git a/docs/sources/whatsnew/whats-new-in-v7-0.md b/docs/sources/whatsnew/whats-new-in-v7-0.md index ceb6814c2a..3b11966489 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-0.md +++ b/docs/sources/whatsnew/whats-new-in-v7-0.md @@ -1,28 +1,28 @@ +++ -title = "What's New in Grafana v7.0" -description = "Feature and improvement highlights for Grafana v7" -keywords = ["grafana", "new", "documentation", "7.0", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-0/"] +title = "What's New in Plutono v7.0" +description = "Feature and improvement highlights for Plutono v7" +keywords = ["plutono", "new", "documentation", "7.0", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v7-0/"] weight = -27 [_build] list = false +++ -# What's new in Grafana v7.0 +# What's new in Plutono v7.0 -This topic includes the release notes for Grafana v7.0. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). +This topic includes the release notes for Plutono v7.0. For all details, read the full [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md). -This major release of Grafana is the next step in our Observability story. It includes powerful new features for manipulating, transforming, and doing math on data. Grafana Enterprise has the first version of Usage analytics, which will help Grafana Admins better manage large, corporate Grafana ecosystems. +This major release of Plutono is the next step in our Observability story. It includes powerful new features for manipulating, transforming, and doing math on data. Plutono Enterprise has the first version of Usage analytics, which will help Plutono Admins better manage large, corporate Plutono ecosystems. -The Grafana 7.0 stable release is scheduled for the 18th of May. In the meantime, if you want to know more about what we've been up to and what is coming, sign up for our online GrafanaCon conference. +The Plutono 7.0 stable release is scheduled for the 18th of May. In the meantime, if you want to know more about what we've been up to and what is coming, sign up for our online PlutonoCon conference. -[{{< figure src="/assets/img/blog/GrafanaCONline.jpg" max-width="800px" lightbox="false" caption="GrafanaCONline May 13-29" >}}](https://grafana.com/about/events/grafanacon/2020/?source=blog) +[{{< figure src="/assets/img/blog/PlutonoCONline.jpg" max-width="800px" lightbox="false" caption="PlutonoCONline May 13-29" >}}](https://grafana.com/about/events/plutonocon/2020/?source=blog) The main highlights are: - [**New Panel Editor** Redesign based on community feedback.]({{< relref "#new-panel-editor-and-unified-data-model" >}}) - [**Explore** New tracing UI and support for visualizing Jaeger and Zipkin traces.]({{< relref "#new-tracing-ui" >}}) -- [**Enterprise** Usage insights, Presence indicator, and Auth improvements.]({{< relref "#grafana-enterprise" >}}) +- [**Enterprise** Usage insights, Presence indicator, and Auth improvements.]({{< relref "#plutono-enterprise" >}}) - [**Transformations** Transformations and simple Math operations for all data sources.]({{< relref "#transformations" >}}) - [**Field overrides** Automatically configure panels with data from queries.]({{< relref "#field-options-and-overrides" >}}) - [**Table** New Table panel.]({{< relref "#table-panel" >}}) @@ -38,7 +38,7 @@ We have redesigned the UI for editing panels. The first visible change is that w This new option architecture and UI will make all panels have a consistent set of options and behaviors for attributes like unit, min, max, thresholds, links, decimals. Not only that but all these options will share a consistent UI for specifying override rules and is extensible for custom panel specific options. -In previous versions of Grafana, each visualization had slightly different ways to define their options. One immediate benefit is after setting options like units or thresholds in a panel, you can seamlessly switch between visualization types and keep those options. This will bring increased ease of use and more consistency for users and plugin developers. +In previous versions of Plutono, each visualization had slightly different ways to define their options. One immediate benefit is after setting options like units or thresholds in a panel, you can seamlessly switch between visualization types and keep those options. This will bring increased ease of use and more consistency for users and plugin developers. We have yet to migrate all core panels to this new architecture so in 7.0 there will be some inconsistencies in the UI between panels. This will be fixed soon in future releases as we update all the core panels and help the community update the community panel plugins. @@ -56,15 +56,15 @@ In the future we will add more workflows and integrations so that correlating be ## Transformations -The data you want to visualize can come from many different places and it is usually not in exactly the right form. Users can now transform non-time series data into tables (e.g., JSON files or even simple lookup tables) in seconds without any customization or additional overhead. They can then combine non-time series data with any other data in Grafana; data from an external database or a panel that already exists in one of their current dashboards. +The data you want to visualize can come from many different places and it is usually not in exactly the right form. Users can now transform non-time series data into tables (e.g., JSON files or even simple lookup tables) in seconds without any customization or additional overhead. They can then combine non-time series data with any other data in Plutono; data from an external database or a panel that already exists in one of their current dashboards. By chaining a simple set of point and click [transformations]({{< relref "../panels/transformations/_index.md" >}}), users will be able join, pivot, filter, re-name and do calculations to get the results they need. Perfect for operations across queries or data sources missing essential data transformations. -[Transformations]({{< relref "../panels/transformations/_index.md" >}}) also adds the ability to do maths across queries. Lots of data sources do not support this natively, so being able to do it in Grafana is a powerful feature. +[Transformations]({{< relref "../panels/transformations/_index.md" >}}) also adds the ability to do maths across queries. Lots of data sources do not support this natively, so being able to do it in Plutono is a powerful feature. For users with large dashboards or with heavy queries, being able to reuse the query result from one panel in another panel can be a huge performance gain for slow queries (e.g log or sql queries). From the data source menu in the query editor, you can choose the `--dashboard--` option and then choose the query result from another panel on the same dashboard. -The [Google Sheets data source](https://grafana.com/grafana/plugins/grafana-googlesheets-datasource) that was published a few weeks ago works really well together with the transformations feature. +The [Google Sheets data source](https://grafana.com/grafana/plugins/plutono-googlesheets-datasource) that was published a few weeks ago works really well together with the transformations feature. We are also introducing a new shared data model for both time series and table data that we call [DataFrame]({{< relref "../developers/plugins/data-frames/#data-frames" >}}). A DataFrame is like a table with columns but we refer to columns as fields. A time series is a DataFrame with two fields (time & value). @@ -82,7 +82,7 @@ Learn more about this feature in [Transformations]({{< relref "../panels/transfo ## Field options and overrides -With Grafana 7.0 we are introducing a new, unified data configuration system that powers a consistent UI for setting data options across visualizations as well as making all data display settings data driven and overridable. This new option architecture and UI will make all panels have a consistent set of options and behaviors for attributes like `unit`, `min`, `max`, `thresholds`, `links`, `decimals` or `value mappings`. Not only that but all these options will share a consistent UI for specifying override rules and is extensible for custom panel specific options. +With Plutono 7.0 we are introducing a new, unified data configuration system that powers a consistent UI for setting data options across visualizations as well as making all data display settings data driven and overridable. This new option architecture and UI will make all panels have a consistent set of options and behaviors for attributes like `unit`, `min`, `max`, `thresholds`, `links`, `decimals` or `value mappings`. Not only that but all these options will share a consistent UI for specifying override rules and is extensible for custom panel specific options. Up until now the overrides were available only for Graph and Table panel(via Column Styles), but with 7.0 they work consistently across all visualization types and plugins. @@ -94,7 +94,7 @@ Learn more about this feature in [Field options]({{< relref "../panels/field-opt {{< figure src="/static/img/docs/v70/panel_edit_export_raw_data.png" max-width="800px" class="docs-image--right" caption="Panel Edit - Export raw data to CSV" >}} -Another new feature of Grafana 7.0 is the panel inspector. Inspect allows you to view the raw data for any Grafana panel as well as export that data to a CSV file. With Panel inspect you will also be able to perform simple raw data transformations like join, view query stats or detailed execution data. +Another new feature of Plutono 7.0 is the panel inspector. Inspect allows you to view the raw data for any Plutono panel as well as export that data to a CSV file. With Panel inspect you will also be able to perform simple raw data transformations like join, view query stats or detailed execution data. Learn more about this feature in [Inspect a panel]({{< relref "../panels/inspect-panel.md" >}}). @@ -102,53 +102,53 @@ Learn more about this feature in [Inspect a panel]({{< relref "../panels/inspect ## Table panel -Grafana 7.0 comes with a new table panel (and deprecates the old one). This new table panel supports horizontal scrolling and column resize. Paired with the new `Organize fields` transformation detailed above you can reorder, hide & rename columns. This new panel also supports new cell display modes, like showing a bar gauge inside a cell. +Plutono 7.0 comes with a new table panel (and deprecates the old one). This new table panel supports horizontal scrolling and column resize. Paired with the new `Organize fields` transformation detailed above you can reorder, hide & rename columns. This new panel also supports new cell display modes, like showing a bar gauge inside a cell. {{< youtube J29wILRh3QQ >}}
## Auto grid mode for Stat panel and Gauge -This new 7.0 feature is for the gauge and stat panels. Before, stat and gauge only supported horizontal or vertical stacking: The auto layout mode just selected vertical or horizontal stacking based on the panel dimensions (whatever was highest). But in 7.0 the auto layout for these two panels will allow dynamic grid layouts where Grafana will try to optimize the usage of space and lay out each sub-visualization in a grid. +This new 7.0 feature is for the gauge and stat panels. Before, stat and gauge only supported horizontal or vertical stacking: The auto layout mode just selected vertical or horizontal stacking based on the panel dimensions (whatever was highest). But in 7.0 the auto layout for these two panels will allow dynamic grid layouts where Plutono will try to optimize the usage of space and lay out each sub-visualization in a grid. {{< youtube noq1rLGvsrU >}}
## Cloudwatch Logs -Grafana 7.0 adds logging support to one of our most popular cloud provider data sources. Autocomplete support for Cloudwatch Logs queries is included for improved productivity. There is support for deep linking to the CloudWatch Logs Insights console for log queries, similar to the deep linking feature for Cloudwatch metrics. Since CloudWatch Logs queries can return time series data, for example through the use of the `stats` command, alerting is supported too. +Plutono 7.0 adds logging support to one of our most popular cloud provider data sources. Autocomplete support for Cloudwatch Logs queries is included for improved productivity. There is support for deep linking to the CloudWatch Logs Insights console for log queries, similar to the deep linking feature for Cloudwatch metrics. Since CloudWatch Logs queries can return time series data, for example through the use of the `stats` command, alerting is supported too. ## Plugins platform -The [platform for plugins]({{< relref "../developers/plugins/" >}}) has been completely re-imagined and provides ready-made components and tooling to help both inexperienced and experienced developers get up and running more quickly. The tooling, documentation, and new components will improve plugin quality and reduce long-term maintenance. We are already seeing that a high quality plugin with the Grafana look and feel can be written in much fewer lines of code than previously. +The [platform for plugins]({{< relref "../developers/plugins/" >}}) has been completely re-imagined and provides ready-made components and tooling to help both inexperienced and experienced developers get up and running more quickly. The tooling, documentation, and new components will improve plugin quality and reduce long-term maintenance. We are already seeing that a high quality plugin with the Plutono look and feel can be written in much fewer lines of code than previously. Learn more about developing plugins in the new framework in [Build a plugin]({{< relref "../developers/plugins/_index.md" >}}). ### Front end plugins platform -In Grafana 7.0 we are maturing our panel and front-end datasource plugins platform. +In Plutono 7.0 we are maturing our panel and front-end datasource plugins platform. -Plugins can use the same React components that the Grafana team uses to build Grafana. Using these components means the Grafana team will support and improve them continually and make your plugin as polished as the rest of Grafana’s UI. The new [`@grafana/ui` components library](https://developers.grafana.com/ui) is documented with Storybook (visual documentation) and is available on NPM. +Plugins can use the same React components that the Plutono team uses to build Plutono. Using these components means the Plutono team will support and improve them continually and make your plugin as polished as the rest of Plutono’s UI. The new [`@credativ/plutono-ui` components library](https://developers.grafana.com/ui) is documented with Storybook (visual documentation) and is available on NPM. -The `@grafana/data`, `@grafana/runtime`, `@grafana/e2e packages` (also available via NPM) aim to simplify the way plugins are developed. We want to deliver a set of [reliable APIs](https://grafana.com/docs/grafana/latest/packages_api/) for plugin developers. +The `@credativ/plutono-data`, `@credativ/plutono-runtime`, `@credativ/plutono-e2e packages` (also available via NPM) aim to simplify the way plugins are developed. We want to deliver a set of [reliable APIs](https://grafana.com/docs/grafana/latest/packages_api/) for plugin developers. -With [@grafana/toolkit](https://www.npmjs.com/package/@grafana/toolkit) we are delivering a simple CLI that helps plugin authors quickly scaffold, develop and test their plugins without worrying about configuration details. A plugin author no longer needs to be a grunt or webpack expert to build their plugin. +With [@credativ/plutono-toolkit](https://www.npmjs.com/package/@credativ/plutono-toolkit) we are delivering a simple CLI that helps plugin authors quickly scaffold, develop and test their plugins without worrying about configuration details. A plugin author no longer needs to be a grunt or webpack expert to build their plugin. ### Support for backend plugins -Grafana now officially supports [backend plugins]({{< relref "../developers/plugins/backend/_index.md" >}}) and the first type of plugin to be introduced is a backend component for data source plugins. You can optionally add a backend component to your data source plugin and implement the query logic there to automatically enable alerting in Grafana for your plugin. In the 7.0 release, we introduce the [Grafana Plugin SDK for Go]({{< relref "../developers/plugins/backend/grafana-plugin-sdk-for-go.md" >}}) that enables and simplifies building a backend plugin in [Go](https://golang.org/). +Plutono now officially supports [backend plugins]({{< relref "../developers/plugins/backend/_index.md" >}}) and the first type of plugin to be introduced is a backend component for data source plugins. You can optionally add a backend component to your data source plugin and implement the query logic there to automatically enable alerting in Plutono for your plugin. In the 7.0 release, we introduce the [Plutono Plugin SDK for Go]({{< relref "../developers/plugins/backend/plutono-plugin-sdk-for-go.md" >}}) that enables and simplifies building a backend plugin in [Go](https://golang.org/). -Plugins can be monitored with the new metrics and health check capabilities. The new Resources capability means backend components can return non-time series data like JSON or static resources like images and opens up Grafana for new use cases. +Plugins can be monitored with the new metrics and health check capabilities. The new Resources capability means backend components can return non-time series data like JSON or static resources like images and opens up Plutono for new use cases. With this release, we are deprecating the unofficial first version of backend plugins which will be removed in a future release. -To learn more, start with the [overview]({{< relref "../developers/plugins/backend/_index.md" >}}). Next, in this [tutorial](https://grafana.com/tutorials/build-a-data-source-backend-plugin/) you'll learn how to build a backend for a data source plugin and enable it for use with [Grafana Alerting]({{< relref "../alerting/_index.md" >}}). Make sure to keep an eye out for additional documentation and tutorials that will be published after the Grafana v7.0 release. +To learn more, start with the [overview]({{< relref "../developers/plugins/backend/_index.md" >}}). Next, in this [tutorial](https://grafana.com/tutorials/build-a-data-source-backend-plugin/) you'll learn how to build a backend for a data source plugin and enable it for use with [Plutono Alerting]({{< relref "../alerting/_index.md" >}}). Make sure to keep an eye out for additional documentation and tutorials that will be published after the Plutono v7.0 release. ## New tutorials -To help you get started with Grafana, we’ve launched a brand new tutorials platform. We’ll continue to expand the platform with more tutorials, but here are some of the ones you can try out now: +To help you get started with Plutono, we’ve launched a brand new tutorials platform. We’ll continue to expand the platform with more tutorials, but here are some of the ones you can try out now: -- [Grafana fundamentals](https://grafana.com/tutorials/grafana-fundamentals/) +- [Plutono fundamentals](https://grafana.com/tutorials/plutono-fundamentals/) - [Create users and teams](https://grafana.com/tutorials/create-users-and-teams/) - [Build a panel plugin](https://grafana.com/tutorials/build-a-panel-plugin/) - [Build a data source plugin](https://grafana.com/tutorials/build-a-data-source-plugin/) @@ -163,11 +163,11 @@ Depending on the cardinality of the data and the time range MetricTank may retur ## Breaking change - PhantomJS removed -[PhantomJS](https://phantomjs.org/), have been used for rendering images of dashboards and panels and have been included with Grafana since Grafana v2.0. Since then we’ve had a lot of related bugs and security related issues, mainly due to the fact that PhantomJS have struggled with supporting modern web technologies. Throughout the years, maintaining PhantomJS support in Grafana has been a nightmare. Removing support for PhantomJS has been a high priority for the Grafana project and got stressed even more when the PhantomJS maintainer in March 2018 [announced](https://github.com/ariya/phantomjs/issues/15344) the end of the project. +[PhantomJS](https://phantomjs.org/), have been used for rendering images of dashboards and panels and have been included with Plutono since Plutono v2.0. Since then we’ve had a lot of related bugs and security related issues, mainly due to the fact that PhantomJS have struggled with supporting modern web technologies. Throughout the years, maintaining PhantomJS support in Plutono has been a nightmare. Removing support for PhantomJS has been a high priority for the Plutono project and got stressed even more when the PhantomJS maintainer in March 2018 [announced](https://github.com/ariya/phantomjs/issues/15344) the end of the project. -Since then we have been working towards removing PhantomJS. In October 2019, when Grafana v6.4 was released, we [announced](https://grafana.com/blog/2019/10/02/grafana-v6.4-released/#phantomjs-deprecation) the deprecation of PhantomJS. Grafana v7.0 removes all PhantomJS support which means that Grafana distribution no longer will include a built-in image renderer. +Since then we have been working towards removing PhantomJS. In October 2019, when Plutono v6.4 was released, we [announced](https://grafana.com/blog/2019/10/02/plutono-v6.4-released/#phantomjs-deprecation) the deprecation of PhantomJS. Plutono v7.0 removes all PhantomJS support which means that Plutono distribution no longer will include a built-in image renderer. -As a replacement for PhantomJS we’ve developed the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) which is a plugin that runs on the backend and handles rendering panels and dashboards as PNG images using headless Chromium/Chrome. The [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) can either be installed as a Grafana plugin running in its own process side-by-side with Grafana. or runs as an external HTTP service, hosted using Docker or as a standalone application. +As a replacement for PhantomJS we’ve developed the [Plutono Image Renderer plugin](https://grafana.com/grafana/plugins/plutono-image-renderer) which is a plugin that runs on the backend and handles rendering panels and dashboards as PNG images using headless Chromium/Chrome. The [Plutono Image Renderer plugin](https://grafana.com/grafana/plugins/plutono-image-renderer) can either be installed as a Plutono plugin running in its own process side-by-side with Plutono. or runs as an external HTTP service, hosted using Docker or as a standalone application. Read more about [Image Rendering]({{< relref "../administration/image_rendering/" >}}) in the documentation for further instructions. @@ -175,11 +175,11 @@ Read more about [Image Rendering]({{< relref "../administration/image_rendering/ The Query history feature lets you view and interact with the queries that you have previously run in Explore. You can add queries to the Explore query editor, write comments, create and share URL links, star your favorite queries, and much more. Starred queries are displayed in the Starred tab, so it is easier to reuse queries that you run often without typing them from scratch. -It was released as a beta feature in Grafana 6.7. The feedback has been really positive and it is now out of beta for the 7.0 release. Learn more about query history in [Explore]({{< relref "../explore" >}}). +It was released as a beta feature in Plutono 6.7. The feedback has been really positive and it is now out of beta for the 7.0 release. Learn more about query history in [Explore]({{< relref "../explore" >}}). ## Stackdriver data source supports Service Monitoring -[Service monitoring](https://cloud.google.com/service-monitoring) in Google Cloud Platform (GCP) enables you to monitor based on Service Level Objectives (SLOs) for your GCP services. The new SLO query builder in the Stackdriver data source allows you to display SLO data in Grafana. Read more about it in the [Stackdriver data source documentation]({{< relref "../datasources/google-cloud-monitoring/_index.md/#slo-service-level-objective-queries" >}}). +[Service monitoring](https://cloud.google.com/service-monitoring) in Google Cloud Platform (GCP) enables you to monitor based on Service Level Objectives (SLOs) for your GCP services. The new SLO query builder in the Stackdriver data source allows you to display SLO data in Plutono. Read more about it in the [Stackdriver data source documentation]({{< relref "../datasources/google-cloud-monitoring/_index.md/#slo-service-level-objective-queries" >}}). ## Time zone support @@ -189,12 +189,12 @@ You can now override the [time zone]({{< relref "../dashboards/time-range-contro The Azure Monitor data source supports multiple Azure services. Log Analytics queries in the data source now have alerting support too (Azure Monitor and Application Insights already had alerting support). -A new feature is [deep linking from the graph panel to the Log Analytics query editor in the Azure Portal]({{< relref "../datasources/azuremonitor/#deep-linking-from-grafana-panels-to-the-log-analytics-query-editor-in-azure-portal" >}}). Click on a time series in the panel to see a context menu with a link to View in Azure Portal. Clicking that link opens the Azure Log Analytics query editor in the Azure Portal and runs the query from the Grafana panel. +A new feature is [deep linking from the graph panel to the Log Analytics query editor in the Azure Portal]({{< relref "../datasources/azuremonitor/#deep-linking-from-plutono-panels-to-the-log-analytics-query-editor-in-azure-portal" >}}). Click on a time series in the panel to see a context menu with a link to View in Azure Portal. Clicking that link opens the Azure Log Analytics query editor in the Azure Portal and runs the query from the Plutono panel. -## Grafana Enterprise +## Plutono Enterprise -Grafana Enterprise focuses on solving problems for large companies and Grafana installations. And in Grafana 7.0 we are finally -solving one of the most common problems of using Grafana at scale. +Plutono Enterprise focuses on solving problems for large companies and Plutono installations. And in Plutono 7.0 we are finally +solving one of the most common problems of using Plutono at scale. This includes problems like: @@ -208,13 +208,13 @@ This includes problems like: ### Usage insights and Presence indicator -This release includes a series of features that build on our new usage analytics engine. This “Grafana about Grafana” feature will help our large customers get better insight into the behavior and utilization of their users, dashboards, and data sources. The improved [dashboard search]({{< relref "../enterprise/usage-insights/#improved-dashboard-search" >}}) allows you to sort dashboards by usage and errors. When a user opens a dashboard, they will see a [presence indicator]({{< relref "../enterprise/usage-insights/#presence-indicator" >}}) of who else is viewing the same dashboard. And finally [Dashboard insights]({{< relref "../enterprise/usage-insights/#dashboard-insights" >}}) allows you to view recent dashboard usage. +This release includes a series of features that build on our new usage analytics engine. This “Plutono about Plutono” feature will help our large customers get better insight into the behavior and utilization of their users, dashboards, and data sources. The improved [dashboard search]({{< relref "../enterprise/usage-insights/#improved-dashboard-search" >}}) allows you to sort dashboards by usage and errors. When a user opens a dashboard, they will see a [presence indicator]({{< relref "../enterprise/usage-insights/#presence-indicator" >}}) of who else is viewing the same dashboard. And finally [Dashboard insights]({{< relref "../enterprise/usage-insights/#dashboard-insights" >}}) allows you to view recent dashboard usage. -{{< figure src="/static/img/docs/v70/presence_indicator.jpg" max-width="1024px" caption="Grafana Enterprise - Presence indicator" >}} +{{< figure src="/static/img/docs/v70/presence_indicator.jpg" max-width="1024px" caption="Plutono Enterprise - Presence indicator" >}} ### SAML Role and Team Sync -SAML support in Grafana Enterprise is improved by adding Role and Team Sync. Read more about how to use these features in the [SAML team sync documentation]({{< relref "../enterprise/saml.md#configure-team-sync" >}}). +SAML support in Plutono Enterprise is improved by adding Role and Team Sync. Read more about how to use these features in the [SAML team sync documentation]({{< relref "../enterprise/saml.md#configure-team-sync" >}}). ### Okta OAuth Team Sync @@ -226,4 +226,4 @@ See [upgrade notes]({{< relref "../installation/upgrading/#upgrading-to-v7-0" >} ## Changelog -Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. +Check out [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. diff --git a/docs/sources/whatsnew/whats-new-in-v7-1.md b/docs/sources/whatsnew/whats-new-in-v7-1.md index ceccc8d671..bdac275daf 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-1.md +++ b/docs/sources/whatsnew/whats-new-in-v7-1.md @@ -1,16 +1,16 @@ +++ -title = "What's New in Grafana v7.1" -description = "Feature and improvement highlights for Grafana v7.1" -keywords = ["grafana", "new", "documentation", "7.1", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-1/"] +title = "What's New in Plutono v7.1" +description = "Feature and improvement highlights for Plutono v7.1" +keywords = ["plutono", "new", "documentation", "7.1", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v7-1/"] weight = -28 [_build] list = false +++ -# What's new in Grafana v7.1 +# What's new in Plutono v7.1 -This topic includes the release notes for the Grafana v7.1. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). +This topic includes the release notes for the Plutono v7.1. For all details, read the full [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md). The main highlights are: @@ -24,25 +24,25 @@ The main highlights are: - [**Provisioning of apps**]({{< relref "#provisioning-of-apps" >}}) - [**Azure Monitor Datasource**]({{< relref "#azure-monitor-datasource" >}}) - [**Deep linking for Google Cloud Monitoring (formerly named Google Stackdriver) datasource**]({{< relref "#deep-linking-for-google-cloud-monitoring-formerly-named-google-stackdriver-datasource" >}}) -- [**Grafana Enterprise features**]({{< relref "#grafana-enterprise-features" >}}) +- [**Plutono Enterprise features**]({{< relref "#plutono-enterprise-features" >}}) - [**Secret management with HashiCorp Vault**]({{< relref "#support-for-hashicorp-vault" >}}) - [**Monthly schedules in reports**]({{< relref "#support-for-monthly-schedules-in-reports" >}}) ## Influx data source -Support for Flux and Influx v2 has been added. The InfluxData blog post, [How to Build Grafana Dashboards with InfluxDB, Flux and InfluxQL](https://www.influxdata.com/blog/how-grafana-dashboard-influxdb-flux-influxql/) explains the changes in depth. +Support for Flux and Influx v2 has been added. The InfluxData blog post, [How to Build Plutono Dashboards with InfluxDB, Flux and InfluxQL](https://www.influxdata.com/blog/how-plutono-dashboard-influxdb-flux-influxql/) explains the changes in depth. ## Query history search -In Grafana v 7.1 we are introducing search functionality in Query history. You can search across queries and your comments. It is especially useful in combination with a time filter and data source filter. Read more about [Query history here]({{< relref "../explore/_index.md#query-history" >}}). +In Plutono v 7.1 we are introducing search functionality in Query history. You can search across queries and your comments. It is especially useful in combination with a time filter and data source filter. Read more about [Query history here]({{< relref "../explore/_index.md#query-history" >}}). {{< figure src="/static/img/docs/v71/query_history_search.gif" max-width="800px" caption="Query history search" >}} ## Explore modes unified -Grafana 7.1 includes a major change to Explore: it removes the query mode selector. +Plutono 7.1 includes a major change to Explore: it removes the query mode selector. -Many data sources tell Grafana whether a response contains time series data or logs data. Using this information, Explore chooses which visualization to use for that data. This means that you don't need to switch back and forth between Logs and Metrics modes depending on the type of query that you want to make. +Many data sources tell Plutono whether a response contains time series data or logs data. Using this information, Explore chooses which visualization to use for that data. This means that you don't need to switch back and forth between Logs and Metrics modes depending on the type of query that you want to make. ## Internal links for Elasticsearch @@ -73,7 +73,7 @@ You can use the Text mode option to control what text the panel renders. If the ## Provisioning of apps -Grafana v7.1 adds support for provisioning of app plugins. This allows app plugins to be configured and enabled/disabled using configuration files. For more information about provisioning of app, refer to [provisioning plugin]({{}}). +Plutono v7.1 adds support for provisioning of app plugins. This allows app plugins to be configured and enabled/disabled using configuration files. For more information about provisioning of app, refer to [provisioning plugin]({{}}). ## Azure Monitor data source @@ -83,7 +83,7 @@ Additionally, the Raw Edit mode for Application Insights Analytics has been repl ## Deep linking for Google Cloud Monitoring (formerly named Google Stackdriver) data source -A new feature in Grafana 7.1 is [deep linking from Grafana panels to the Metrics Explorer in Google Cloud Console]({{}}). Click on a time series in the panel to see a context menu with a link to View in Metrics explorer in Google Cloud Console. Clicking that link opens the Metrics explorer in the Monitoring Google Cloud Console and runs the query from the Grafana panel there. +A new feature in Plutono 7.1 is [deep linking from Plutono panels to the Metrics Explorer in Google Cloud Console]({{}}). Click on a time series in the panel to see a context menu with a link to View in Metrics explorer in Google Cloud Console. Clicking that link opens the Metrics explorer in the Monitoring Google Cloud Console and runs the query from the Plutono panel there. ## Time range picker update @@ -91,17 +91,17 @@ With 7.1 we are updating the dashboard's time range picker to allow time zone se The time zone picker itself also got UX improvements. Now you can search for the timezone using country or city name, time zone abbreviations, or UTC offsets. -## Grafana Enterprise features +## Plutono Enterprise features -General features are included in the Grafana Enterprise edition software. +General features are included in the Plutono Enterprise edition software. ### Support for HashiCorp Vault -You can now use HashiCorp Vault to get secrets for configuration and provisioning of Grafana Enterprise. For more information about HashiCorp Vault, refer to [vault]({{}}). +You can now use HashiCorp Vault to get secrets for configuration and provisioning of Plutono Enterprise. For more information about HashiCorp Vault, refer to [vault]({{}}). ### Support for monthly schedules in reports -With Grafana Enterprise 7.1, you can generate reports on a [monthly schedule]({{}}). +With Plutono Enterprise 7.1, you can generate reports on a [monthly schedule]({{}}). ## Upgrading @@ -109,4 +109,4 @@ See [upgrade notes]({{}}). ## Changelog -Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. +Check out [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. diff --git a/docs/sources/whatsnew/whats-new-in-v7-2.md b/docs/sources/whatsnew/whats-new-in-v7-2.md index c056538290..a34e39c858 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-2.md +++ b/docs/sources/whatsnew/whats-new-in-v7-2.md @@ -1,16 +1,16 @@ +++ -title = "What's New in Grafana v7.2" -description = "Feature and improvement highlights for Grafana v7.2" -keywords = ["grafana", "new", "documentation", "7.2", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-2/"] +title = "What's New in Plutono v7.2" +description = "Feature and improvement highlights for Plutono v7.2" +keywords = ["plutono", "new", "documentation", "7.2", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v7-2/"] weight = -29 [_build] list = false +++ -# What's new in Grafana v7.2 +# What's new in Plutono v7.2 -This topic includes the release notes for the Grafana v7.2. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). +This topic includes the release notes for the Plutono v7.2. For all details, read the full [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md). The main highlights are: @@ -24,23 +24,23 @@ The main highlights are: - [**$__rate_interval for Prometheus**]({{< relref "#__rate_interval-for-prometheus" >}}) - [**Toggle parsed log fields**]({{< relref "#toggle-parsed-log-fields" >}}) - [**Sensitive alert channel settings are now encrypted**]({{< relref "#sensitive-alert-channel-settings-are-now-encrypted" >}}) -- [**Grafana Enterprise features**]({{< relref "#grafana-enterprise-features" >}}) +- [**Plutono Enterprise features**]({{< relref "#plutono-enterprise-features" >}}) - [**Report time range**]({{< relref "#report-time-range" >}}) - [**Organization-wide report settings**]({{< relref "#organization-wide-report-settings" >}}) - [**Report grid layout**]({{< relref "#report-grid-layout" >}}) -- [**What's new in other parts of the Grafana ecosystem**]({{< relref "#whats-new-in-other-parts-of-the-grafana-ecosystem">}}) +- [**What's new in other parts of the Plutono ecosystem**]({{< relref "#whats-new-in-other-parts-of-the-plutono-ecosystem">}}) - [**ADX (Azure Data Explorer) plugin**]({{< relref "#adx-azure-data-explorer-plugin">}}) - [**X-Ray data source plugin**]({{< relref "#x-ray-data-source-plugin" >}}) ## New date formatting options added -You can now customize how dates are formatted in Grafana. Custom date formats apply to the time range picker, graphs, and other panel visualizations. +You can now customize how dates are formatted in Plutono. Custom date formats apply to the time range picker, graphs, and other panel visualizations. -This screenshot shows both a custom full date format with a 12 hour clock and am/pm suffix. The graph is also showing the same 12-hour clock format and a customized month and day format compared to the Grafana default `MM/DD` format. +This screenshot shows both a custom full date format with a 12 hour clock and am/pm suffix. The graph is also showing the same 12-hour clock format and a customized month and day format compared to the Plutono default `MM/DD` format. {{< figure src="/static/img/docs/v72/date_formats.png" max-width="800px" caption="Custom date time formats" >}} -Date formats are set for a Grafana instance by adjusting [server-wide settings]({{< relref "../administration/configuration.md#date_formats" >}}) in the Grafana configuration file. We hope to add org- and user-level settings in the future. +Date formats are set for a Plutono instance by adjusting [server-wide settings]({{< relref "../administration/configuration.md#date_formats" >}}) in the Plutono configuration file. We hope to add org- and user-level settings in the future. ``` [date_formats] @@ -77,7 +77,7 @@ The [Field options]({{< relref "../panels/field-options/_index.md" >}}) content ## New transformations and enhancements -Grafana 7.2 includes the following transformation enhancements: +Plutono 7.2 includes the following transformation enhancements: - A new [Group By]({{< relref "../panels/transformations/types-options.md#group-by">}}) transformation that allows you to group by multiple fields and add any number of aggregations for other fields. - The [Labels to fields]({{< relref "../panels/transformations/types-options.md#labels-to-fields">}}) transformation now allows you to pick one label and use that as the name of the value field. @@ -115,9 +115,9 @@ Alert notification channels now store sensitive settings and secrets, such as AP Please read the [upgrade notes]({{< relref "../installation/upgrading.md#ensure-encryption-of-existing-alert-notification-channel-secrets" >}}) for more information and how to migrate. -## Grafana Enterprise features +## Plutono Enterprise features -These features are included in the Grafana Enterprise edition software. +These features are included in the Plutono Enterprise edition software. ### Report and export dashboards in grid layout @@ -147,9 +147,9 @@ See [upgrade notes]({{< relref "../installation/upgrading.md" >}}). ## Changelog -Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. +Check out [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. -## What's new in other parts of the Grafana ecosystem +## What's new in other parts of the Plutono ecosystem ### ADX (Azure Data Explorer) plugin @@ -159,4 +159,4 @@ In collaboration with Microsoft, we have improved the usability of our ADX datas ### X-Ray data source plugin -We are pleased to announce our very first version of our data source plugin for AWS X-Ray. You can use this plugin to visualize traces, look at analytics tables, and see insight summaries. For more information, refer to the [X-Ray data source](https://grafana.com/grafana/plugins/grafana-x-ray-datasource) plugin page. +We are pleased to announce our very first version of our data source plugin for AWS X-Ray. You can use this plugin to visualize traces, look at analytics tables, and see insight summaries. For more information, refer to the [X-Ray data source](https://grafana.com/grafana/plugins/plutono-x-ray-datasource) plugin page. diff --git a/docs/sources/whatsnew/whats-new-in-v7-3.md b/docs/sources/whatsnew/whats-new-in-v7-3.md index 1a2961fdb6..051dc39c27 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-3.md +++ b/docs/sources/whatsnew/whats-new-in-v7-3.md @@ -1,16 +1,16 @@ +++ -title = "What's New in Grafana v7.3" -description = "Feature and improvement highlights for Grafana v7.3" -keywords = ["grafana", "new", "documentation", "7.3", "release notes"] -aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-3/"] +title = "What's New in Plutono v7.3" +description = "Feature and improvement highlights for Plutono v7.3" +keywords = ["plutono", "new", "documentation", "7.3", "release notes"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v7-3/"] weight = -30 [_build] list = false +++ -# What's new in Grafana v7.3 +# What's new in Plutono v7.3 -This topic includes the release notes for Grafana v7.3. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) or the [Patch release notes](#patch-release-notes). +This topic includes the release notes for Plutono v7.3. For all details, read the full [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) or the [Patch release notes](#patch-release-notes). The main highlights are: @@ -37,15 +37,15 @@ Another new feature that can be seen in the image above is the new image cell di A new standard field [color scheme]({{< relref "../panels/field-options/standard-field-options.md#color-scheme" >}}) option has been added. This new option will provide a unified way for all new panels to specify how colors should be assigned. - **Single color**: Specifies a single color. Useful in an override rule. -- **From thresholds**: Informs Grafana to take color from the matching threshold. -- **Classic palette**: Assigns a color by looking up a color in a palette by series index. Useful for Graphs and pie charts, and other categorical data visualizations in Grafana. -- **Green-Yellow-Red (by value)**: A continuous color scheme where Grafana will interpolate a color based on the value assigned to the green, yellow, and red components. The value must be within the min & max limits. +- **From thresholds**: Informs Plutono to take color from the matching threshold. +- **Classic palette**: Assigns a color by looking up a color in a palette by series index. Useful for Graphs and pie charts, and other categorical data visualizations in Plutono. +- **Green-Yellow-Red (by value)**: A continuous color scheme where Plutono will interpolate a color based on the value assigned to the green, yellow, and red components. The value must be within the min & max limits. - **Blue-Yellow-Red (by value)**: Same as above but different colors. - **Blues (by value)**: Same as above but color scheme go from panel background to blue.
-As you can see this adds new continuous color schemes where Grafana will interpolate colors. A great use of these new color schemes is the table panel where you can color the background and get a heatmap like effect. +As you can see this adds new continuous color schemes where Plutono will interpolate colors. A great use of these new color schemes is the table panel where you can color the background and get a heatmap like effect. {{< figure src="/static/img/docs/v73/table_color_scheme.png" max-width="900px" caption="table color scheme" >}} @@ -61,7 +61,7 @@ As this new option is a standard field option it works in every panel. Here is a In v7.0, we introduced a new table panel and inspect mode with Download CSV enabled. However, CSV export to Excel was removed. Due to a large number of inquiries and requests, this [community contribution from tomdaly](https://github.com/grafana/grafana/pull/27284) brought the feature back. -For more information, refer to [Download raw query results as CSV]({{< relref "../panels/inspect-panel/#download-raw-query-results-as-csv" >}}) in the Grafana documentation. +For more information, refer to [Download raw query results as CSV]({{< relref "../panels/inspect-panel/#download-raw-query-results-as-csv" >}}) in the Plutono documentation. ## Google Cloud monitoring out-of-the-box dashboards @@ -83,21 +83,21 @@ This is an amazing new feature that was created in cooperation with one of our c ## SigV4 authentication for AWS users -You can now configure your Elasticsearch data source to access your Amazon Elasticsearch Service domain directly from Grafana. +You can now configure your Elasticsearch data source to access your Amazon Elasticsearch Service domain directly from Plutono. For more details, refer to the [Elasticsearch docs]({{}}). ## Chaining pipeline aggregation in Elasticsearch -Thanks to a contribution from a community member, it's now possible to chain multiple pipeline aggregations together and use the results of one pipeline aggregation as the input of another. This unleashes the full power of Elasticsearch's pipeline aggregations in Grafana, allowing users to perform high order derivatives or use a pipeline aggregation result as a variable for a Bucket Script Aggregation. +Thanks to a contribution from a community member, it's now possible to chain multiple pipeline aggregations together and use the results of one pipeline aggregation as the input of another. This unleashes the full power of Elasticsearch's pipeline aggregations in Plutono, allowing users to perform high order derivatives or use a pipeline aggregation result as a variable for a Bucket Script Aggregation. -## Grafana Enterprise features +## Plutono Enterprise features -These features are included in the Grafana Enterprise edition software. +These features are included in the Plutono Enterprise edition software. ### Auditing -Auditing tracks important changes to your Grafana instance to help you manage and mitigate suspicious activity and meet compliance requirements. Grafana logs events (as JSON) to file or directly to [loki](/oss/loki/). +Auditing tracks important changes to your Plutono instance to help you manage and mitigate suspicious activity and meet compliance requirements. Plutono logs events (as JSON) to file or directly to [loki](/oss/loki/). Example of a login event: @@ -109,7 +109,7 @@ Example of a login event: "orgId": 1, "isAnonymous": false }, - "action": "login-grafana", + "action": "login-plutono", "result": { "statusType": "success", "statusCode": 200 @@ -117,7 +117,7 @@ Example of a login event: "requestUri": "/login", "ipAddress": "127.0.0.1:41324", "userAgent": "Chrome/86.0.4240.111", - "grafanaVersion": "7.3.0" + "plutonoVersion": "7.3.0" } ``` @@ -147,15 +147,15 @@ See [upgrade notes]({{< relref "../installation/upgrading.md" >}}). ## Changelog -Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. +Check out [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. ## Patch release notes -- [Grafana 7.3.0 release notes]({{< relref "../release-notes/release-notes-7-3-0.md" >}}) -- [Grafana 7.3.1 release notes]({{< relref "../release-notes/release-notes-7-3-1.md" >}}) -- [Grafana 7.3.2 release notes]({{< relref "../release-notes/release-notes-7-3-2.md" >}}) -- [Grafana 7.3.3 release notes]({{< relref "../release-notes/release-notes-7-3-3.md" >}}) -- [Grafana 7.3.4 release notes]({{< relref "../release-notes/release-notes-7-3-4.md" >}}) -- [Grafana 7.3.5 release notes]({{< relref "../release-notes/release-notes-7-3-5.md" >}}) -- [Grafana 7.3.6 release notes]({{< relref "../release-notes/release-notes-7-3-6.md" >}}) -- [Grafana 7.3.7 release notes]({{< relref "../release-notes/release-notes-7-3-7.md" >}}) +- [Plutono 7.3.0 release notes]({{< relref "../release-notes/release-notes-7-3-0.md" >}}) +- [Plutono 7.3.1 release notes]({{< relref "../release-notes/release-notes-7-3-1.md" >}}) +- [Plutono 7.3.2 release notes]({{< relref "../release-notes/release-notes-7-3-2.md" >}}) +- [Plutono 7.3.3 release notes]({{< relref "../release-notes/release-notes-7-3-3.md" >}}) +- [Plutono 7.3.4 release notes]({{< relref "../release-notes/release-notes-7-3-4.md" >}}) +- [Plutono 7.3.5 release notes]({{< relref "../release-notes/release-notes-7-3-5.md" >}}) +- [Plutono 7.3.6 release notes]({{< relref "../release-notes/release-notes-7-3-6.md" >}}) +- [Plutono 7.3.7 release notes]({{< relref "../release-notes/release-notes-7-3-7.md" >}}) diff --git a/docs/sources/whatsnew/whats-new-in-v7-4.md b/docs/sources/whatsnew/whats-new-in-v7-4.md index f6a4a77619..72fe4f0c11 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-4.md +++ b/docs/sources/whatsnew/whats-new-in-v7-4.md @@ -1,28 +1,28 @@ +++ -title = "What's New in Grafana v7.4" -description = "Feature and improvement highlights for Grafana v7.4" -keywords = ["grafana", "new", "documentation", "7.4", "release notes"] +title = "What's New in Plutono v7.4" +description = "Feature and improvement highlights for Plutono v7.4" +keywords = ["plutono", "new", "documentation", "7.4", "release notes"] weight = -31 -aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-4/"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v7-4/"] [_build] list = false +++ -# What's new in Grafana v7.4 +# What's new in Plutono v7.4 -This topic includes the release notes for Grafana v7.4. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). +This topic includes the release notes for Plutono v7.4. For all details, read the full [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md). -Check out the [New Features in 7.4](https://play.grafana.org/d/nP8rcffGk/1-new-features-in-v7-4?orgId=1) dashboard on Grafana Play! +Check out the [New Features in 7.4](https://play.plutono.org/d/nP8rcffGk/1-new-features-in-v7-4?orgId=1) dashboard on Plutono Play! -## Grafana OSS features +## Plutono OSS features -These features are included in the Grafana open source edition. +These features are included in the Plutono open source edition. ### Time series panel visualization (Beta) -Grafana 7.4 adds a beta version of the next-gen graph visualization. The new graph panel, the _Time series_ visualization, is high-performance visualization based on the uPlot library. This new graph visualization uses the new panel architecture introduced in Grafana 7.0 and integrates with field options, overrides, and transformations. +Plutono 7.4 adds a beta version of the next-gen graph visualization. The new graph panel, the _Time series_ visualization, is high-performance visualization based on the uPlot library. This new graph visualization uses the new panel architecture introduced in Plutono 7.0 and integrates with field options, overrides, and transformations. -The Time series beta panel implements the majority of the functionalities available in the current Graph panel. Our plan is to have close to full coverage of the features in Grafana 8.0, coming later this year. +The Time series beta panel implements the majority of the functionalities available in the current Graph panel. Our plan is to have close to full coverage of the features in Plutono 8.0, coming later this year. Apart from major performance improvements, the new Time series panel implements new features like line interpolation modes, support for more than two Y-axes, soft min and max axis limits, automatic points display based on data density, and gradient fill modes. @@ -42,13 +42,13 @@ _Node graph_ is a new panel type that can visualize directed graphs or network i All the information and stats shown in the Node graph beta are driven by the data provided in the response from the data source. The first data source that is using this panel is AWS X-Ray, for displaying their service map data. -For more details about how to use the X-Ray service map feature, see the [X-Ray plugin documentation](https://grafana.com/grafana/plugins/grafana-x-ray-datasource). +For more details about how to use the X-Ray service map feature, see the [X-Ray plugin documentation](https://grafana.com/grafana/plugins/plutono-x-ray-datasource). For more information, refer to [Node graph panel]({{< relref "../panels/visualizations/node-graph.md" >}}). ### New transformations -The following transformations were added in Grafana 7.4. +The following transformations were added in Plutono 7.4. #### Sort by transformation @@ -58,7 +58,7 @@ For more information, refer to [Sort by]({{< relref "../panels/transformations/t #### Filter data by value transform -The new _Filter data by value_ transformation allows you to filter your data directly in Grafana and remove some data points from your query result. +The new _Filter data by value_ transformation allows you to filter your data directly in Plutono and remove some data points from your query result. This transformation is very useful if your data source does not natively filter by values. You might also use this to narrow values to display if you are using a shared query. @@ -72,7 +72,7 @@ For more information, refer to [Add a field override]({{< relref "../panels/fiel ### Exemplar support -Grafana graphs now support Prometheus _exemplars_. They are displayed as diamonds in the graph visualization. +Plutono graphs now support Prometheus _exemplars_. They are displayed as diamonds in the graph visualization. > **Note:** Support for exemplars will be added in version Prometheus 2.25+. @@ -97,7 +97,7 @@ _Server-side expressions_ is an experimental feature that allows you to manipula The main use case is for [multi-dimensional]({{< relref "../basics/timeseries-dimensions.md" >}}) data sources used with the upcoming next generation alerting, but expressions can be used with backend data sources and visualization as well. -> **Note:** Queries built with this feature might break with minor version upgrades until Grafana 8 is released. This feature does not work with the current Grafana alerting. +> **Note:** Queries built with this feature might break with minor version upgrades until Plutono 8 is released. This feature does not work with the current Plutono alerting. For more information, refer to [Expressions]({{< relref "../panels/expressions.md" >}}). [Queries]({{< relref "../panels/queries.md" >}}) was also updated as a result of this feature. @@ -113,7 +113,7 @@ For more information, refer to the [alert notification docs]({{< relref "../aler We have added support for [Content Security Policy (CSP)](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP), a layer of security that helps detect and mitigate certain types of attacks, including Cross Site Scripting (XSS) and data injection attacks. -CSP support is disabled by default, to enable it you must set `content_security_policy = true` in the Grafana configuration. If enabling it, you should also review, and potentially tweak, the CSP header template, via the configuration setting `content_security_policy_template`. +CSP support is disabled by default, to enable it you must set `content_security_policy = true` in the Plutono configuration. If enabling it, you should also review, and potentially tweak, the CSP header template, via the configuration setting `content_security_policy_template`. You can lock down what can be done in the frontend code. Lock down what can be loaded, what JavaScript is executed. Not compatible with some plugins. @@ -127,7 +127,7 @@ You can now use the `hidden_users` configuration setting to hide specific users ### Elasticsearch data source updates -Grafana 7.4 includes the following enhancements +Plutono 7.4 includes the following enhancements - Added support for serial differencing pipeline aggregation. - Added support for moving function pipeline aggregation. @@ -140,7 +140,7 @@ For more information, refer to the [Elasticsearch docs]({{}}) was updated to reflect this change. @@ -180,23 +180,23 @@ The variables list has an additional column indicating whether variables are ref For more information, refer to [Inspect variables and their dependencies]({{< relref "../variables/inspect-variable.md">}}). -## Grafana Enterprise features +## Plutono Enterprise features -These features are included in the Grafana Enterprise edition. +These features are included in the Plutono Enterprise edition. ### Licensing changes When determining a user’s role for billing purposes, a user who has the ability to edit and save dashboards is considered an Editor. This includes any user who is an Editor or Admin at the Org level, and who has granted Admin or Edit permissions via [Dashboard and folder permissions]({{< relref "../permissions/dashboard-folder-permissions.md">}}). -After the number of Viewers or Editors has reached its license limit, only Admins will see a banner in Grafana indicating that the license limit has been reached. Previously, all users saw the banner. +After the number of Viewers or Editors has reached its license limit, only Admins will see a banner in Plutono indicating that the license limit has been reached. Previously, all users saw the banner. -Grafana Enterprise license tokens update automatically on a daily basis, which means you no longer need to manually update your license, and the process for adding additional users to a license is smoother than it was before. +Plutono Enterprise license tokens update automatically on a daily basis, which means you no longer need to manually update your license, and the process for adding additional users to a license is smoother than it was before. Refer to [Licensing restrictions]({{< relref "../enterprise/license/license-restrictions.md" >}}) for more information. ### Export usage insights to Loki -You can now export usage insights logs to Loki and query them from Grafana. Usage insights logs include dashboard visits, data source views, queries and errors, and more. +You can now export usage insights logs to Loki and query them from Plutono. Usage insights logs include dashboard visits, data source views, queries and errors, and more. For more information, refer to [Export logs of usage insights]({{< relref "../enterprise/usage-insights/export-logs.md" >}}). @@ -216,13 +216,13 @@ You can now select a font, other than the default, for Unicode-based scripts. As ### Request security -Request security introduces ways to limit requests from the Grafana server, and it targets requests that are generated by users. +Request security introduces ways to limit requests from the Plutono server, and it targets requests that are generated by users. For more information, refer to [Request security]({{< relref "../enterprise/request-security.md" >}}). ## Breaking changes -The following Grafana 7.4 changes might break previous functionality. +The following Plutono 7.4 changes might break previous functionality. ### Plugin compatibility @@ -240,4 +240,4 @@ See [upgrade notes]({{< relref "../installation/upgrading.md" >}}). ## Changelog -Check out [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. +Check out [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md) for a complete list of new features, changes, and bug fixes. diff --git a/docs/sources/whatsnew/whats-new-in-v7-5.md b/docs/sources/whatsnew/whats-new-in-v7-5.md index 7fe6a9954f..bda60f8118 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-5.md +++ b/docs/sources/whatsnew/whats-new-in-v7-5.md @@ -1,24 +1,24 @@ +++ -title = "What's new in Grafana v7.5" -description = "Feature and improvement highlights for Grafana v7.5" -keywords = ["grafana", "new", "documentation", "7.5", "release notes"] +title = "What's new in Plutono v7.5" +description = "Feature and improvement highlights for Plutono v7.5" +keywords = ["plutono", "new", "documentation", "7.5", "release notes"] weight = -32 -aliases = ["/docs/grafana/latest/guides/whats-new-in-v7-5/"] +aliases = ["/docs/plutono/latest/guides/whats-new-in-v7-5/"] [_build] list = false +++ -# What’s new in Grafana v7.5 +# What’s new in Plutono v7.5 -This topic includes the release notes for Grafana v7.5. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). +This topic includes the release notes for Plutono v7.5. For all details, read the full [CHANGELOG.md](https://github.com/credativ/plutono/blob/master/CHANGELOG.md). -## Grafana OSS features +## Plutono OSS features -These features are included in the Grafana open source edition. +These features are included in the Plutono open source edition. ### Pie chart panel visualization (beta) -Grafana 7.5 adds a beta version of the next-generation pie chart panel. +Plutono 7.5 adds a beta version of the next-generation pie chart panel. ![Pie chart panel](/static/img/docs/pie-chart-panel/pie-chart-panel-7-5.png) @@ -26,7 +26,7 @@ For more information, refer to [Pie chart panel]({{< relref "../panels/visualiza ### Alerting for Loki -Grafana 7.5 comes with alerting support for Loki. With LogQL you can wrap a log query with the functions that allow for creating metrics out of the logs, such as "rate()". Metric queries can then be used to calculate things such as the rate of error messages. [When combined with log parsers](https://www.youtube.com/watch?v=H9z2V0Ib1q0), they can be used to calculate metrics from a value within the log line, such latency or request size. +Plutono 7.5 comes with alerting support for Loki. With LogQL you can wrap a log query with the functions that allow for creating metrics out of the logs, such as "rate()". Metric queries can then be used to calculate things such as the rate of error messages. [When combined with log parsers](https://www.youtube.com/watch?v=H9z2V0Ib1q0), they can be used to calculate metrics from a value within the log line, such latency or request size. With alerting support for Loki, you can now create alerts on Loki metrics queries. @@ -54,7 +54,7 @@ When searching for text in Elasticsearch logs, matching words in the log line re ### Better format definition for trace data -In Grafana 7.5, we changed how data for the trace view is sent from the data source. The required data frame has a clear format, which is more aligned with how data is generally represented in Grafana. This makes it easier for third-party developers to implement data sources leveraging the trace view. +In Plutono 7.5, we changed how data for the trace view is sent from the data source. The required data frame has a clear format, which is more aligned with how data is generally represented in Plutono. This makes it easier for third-party developers to implement data sources leveraging the trace view. For more information, refer to [trace data API docs]({{< relref "../explore/trace-integration.md#data-api" >}}). @@ -64,23 +64,23 @@ Previously, when users wanted to configure the Postgres data source to connect w Instead of the file path, users can now paste the SSL certification content in the UI. This allows them to configure the certification even when they do not have access to the server. -> **Note:** It remains as limitation for the hosted Grafana, because the user doesn't have access to the server configuration. +> **Note:** It remains as limitation for the hosted Plutono, because the user doesn't have access to the server configuration. [Postgres data source]({{< relref "../datasources/postgres.md" >}}) and [Provisioning]({{< relref "../administration/provisioning.md" >}}) were updated as a result of this change. ### Deprecation notice for some Azure Monitor queries -In the upcoming Grafana 8.0 release, Application Insights and Insights Analytics query types within the Azure Monitor data source will be deprecated and be made read-only in favor of querying Application Insights from Metrics and Logs. +In the upcoming Plutono 8.0 release, Application Insights and Insights Analytics query types within the Azure Monitor data source will be deprecated and be made read-only in favor of querying Application Insights from Metrics and Logs. -Grafana 7.5 includes a deprecation notice for these queries, and some documentation to help users prepare for the upcoming changes. +Plutono 7.5 includes a deprecation notice for these queries, and some documentation to help users prepare for the upcoming changes. For more information, refer to [Deprecating Application Insights and Insights Analytics]({{< relref "../datasources/azuremonitor.md#deprecating-application-insights-and-insights-analytics" >}}). ### Cloudwatch data source enhancements - Support for region eu-south-1 has been added to the CloudWatch data source. New metrics have also been added to the namespaces AWS/Timestream, AWS/RDS (RDS Proxy metrics), AWS/NetworkFirewall, AWS/GroundStation, and AWS/DDoSProtection. Many thanks to [relvira](https://github.com/relvira), [ilyastoli](https://github.com/ilyastoli), and [rubycut](https://github.com/rubycut) for contributing! -- Added a page limit to the List Metrics API call to improve speed and reduce memory consumption. You can change this limit by entering a higher value in [list_metrics_page_limit]({{< relref "../administration/configuration.md#list-metrics-page-limit" >}}) in the Grafana configuration file. -- You can now enable or disable authentication providers and assume a role other than default by changing the [allowed_auth_providers]({{< relref "../administration/configuration.md#allowed-auth-providers" >}}) and [assume_role_enabled]({{< relref "../administration/configuration.md#assume-role-enabled" >}}) options in the Grafana configuration file. By default, the allowed authentication providers are _AWS SDK Default_, _Access && secret key_, and _Credentials File_, and role is _Assume role (ARN)_. +- Added a page limit to the List Metrics API call to improve speed and reduce memory consumption. You can change this limit by entering a higher value in [list_metrics_page_limit]({{< relref "../administration/configuration.md#list-metrics-page-limit" >}}) in the Plutono configuration file. +- You can now enable or disable authentication providers and assume a role other than default by changing the [allowed_auth_providers]({{< relref "../administration/configuration.md#allowed-auth-providers" >}}) and [assume_role_enabled]({{< relref "../administration/configuration.md#assume-role-enabled" >}}) options in the Plutono configuration file. By default, the allowed authentication providers are _AWS SDK Default_, _Access && secret key_, and _Credentials File_, and role is _Assume role (ARN)_. - You can now specify a custom endpoint in the CloudWatch data source configuration page. This field is optional, and if it is left empty, then the default endpoint for CloudWatch is used. By specifying a regional endpoint, you can reduce request latency. [AWS Cloudwatch data source]({{< relref "../datasources/cloudwatch.md#endpoint" >}}) was updated as a result of this change. @@ -102,11 +102,11 @@ server: ## Enterprise features -These features are included in the Grafana Enterprise edition. +These features are included in the Plutono Enterprise edition. ### Query caching -When caching is enabled, Grafana temporarily stores the results of data source queries. When you or another user submit the same query again, the results return from the cache instead of from the data source (such as Splunk or ServiceNow). +When caching is enabled, Plutono temporarily stores the results of data source queries. When you or another user submit the same query again, the results return from the cache instead of from the data source (such as Splunk or ServiceNow). Query caching advantages: - Faster dashboard load times, especially for popular dashboards. @@ -127,11 +127,11 @@ For more information, refer to [Reporting]({{< relref "../enterprise/reporting.m ### Active user limits -If a Grafana instance has exceeded its licensed number of active users, then non-active users who try to sign in to Grafana will be prevented from doing so. Active users are users who have logged in to Grafana in the past 30 days. The total number of users registered in Grafana does not affect this rule. This enforcement is applied separately for Viewers and for Editor/Admins, so if you reach your active Viewer limit, new Editor/Admins will still be able to sign in. This rule also includes a 10% buffer, meaning that you need to exceed your limit by 10% before users are prevented from signing in. +If a Plutono instance has exceeded its licensed number of active users, then non-active users who try to sign in to Plutono will be prevented from doing so. Active users are users who have logged in to Plutono in the past 30 days. The total number of users registered in Plutono does not affect this rule. This enforcement is applied separately for Viewers and for Editor/Admins, so if you reach your active Viewer limit, new Editor/Admins will still be able to sign in. This rule also includes a 10% buffer, meaning that you need to exceed your limit by 10% before users are prevented from signing in. Here is an example: -A Grafana Enterprise instance includes 100 Viewers and 50 Editor/Admins. Over the course of the last 30 days, 110 Viewers and 20 Editor/Admins have signed in to Grafana. +A Plutono Enterprise instance includes 100 Viewers and 50 Editor/Admins. Over the course of the last 30 days, 110 Viewers and 20 Editor/Admins have signed in to Plutono. All of the Viewers who have signed in over the past 30 days will retain the ability to sign in. @@ -141,11 +141,11 @@ If you try to sign in to a fourth device or browser, then you will be prevented If you sign in to a fourth device or browser, then you will be signed out of the session that is least current. Concurrent session limits -Each Grafana Enterprise user will be limited to three concurrent user sessions. When a user opens a fourth session, then the longest-inactive session will be automatically signed out. +Each Plutono Enterprise user will be limited to three concurrent user sessions. When a user opens a fourth session, then the longest-inactive session will be automatically signed out. -A new session is created when you sign in to Grafana from a different device or a different browser. Multiple windows and tabs in the same browser are all part of the same session, so having many Grafana tabs open will not cause any issues. +A new session is created when you sign in to Plutono from a different device or a different browser. Multiple windows and tabs in the same browser are all part of the same session, so having many Plutono tabs open will not cause any issues. -For more information on Grafana Enterprise licensing and restrictions, refer to [License restrictions]({{< relref "../enterprise/license/license-restrictions.md" >}}). +For more information on Plutono Enterprise licensing and restrictions, refer to [License restrictions]({{< relref "../enterprise/license/license-restrictions.md" >}}). ## Breaking changes diff --git a/e2e/kill-server b/e2e/kill-server index 70bf9f909f..8f59a3fe0c 100755 --- a/e2e/kill-server +++ b/e2e/kill-server @@ -3,7 +3,7 @@ . e2e/variables if [ -f "$PIDFILE" ]; then - echo -e "Found pidfile, killing running grafana-server" + echo -e "Found pidfile, killing running plutono-server" kill -9 `cat $PIDFILE` rm $PIDFILE fi diff --git a/e2e/run-suite b/e2e/run-suite index 267c06ac97..68190ce695 100755 --- a/e2e/run-suite +++ b/e2e/run-suite @@ -25,7 +25,7 @@ if [ "$1" == "dev" ]; then CMD="open" fi -cd packages/grafana-e2e +cd packages/plutono-e2e yarn $CMD --env BASE_URL=$URL,SLOWMO=$SLOWMO \ --config integrationFolder=../../e2e/$SUITE/specs,screenshotsFolder=../../e2e/$SUITE/screenshots,videosFolder=../../e2e/$SUITE/videos,fileServerFolder=./cypress,viewportWidth=1920,viewportHeight=1080,trashAssetsBeforeRuns=false \ diff --git a/e2e/shared/smokeTestScenario.ts b/e2e/shared/smokeTestScenario.ts index 5b7171c688..04cf4fcb50 100644 --- a/e2e/shared/smokeTestScenario.ts +++ b/e2e/shared/smokeTestScenario.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; export const smokeTestScenario = { describeName: 'Smoke tests', diff --git a/e2e/start-and-run-suite b/e2e/start-and-run-suite index 9aac995b61..301e897d36 100755 --- a/e2e/start-and-run-suite +++ b/e2e/start-and-run-suite @@ -7,7 +7,7 @@ if [ "$BASE_URL" != "" ]; then else # Start it in the background ./e2e/start-server 2>&1 > e2e/server.log & - ./e2e/wait-for-grafana + ./e2e/wait-for-plutono fi ./e2e/run-suite "$@" diff --git a/e2e/start-server b/e2e/start-server index 24105ae5d1..5dd4a48d19 100755 --- a/e2e/start-server +++ b/e2e/start-server @@ -10,7 +10,7 @@ PACKAGE_FILE=${PACKAGE_FILE:-$DEFAULT_PACKAGE_FILE} mkdir $RUNDIR -echo -e "Copying grafana backend files to temp dir..." +echo -e "Copying plutono backend files to temp dir..." # Expand any wildcards pkgs=(${PACKAGE_FILE}) @@ -18,12 +18,12 @@ pkg=${pkgs[0]} if [[ -f ${pkg} ]]; then echo "Found package tar file ${pkg}, extracting..." tar zxf ${pkg} -C $RUNDIR - mv $RUNDIR/grafana-*/* $RUNDIR + mv $RUNDIR/plutono-*/* $RUNDIR else echo "Couldn't find package ${PACKAGE_FILE} - copying local dev files" - if [[ ! -f bin/grafana-server ]]; then - echo bin/grafana-server missing + if [[ ! -f bin/plutono-server ]]; then + echo bin/plutono-server missing exit 1 fi @@ -46,9 +46,9 @@ cp devenv/dashboards.yaml $PROV_DIR/dashboards cp -r devenv $RUNDIR -echo -e "Starting Grafana Server port $PORT" +echo -e "Starting Plutono Server port $PORT" -$RUNDIR/bin/grafana-server \ +$RUNDIR/bin/plutono-server \ --homepath=$RUNDIR \ --pidfile=$RUNDIR/pid \ cfg:server.http_port=$PORT \ diff --git a/e2e/suite1/specs/1-smoketests.spec.ts b/e2e/suite1/specs/1-smoketests.spec.ts index 185eb389e0..818dd5961f 100644 --- a/e2e/suite1/specs/1-smoketests.spec.ts +++ b/e2e/suite1/specs/1-smoketests.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; import { smokeTestScenario } from '../../shared/smokeTestScenario'; e2e.scenario(smokeTestScenario); diff --git a/e2e/suite1/specs/bar-gauge.spec.ts b/e2e/suite1/specs/bar-gauge.spec.ts index 382e70d690..176281fb06 100644 --- a/e2e/suite1/specs/bar-gauge.spec.ts +++ b/e2e/suite1/specs/bar-gauge.spec.ts @@ -1,5 +1,5 @@ -import { e2e } from '@grafana/e2e'; -import { selectors } from '@grafana/e2e-selectors'; +import { e2e } from '@credativ/plutono-e2e'; +import { selectors } from '@credativ/plutono-e2e-selectors'; e2e.scenario({ describeName: 'Bar Gauge Panel', diff --git a/e2e/suite1/specs/dashboard-templating.spec.ts b/e2e/suite1/specs/dashboard-templating.spec.ts index a7c4db0103..2724d1eb64 100644 --- a/e2e/suite1/specs/dashboard-templating.spec.ts +++ b/e2e/suite1/specs/dashboard-templating.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; e2e.scenario({ describeName: 'Dashboard templating', diff --git a/e2e/suite1/specs/dashboard-time-zone.spec.ts b/e2e/suite1/specs/dashboard-time-zone.spec.ts index 7b4f99464a..6ede6753b2 100644 --- a/e2e/suite1/specs/dashboard-time-zone.spec.ts +++ b/e2e/suite1/specs/dashboard-time-zone.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; e2e.scenario({ describeName: 'Dashboard time zone support', diff --git a/e2e/suite1/specs/explore.spec.ts b/e2e/suite1/specs/explore.spec.ts index 7b4765a36f..f10feaf350 100644 --- a/e2e/suite1/specs/explore.spec.ts +++ b/e2e/suite1/specs/explore.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; e2e.scenario({ describeName: 'Explore', diff --git a/e2e/suite1/specs/gauge.spec.ts b/e2e/suite1/specs/gauge.spec.ts index 4fb1552cb2..08244dcd37 100644 --- a/e2e/suite1/specs/gauge.spec.ts +++ b/e2e/suite1/specs/gauge.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; e2e.scenario({ describeName: 'Gauge Panel', diff --git a/e2e/suite1/specs/inspect-drawer.spec.ts b/e2e/suite1/specs/inspect-drawer.spec.ts index 51087db4e7..af737175cc 100644 --- a/e2e/suite1/specs/inspect-drawer.spec.ts +++ b/e2e/suite1/specs/inspect-drawer.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; const PANEL_UNDER_TEST = '2 yaxis and axis labels'; diff --git a/e2e/suite1/specs/panelEdit_base.spec.ts b/e2e/suite1/specs/panelEdit_base.spec.ts index c4d3b5db08..28019e9dc7 100644 --- a/e2e/suite1/specs/panelEdit_base.spec.ts +++ b/e2e/suite1/specs/panelEdit_base.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; const PANEL_UNDER_TEST = 'Random walk series'; diff --git a/e2e/suite1/specs/panelEdit_queries.spec.ts b/e2e/suite1/specs/panelEdit_queries.spec.ts index 861feeaba2..8d5fdb65ae 100644 --- a/e2e/suite1/specs/panelEdit_queries.spec.ts +++ b/e2e/suite1/specs/panelEdit_queries.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; import { expect } from '../../../public/test/lib/common'; const PANEL_UNDER_TEST = 'Random walk series'; diff --git a/e2e/suite1/specs/panelEdit_transforms.spec.ts b/e2e/suite1/specs/panelEdit_transforms.spec.ts index 49e551c77a..8df8d502b3 100644 --- a/e2e/suite1/specs/panelEdit_transforms.spec.ts +++ b/e2e/suite1/specs/panelEdit_transforms.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; const PANEL_UNDER_TEST = 'Random walk series'; diff --git a/e2e/suite1/specs/query-editor.spec.ts b/e2e/suite1/specs/query-editor.spec.ts index edc15ba760..c466330b8d 100644 --- a/e2e/suite1/specs/query-editor.spec.ts +++ b/e2e/suite1/specs/query-editor.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; e2e.scenario({ describeName: 'Query editor', diff --git a/e2e/suite1/specs/select-focus.spec.ts b/e2e/suite1/specs/select-focus.spec.ts index 0087e3a295..d1dc0b2fc2 100644 --- a/e2e/suite1/specs/select-focus.spec.ts +++ b/e2e/suite1/specs/select-focus.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; e2e.scenario({ describeName: 'Select focus/unfocus tests', diff --git a/e2e/suite1/specs/solo-route.spec.ts b/e2e/suite1/specs/solo-route.spec.ts index 52c74efdc6..c422f9f44c 100644 --- a/e2e/suite1/specs/solo-route.spec.ts +++ b/e2e/suite1/specs/solo-route.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; e2e.scenario({ describeName: 'Solo Route', diff --git a/e2e/suite1/specs/templating-dashboard-links-and-variables.ts b/e2e/suite1/specs/templating-dashboard-links-and-variables.ts index 926f63f98a..22b96f3b82 100644 --- a/e2e/suite1/specs/templating-dashboard-links-and-variables.ts +++ b/e2e/suite1/specs/templating-dashboard-links-and-variables.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; e2e.scenario({ describeName: 'Templating', diff --git a/e2e/suite1/specs/trace-view-scrolling.spec.ts b/e2e/suite1/specs/trace-view-scrolling.spec.ts index 95ff1020b7..d8f413ed48 100644 --- a/e2e/suite1/specs/trace-view-scrolling.spec.ts +++ b/e2e/suite1/specs/trace-view-scrolling.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; describe('Trace view', () => { it('Can lazy load big traces', () => { diff --git a/e2e/suite1/specs/variables/load-options-from-url.ts b/e2e/suite1/specs/variables/load-options-from-url.ts index e2725034a2..38cdab20ca 100644 --- a/e2e/suite1/specs/variables/load-options-from-url.ts +++ b/e2e/suite1/specs/variables/load-options-from-url.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; const PAGE_UNDER_TEST = '-Y-tnEDWk'; diff --git a/e2e/suite1/specs/variables/new-query-variable.ts b/e2e/suite1/specs/variables/new-query-variable.ts index acecf71aab..15e22f94a9 100644 --- a/e2e/suite1/specs/variables/new-query-variable.ts +++ b/e2e/suite1/specs/variables/new-query-variable.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; const PAGE_UNDER_TEST = '-Y-tnEDWk'; diff --git a/e2e/suite1/specs/variables/set-options-from-ui.ts b/e2e/suite1/specs/variables/set-options-from-ui.ts index 4a22c95924..075fd95c24 100644 --- a/e2e/suite1/specs/variables/set-options-from-ui.ts +++ b/e2e/suite1/specs/variables/set-options-from-ui.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; const PAGE_UNDER_TEST = '-Y-tnEDWk'; diff --git a/e2e/suite1/specs/variables/textbox-variables.ts b/e2e/suite1/specs/variables/textbox-variables.ts index f9ced2945d..45bd9af3ee 100644 --- a/e2e/suite1/specs/variables/textbox-variables.ts +++ b/e2e/suite1/specs/variables/textbox-variables.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; const PAGE_UNDER_TEST = 'AejrN1AMz'; diff --git a/e2e/suite1/tsconfig.json b/e2e/suite1/tsconfig.json index f1cce18f82..eae1c29930 100644 --- a/e2e/suite1/tsconfig.json +++ b/e2e/suite1/tsconfig.json @@ -3,5 +3,5 @@ "types": ["cypress"] }, "extends": "../../tsconfig.json", - "include": ["**/*.ts", "../../packages/grafana-e2e/cypress/support/index.d.ts"] + "include": ["**/*.ts", "../../packages/plutono-e2e/cypress/support/index.d.ts"] } diff --git a/e2e/variables b/e2e/variables index 8a76f6134d..c3b6a117b7 100644 --- a/e2e/variables +++ b/e2e/variables @@ -3,7 +3,7 @@ DEFAULT_RUNDIR=e2e/tmp RUNDIR=${RUNDIR:-$DEFAULT_RUNDIR} PIDFILE=$RUNDIR/pid -DEFAULT_PACKAGE_FILE=dist/grafana-*linux-amd64.tar.gz +DEFAULT_PACKAGE_FILE=dist/plutono-*linux-amd64.tar.gz PROV_DIR=$RUNDIR/conf/provisioning DEFAULT_HOST=localhost DEFAULT_PORT=3001 diff --git a/e2e/verify/specs/smoketests.spec.ts b/e2e/verify/specs/smoketests.spec.ts index 185eb389e0..818dd5961f 100644 --- a/e2e/verify/specs/smoketests.spec.ts +++ b/e2e/verify/specs/smoketests.spec.ts @@ -1,4 +1,4 @@ -import { e2e } from '@grafana/e2e'; +import { e2e } from '@credativ/plutono-e2e'; import { smokeTestScenario } from '../../shared/smokeTestScenario'; e2e.scenario(smokeTestScenario); diff --git a/e2e/verify/tsconfig.json b/e2e/verify/tsconfig.json index f1cce18f82..eae1c29930 100644 --- a/e2e/verify/tsconfig.json +++ b/e2e/verify/tsconfig.json @@ -3,5 +3,5 @@ "types": ["cypress"] }, "extends": "../../tsconfig.json", - "include": ["**/*.ts", "../../packages/grafana-e2e/cypress/support/index.d.ts"] + "include": ["**/*.ts", "../../packages/plutono-e2e/cypress/support/index.d.ts"] } diff --git a/e2e/wait-for-grafana b/e2e/wait-for-plutono similarity index 74% rename from e2e/wait-for-grafana rename to e2e/wait-for-plutono index b3c9839918..3355fd3ba9 100755 --- a/e2e/wait-for-grafana +++ b/e2e/wait-for-plutono @@ -6,6 +6,6 @@ set -eo pipefail HOST=${HOST:-$DEFAULT_HOST} PORT=${PORT:-$DEFAULT_PORT} -echo -e "Waiting for grafana-server to finish starting, host=$HOST, port=$PORT" +echo -e "Waiting for plutono-server to finish starting, host=$HOST, port=$PORT" timeout 60 bash -c 'until nc -z $0 $1; do sleep 1; done' $HOST $PORT diff --git a/emails/package.json b/emails/package.json index f4eb62d4ea..3547e8e021 100644 --- a/emails/package.json +++ b/emails/package.json @@ -1,7 +1,7 @@ { - "name": "Grafana-Email-Campaign", + "name": "Plutono-Email-Campaign", "version": "1.0.0", - "description": "Grafana Email templates based on Zurb Ink", + "description": "Plutono Email templates based on Zurb Ink", "repository": "dnnsldr/", "author": { "name": "dnnsldr", diff --git a/emails/templates/invited_to_org.html b/emails/templates/invited_to_org.html index 681830604b..7f84e205cc 100644 --- a/emails/templates/invited_to_org.html +++ b/emails/templates/invited_to_org.html @@ -25,7 +25,7 @@

You have been added to [[.OrgName]]

diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html index 80d24d5308..04f110bfa4 100644 --- a/emails/templates/layouts/default.html +++ b/emails/templates/layouts/default.html @@ -142,7 +142,7 @@ '); + expect(html).toBe(''); }); it('array column value should be mapped to text', () => { diff --git a/public/app/plugins/panel/table-old/transformers.ts b/public/app/plugins/panel/table-old/transformers.ts index 0318ac0f18..6d7a129cf1 100644 --- a/public/app/plugins/panel/table-old/transformers.ts +++ b/public/app/plugins/panel/table-old/transformers.ts @@ -3,7 +3,7 @@ import flatten from 'app/core/utils/flatten'; import TimeSeries from 'app/core/time_series2'; import TableModel, { mergeTablesIntoModel } from 'app/core/table_model'; import { TableTransform } from './types'; -import { Column, TableData } from '@grafana/data'; +import { Column, TableData } from '@credativ/plutono-data'; const transformers: { [key: string]: TableTransform } = {}; export const timeSeriesFormatFilterer = (data: any): any[] => { diff --git a/public/app/plugins/panel/table-old/types.ts b/public/app/plugins/panel/table-old/types.ts index 21c49166de..ce4c950e1a 100644 --- a/public/app/plugins/panel/table-old/types.ts +++ b/public/app/plugins/panel/table-old/types.ts @@ -1,5 +1,5 @@ import TableModel from 'app/core/table_model'; -import { Column } from '@grafana/data'; +import { Column } from '@credativ/plutono-data'; export interface TableTransform { description: string; diff --git a/public/app/plugins/panel/table/README.md b/public/app/plugins/panel/table/README.md index 854e0fbbfd..9a2fede2a2 100644 --- a/public/app/plugins/panel/table/README.md +++ b/public/app/plugins/panel/table/README.md @@ -1,9 +1,9 @@ # Table Panel - Native Plugin -The Table Panel is **included** with Grafana. +The Table Panel is **included** with Plutono. The table panel is very flexible, supporting both multiple modes for time series as well as for table, annotation and raw JSON data. It also provides date formatting and value formatting and coloring options. -Check out the [Table Panel Showcase in the Grafana Playground](http://play.grafana.org/dashboard/db/table-panel-showcase) or read more about it here: +Check out the [Table Panel Showcase in the Plutono Playground](http://play.plutono.org/dashboard/db/table-panel-showcase) or read more about it here: [https://grafana.com/docs/grafana/latest/features/panels/table_panel/](https://grafana.com/docs/grafana/latest/features/panels/table_panel/) diff --git a/public/app/plugins/panel/table/TablePanel.tsx b/public/app/plugins/panel/table/TablePanel.tsx index e20bad4716..c6a006f958 100644 --- a/public/app/plugins/panel/table/TablePanel.tsx +++ b/public/app/plugins/panel/table/TablePanel.tsx @@ -1,11 +1,11 @@ import React, { Component } from 'react'; -import { Select, Table } from '@grafana/ui'; -import { DataFrame, FieldMatcherID, getFrameDisplayName, PanelProps, SelectableValue } from '@grafana/data'; +import { Select, Table } from '@credativ/plutono-ui'; +import { DataFrame, FieldMatcherID, getFrameDisplayName, PanelProps, SelectableValue } from '@credativ/plutono-data'; import { Options } from './types'; import { css } from 'emotion'; import { config } from 'app/core/config'; -import { FilterItem, TableSortByFieldState } from '@grafana/ui/src/components/Table/types'; +import { FilterItem, TableSortByFieldState } from '@credativ/plutono-ui/src/components/Table/types'; import { dispatch } from '../../../store/store'; import { applyFilterFromTable } from '../../../features/variables/adhoc/actions'; import { getDashboardSrv } from '../../../features/dashboard/services/DashboardSrv'; diff --git a/public/app/plugins/panel/table/migrations.test.ts b/public/app/plugins/panel/table/migrations.test.ts index 2f767d0f95..c0c82a8d05 100644 --- a/public/app/plugins/panel/table/migrations.test.ts +++ b/public/app/plugins/panel/table/migrations.test.ts @@ -1,4 +1,4 @@ -import { PanelModel } from '@grafana/data'; +import { PanelModel } from '@credativ/plutono-data'; import { tablePanelChangedHandler } from './migrations'; describe('Table Migrations', () => { diff --git a/public/app/plugins/panel/table/migrations.ts b/public/app/plugins/panel/table/migrations.ts index dc2fac3152..8ec4d9a034 100644 --- a/public/app/plugins/panel/table/migrations.ts +++ b/public/app/plugins/panel/table/migrations.ts @@ -5,8 +5,8 @@ import { ThresholdsMode, ThresholdsConfig, FieldConfig, -} from '@grafana/data'; -import { ReduceTransformerOptions } from '@grafana/data/src/transformations/transformers/reduce'; +} from '@credativ/plutono-data'; +import { ReduceTransformerOptions } from '@credativ/plutono-data/src/transformations/transformers/reduce'; import omitBy from 'lodash/omitBy'; import isNil from 'lodash/isNil'; import isNumber from 'lodash/isNumber'; diff --git a/public/app/plugins/panel/table/module.tsx b/public/app/plugins/panel/table/module.tsx index 11d70005f6..412763d50d 100644 --- a/public/app/plugins/panel/table/module.tsx +++ b/public/app/plugins/panel/table/module.tsx @@ -1,8 +1,8 @@ -import { PanelPlugin } from '@grafana/data'; +import { PanelPlugin } from '@credativ/plutono-data'; import { TablePanel } from './TablePanel'; import { CustomFieldConfig, Options } from './types'; import { tableMigrationHandler, tablePanelChangedHandler } from './migrations'; -import { TableCellDisplayMode } from '@grafana/ui'; +import { TableCellDisplayMode } from '@credativ/plutono-ui'; export const plugin = new PanelPlugin(TablePanel) .setPanelChangeHandler(tablePanelChangedHandler) diff --git a/public/app/plugins/panel/table/plugin.json b/public/app/plugins/panel/table/plugin.json index 14d1150051..852cad9c7f 100644 --- a/public/app/plugins/panel/table/plugin.json +++ b/public/app/plugins/panel/table/plugin.json @@ -4,7 +4,7 @@ "id": "table", "info": { - "description": "Table Panel for Grafana", + "description": "Table Panel for Plutono", "author": { "name": "Grafana Labs", "url": "https://grafana.com" diff --git a/public/app/plugins/panel/table/types.ts b/public/app/plugins/panel/table/types.ts index 9126762388..03b7b72f56 100644 --- a/public/app/plugins/panel/table/types.ts +++ b/public/app/plugins/panel/table/types.ts @@ -1,4 +1,4 @@ -import { TableSortByFieldState } from '@grafana/ui'; +import { TableSortByFieldState } from '@credativ/plutono-ui'; export interface Options { frameIndex: number; diff --git a/public/app/plugins/panel/text/README.md b/public/app/plugins/panel/text/README.md index 667ab51784..925515ec7f 100644 --- a/public/app/plugins/panel/text/README.md +++ b/public/app/plugins/panel/text/README.md @@ -1,5 +1,5 @@ # Text Panel - Native Plugin -The Text Panel is **included** with Grafana. +The Text Panel is **included** with Plutono. The Text Panel is a very simple panel that displays text. The source text is written in the Markdown syntax meaning you can format the text. Read [GitHub's Mastering Markdown](https://guides.github.com/features/mastering-markdown/) to learn more. diff --git a/public/app/plugins/panel/text/TextPanel.tsx b/public/app/plugins/panel/text/TextPanel.tsx index de472f1c62..53f07e3b43 100644 --- a/public/app/plugins/panel/text/TextPanel.tsx +++ b/public/app/plugins/panel/text/TextPanel.tsx @@ -1,12 +1,12 @@ // Libraries import React, { PureComponent } from 'react'; import { debounce } from 'lodash'; -import { PanelProps, renderMarkdown, textUtil } from '@grafana/data'; +import { PanelProps, renderMarkdown, textUtil } from '@credativ/plutono-data'; // Utils import config from 'app/core/config'; // Types import { TextOptions } from './types'; -import { CustomScrollbar, stylesFactory } from '@grafana/ui'; +import { CustomScrollbar, stylesFactory } from '@credativ/plutono-ui'; import { css, cx } from 'emotion'; import DangerouslySetHtmlContent from 'dangerously-set-html-content'; diff --git a/public/app/plugins/panel/text/TextPanelEditor.tsx b/public/app/plugins/panel/text/TextPanelEditor.tsx index c3fd0375e5..1d7b728df9 100644 --- a/public/app/plugins/panel/text/TextPanelEditor.tsx +++ b/public/app/plugins/panel/text/TextPanelEditor.tsx @@ -7,8 +7,8 @@ import { useTheme, CodeEditorSuggestionItem, variableSuggestionToCodeEditorSuggestion, -} from '@grafana/ui'; -import { GrafanaTheme, StandardEditorProps } from '@grafana/data'; +} from '@credativ/plutono-ui'; +import { PlutonoTheme, StandardEditorProps } from '@credativ/plutono-data'; import { TextOptions } from './types'; @@ -50,7 +50,7 @@ export const TextPanelEditor: FC> ); }; -const getStyles = stylesFactory((theme: GrafanaTheme) => ({ +const getStyles = stylesFactory((theme: PlutonoTheme) => ({ editorBox: css` label: editorBox; border: ${theme.border.width.sm} solid ${theme.colors.border2}; diff --git a/public/app/plugins/panel/text/module.tsx b/public/app/plugins/panel/text/module.tsx index dbc9b3a600..5a98e9cf07 100644 --- a/public/app/plugins/panel/text/module.tsx +++ b/public/app/plugins/panel/text/module.tsx @@ -1,4 +1,4 @@ -import { PanelPlugin } from '@grafana/data'; +import { PanelPlugin } from '@credativ/plutono-data'; import { TextPanel } from './TextPanel'; import { TextOptions } from './types'; diff --git a/public/app/plugins/panel/text/textPanelMigrationHandler.test.ts b/public/app/plugins/panel/text/textPanelMigrationHandler.test.ts index 009443a6ca..1a20ad6d51 100644 --- a/public/app/plugins/panel/text/textPanelMigrationHandler.test.ts +++ b/public/app/plugins/panel/text/textPanelMigrationHandler.test.ts @@ -1,6 +1,6 @@ import { textPanelMigrationHandler } from './textPanelMigrationHandler'; import { TextMode, TextOptions } from './types'; -import { FieldConfigSource, PanelModel } from '@grafana/data'; +import { FieldConfigSource, PanelModel } from '@credativ/plutono-data'; describe('textPanelMigrationHandler', () => { describe('when invoked and previous version was old Angular text panel', () => { diff --git a/public/app/plugins/panel/text/textPanelMigrationHandler.ts b/public/app/plugins/panel/text/textPanelMigrationHandler.ts index 7c87f5fd1f..1f23b6bead 100644 --- a/public/app/plugins/panel/text/textPanelMigrationHandler.ts +++ b/public/app/plugins/panel/text/textPanelMigrationHandler.ts @@ -1,4 +1,4 @@ -import { PanelModel } from '@grafana/data'; +import { PanelModel } from '@credativ/plutono-data'; import { TextMode, TextOptions } from './types'; export const textPanelMigrationHandler = (panel: PanelModel): Partial => { diff --git a/public/app/plugins/panel/timeseries/FillBelowToEditor.tsx b/public/app/plugins/panel/timeseries/FillBelowToEditor.tsx index 3ed0982cbc..3d700a83fc 100644 --- a/public/app/plugins/panel/timeseries/FillBelowToEditor.tsx +++ b/public/app/plugins/panel/timeseries/FillBelowToEditor.tsx @@ -1,6 +1,6 @@ import React, { useMemo } from 'react'; -import { FieldOverrideEditorProps, FieldType, getFieldDisplayName, SelectableValue } from '@grafana/data'; -import { Select } from '@grafana/ui'; +import { FieldOverrideEditorProps, FieldType, getFieldDisplayName, SelectableValue } from '@credativ/plutono-data'; +import { Select } from '@credativ/plutono-ui'; export const FillBellowToEditor: React.FC> = ({ value, context, onChange }) => { const names = useMemo(() => { diff --git a/public/app/plugins/panel/timeseries/HideSeriesConfigEditor.tsx b/public/app/plugins/panel/timeseries/HideSeriesConfigEditor.tsx index 90b11ce41b..56d61b3aa7 100644 --- a/public/app/plugins/panel/timeseries/HideSeriesConfigEditor.tsx +++ b/public/app/plugins/panel/timeseries/HideSeriesConfigEditor.tsx @@ -1,8 +1,8 @@ import React, { useCallback } from 'react'; import _ from 'lodash'; -import { FilterPill, HorizontalGroup } from '@grafana/ui'; -import { FieldConfigEditorProps } from '@grafana/data'; -import { HideSeriesConfig } from '@grafana/ui/src/components/uPlot/config'; +import { FilterPill, HorizontalGroup } from '@credativ/plutono-ui'; +import { FieldConfigEditorProps } from '@credativ/plutono-data'; +import { HideSeriesConfig } from '@credativ/plutono-ui/src/components/uPlot/config'; export const SeriesConfigEditor: React.FC> = (props) => { const { value, onChange } = props; diff --git a/public/app/plugins/panel/timeseries/LineStyleEditor.tsx b/public/app/plugins/panel/timeseries/LineStyleEditor.tsx index 93d2536228..1b77dcd23a 100644 --- a/public/app/plugins/panel/timeseries/LineStyleEditor.tsx +++ b/public/app/plugins/panel/timeseries/LineStyleEditor.tsx @@ -1,6 +1,6 @@ import React, { useMemo } from 'react'; -import { FieldOverrideEditorProps, SelectableValue } from '@grafana/data'; -import { HorizontalGroup, IconButton, LineStyle, RadioButtonGroup, Select } from '@grafana/ui'; +import { FieldOverrideEditorProps, SelectableValue } from '@credativ/plutono-data'; +import { HorizontalGroup, IconButton, LineStyle, RadioButtonGroup, Select } from '@credativ/plutono-ui'; type LineFill = 'solid' | 'dash' | 'dot'; diff --git a/public/app/plugins/panel/timeseries/ScaleDistributionEditor.tsx b/public/app/plugins/panel/timeseries/ScaleDistributionEditor.tsx index be65deff3f..54cdf9eb15 100644 --- a/public/app/plugins/panel/timeseries/ScaleDistributionEditor.tsx +++ b/public/app/plugins/panel/timeseries/ScaleDistributionEditor.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { FieldOverrideEditorProps, SelectableValue } from '@grafana/data'; -import { HorizontalGroup, RadioButtonGroup, ScaleDistribution, ScaleDistributionConfig, Select } from '@grafana/ui'; +import { FieldOverrideEditorProps, SelectableValue } from '@credativ/plutono-data'; +import { HorizontalGroup, RadioButtonGroup, ScaleDistribution, ScaleDistributionConfig, Select } from '@credativ/plutono-ui'; const DISTRIBUTION_OPTIONS: Array> = [ { diff --git a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx index 47e66216d0..12160e8bed 100644 --- a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx +++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx @@ -1,5 +1,5 @@ -import { Field, PanelProps } from '@grafana/data'; -import { GraphNG, GraphNGLegendEvent, TooltipPlugin, ZoomPlugin } from '@grafana/ui'; +import { Field, PanelProps } from '@credativ/plutono-data'; +import { GraphNG, GraphNGLegendEvent, TooltipPlugin, ZoomPlugin } from '@credativ/plutono-ui'; import { getFieldLinksForExplore } from 'app/features/explore/utils/links'; import React, { useCallback } from 'react'; import { changeSeriesColorConfigFactory } from './overrides/colorSeriesConfigFactory'; diff --git a/public/app/plugins/panel/timeseries/config.ts b/public/app/plugins/panel/timeseries/config.ts index 7bc9e3abd3..6485e2d665 100644 --- a/public/app/plugins/panel/timeseries/config.ts +++ b/public/app/plugins/panel/timeseries/config.ts @@ -9,7 +9,7 @@ import { standardEditorsRegistry, StatsPickerConfigSettings, stringOverrideProcessor, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { AxisPlacement, BarAlignment, @@ -24,7 +24,7 @@ import { GraphGradientMode, LegendDisplayMode, AxisConfig, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; import { SeriesConfigEditor } from './HideSeriesConfigEditor'; import { ScaleDistributionEditor } from './ScaleDistributionEditor'; import { LineStyleEditor } from './LineStyleEditor'; diff --git a/public/app/plugins/panel/timeseries/migrations.test.ts b/public/app/plugins/panel/timeseries/migrations.test.ts index 6fbd9d2624..3882681f20 100644 --- a/public/app/plugins/panel/timeseries/migrations.test.ts +++ b/public/app/plugins/panel/timeseries/migrations.test.ts @@ -1,4 +1,4 @@ -import { PanelModel } from '@grafana/data'; +import { PanelModel } from '@credativ/plutono-data'; import { graphPanelChangedHandler } from './migrations'; describe('Graph Migrations', () => { diff --git a/public/app/plugins/panel/timeseries/migrations.ts b/public/app/plugins/panel/timeseries/migrations.ts index 4870604c0a..ee0629e573 100644 --- a/public/app/plugins/panel/timeseries/migrations.ts +++ b/public/app/plugins/panel/timeseries/migrations.ts @@ -9,8 +9,8 @@ import { fieldReducers, NullValueMode, PanelModel, -} from '@grafana/data'; -import { GraphFieldConfig, LegendDisplayMode } from '@grafana/ui'; +} from '@credativ/plutono-data'; +import { GraphFieldConfig, LegendDisplayMode } from '@credativ/plutono-ui'; import { GraphGradientMode, AxisPlacement, @@ -18,7 +18,7 @@ import { LineInterpolation, LineStyle, PointVisibility, -} from '@grafana/ui/src/components/uPlot/config'; +} from '@credativ/plutono-ui/src/components/uPlot/config'; import { Options } from './types'; import omitBy from 'lodash/omitBy'; import isNil from 'lodash/isNil'; diff --git a/public/app/plugins/panel/timeseries/module.tsx b/public/app/plugins/panel/timeseries/module.tsx index 3830ef30d5..9e339b9d4d 100644 --- a/public/app/plugins/panel/timeseries/module.tsx +++ b/public/app/plugins/panel/timeseries/module.tsx @@ -1,5 +1,5 @@ -import { PanelPlugin } from '@grafana/data'; -import { GraphFieldConfig } from '@grafana/ui'; +import { PanelPlugin } from '@credativ/plutono-data'; +import { GraphFieldConfig } from '@credativ/plutono-ui'; import { TimeSeriesPanel } from './TimeSeriesPanel'; import { graphPanelChangedHandler } from './migrations'; import { Options } from './types'; diff --git a/public/app/plugins/panel/timeseries/overrides/colorSeriesConfigFactory.test.ts b/public/app/plugins/panel/timeseries/overrides/colorSeriesConfigFactory.test.ts index c66d04ffeb..2f693e0a10 100644 --- a/public/app/plugins/panel/timeseries/overrides/colorSeriesConfigFactory.test.ts +++ b/public/app/plugins/panel/timeseries/overrides/colorSeriesConfigFactory.test.ts @@ -1,4 +1,4 @@ -import { FieldColorModeId, FieldConfigSource, FieldMatcherID } from '@grafana/data'; +import { FieldColorModeId, FieldConfigSource, FieldMatcherID } from '@credativ/plutono-data'; import { changeSeriesColorConfigFactory } from './colorSeriesConfigFactory'; describe('changeSeriesColorConfigFactory', () => { diff --git a/public/app/plugins/panel/timeseries/overrides/colorSeriesConfigFactory.ts b/public/app/plugins/panel/timeseries/overrides/colorSeriesConfigFactory.ts index d018adad2f..71982fc15c 100644 --- a/public/app/plugins/panel/timeseries/overrides/colorSeriesConfigFactory.ts +++ b/public/app/plugins/panel/timeseries/overrides/colorSeriesConfigFactory.ts @@ -4,7 +4,7 @@ import { FieldColorModeId, FieldConfigSource, FieldMatcherID, -} from '@grafana/data'; +} from '@credativ/plutono-data'; export const changeSeriesColorConfigFactory = ( label: string, diff --git a/public/app/plugins/panel/timeseries/overrides/hideSeriesConfigFactory.test.ts b/public/app/plugins/panel/timeseries/overrides/hideSeriesConfigFactory.test.ts index 97fc8e02ce..d66982407d 100644 --- a/public/app/plugins/panel/timeseries/overrides/hideSeriesConfigFactory.test.ts +++ b/public/app/plugins/panel/timeseries/overrides/hideSeriesConfigFactory.test.ts @@ -5,8 +5,8 @@ import { FieldMatcherID, FieldType, toDataFrame, -} from '@grafana/data'; -import { GraphNGLegendEvent, GraphNGLegendEventMode } from '@grafana/ui'; +} from '@credativ/plutono-data'; +import { GraphNGLegendEvent, GraphNGLegendEventMode } from '@credativ/plutono-ui'; import { hideSeriesConfigFactory } from './hideSeriesConfigFactory'; describe('hideSeriesConfigFactory', () => { diff --git a/public/app/plugins/panel/timeseries/overrides/hideSeriesConfigFactory.ts b/public/app/plugins/panel/timeseries/overrides/hideSeriesConfigFactory.ts index 88b6ca1a8e..0608dea05d 100644 --- a/public/app/plugins/panel/timeseries/overrides/hideSeriesConfigFactory.ts +++ b/public/app/plugins/panel/timeseries/overrides/hideSeriesConfigFactory.ts @@ -8,8 +8,8 @@ import { getFieldDisplayName, isSystemOverrideWithRef, SystemConfigOverrideRule, -} from '@grafana/data'; -import { GraphNGLegendEvent, GraphNGLegendEventMode } from '@grafana/ui'; +} from '@credativ/plutono-data'; +import { GraphNGLegendEvent, GraphNGLegendEventMode } from '@credativ/plutono-ui'; const displayOverrideRef = 'hideSeriesFrom'; const isHideSeriesOverride = isSystemOverrideWithRef(displayOverrideRef); diff --git a/public/app/plugins/panel/timeseries/plugins/AnnotationMarker.tsx b/public/app/plugins/panel/timeseries/plugins/AnnotationMarker.tsx index 7e720fb99e..8c8d52d2f3 100644 --- a/public/app/plugins/panel/timeseries/plugins/AnnotationMarker.tsx +++ b/public/app/plugins/panel/timeseries/plugins/AnnotationMarker.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useRef, useState } from 'react'; -import { GrafanaTheme } from '@grafana/data'; -import { HorizontalGroup, Portal, Tag, TooltipContainer, useStyles } from '@grafana/ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { HorizontalGroup, Portal, Tag, TooltipContainer, useStyles } from '@credativ/plutono-ui'; import { css } from 'emotion'; interface AnnotationMarkerProps { @@ -75,7 +75,7 @@ export const AnnotationMarker: React.FC = ({ time, text, ); }; -const getAnnotationMarkerStyles = (theme: GrafanaTheme) => { +const getAnnotationMarkerStyles = (theme: PlutonoTheme) => { const bg = theme.isDark ? theme.palette.dark2 : theme.palette.white; const headerBg = theme.isDark ? theme.palette.dark9 : theme.palette.gray5; const shadowColor = theme.isDark ? theme.palette.black : theme.palette.white; diff --git a/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx index f6fa988b03..b45e787775 100644 --- a/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx +++ b/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx @@ -1,5 +1,5 @@ -import { DataFrame, DataFrameView, dateTimeFormat, systemDateFormats, TimeZone } from '@grafana/data'; -import { EventsCanvas, usePlotContext, useTheme } from '@grafana/ui'; +import { DataFrame, DataFrameView, dateTimeFormat, systemDateFormats, TimeZone } from '@credativ/plutono-data'; +import { EventsCanvas, usePlotContext, useTheme } from '@credativ/plutono-ui'; import React, { useCallback, useEffect, useRef } from 'react'; import { AnnotationMarker } from './AnnotationMarker'; diff --git a/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx index 48c7ac8595..d57b937d46 100644 --- a/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx +++ b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx @@ -8,7 +8,7 @@ import { MenuItemsGroup, Portal, useGraphNGContext, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; import { DataFrame, DataFrameView, @@ -16,7 +16,7 @@ import { getFieldDisplayName, InterpolateFunction, TimeZone, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { useClickAway } from 'react-use'; import { getFieldLinksSupplier } from '../../../../features/panel/panellinks/linkSuppliers'; diff --git a/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx index eedd1997a8..65fa835405 100644 --- a/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx +++ b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx @@ -3,12 +3,12 @@ import { dateTimeFormat, Field, FieldType, - GrafanaTheme, + PlutonoTheme, LinkModel, systemDateFormats, TimeZone, -} from '@grafana/data'; -import { FieldLinkList, Portal, TooltipContainer, useStyles } from '@grafana/ui'; +} from '@credativ/plutono-data'; +import { FieldLinkList, Portal, TooltipContainer, useStyles } from '@credativ/plutono-ui'; import { css, cx } from 'emotion'; import React, { useCallback, useRef, useState } from 'react'; @@ -109,7 +109,7 @@ export const ExemplarMarker: React.FC = ({ timeZone, dataFr ); }; -const getExemplarMarkerStyles = (theme: GrafanaTheme) => { +const getExemplarMarkerStyles = (theme: PlutonoTheme) => { const bg = theme.isDark ? theme.palette.dark2 : theme.palette.white; const headerBg = theme.isDark ? theme.palette.dark9 : theme.palette.gray5; const shadowColor = theme.isDark ? theme.palette.black : theme.palette.white; diff --git a/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx index b10e895d6c..fe30ecfad4 100644 --- a/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx +++ b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx @@ -5,8 +5,8 @@ import { TimeZone, TIME_SERIES_TIME_FIELD_NAME, TIME_SERIES_VALUE_FIELD_NAME, -} from '@grafana/data'; -import { EventsCanvas, FIXED_UNIT, usePlotContext } from '@grafana/ui'; +} from '@credativ/plutono-data'; +import { EventsCanvas, FIXED_UNIT, usePlotContext } from '@credativ/plutono-ui'; import React, { useCallback } from 'react'; import { ExemplarMarker } from './ExemplarMarker'; diff --git a/public/app/plugins/panel/timeseries/types.ts b/public/app/plugins/panel/timeseries/types.ts index f75e2afc64..2829780d0e 100644 --- a/public/app/plugins/panel/timeseries/types.ts +++ b/public/app/plugins/panel/timeseries/types.ts @@ -1,4 +1,4 @@ -import { VizLegendOptions, GraphTooltipOptions } from '@grafana/ui'; +import { VizLegendOptions, GraphTooltipOptions } from '@credativ/plutono-ui'; export interface GraphOptions { // nothing for now diff --git a/public/app/plugins/panel/welcome/Welcome.tsx b/public/app/plugins/panel/welcome/Welcome.tsx index b182ee06de..81a051e683 100644 --- a/public/app/plugins/panel/welcome/Welcome.tsx +++ b/public/app/plugins/panel/welcome/Welcome.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { css } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; -import { stylesFactory, useTheme } from '@grafana/ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { stylesFactory, useTheme } from '@credativ/plutono-ui'; import lightBackground from './img/background_light.svg'; const helpOptions = [ @@ -16,7 +16,7 @@ export const WelcomeBanner: FC = () => { return (
-

Welcome to Grafana

+

Welcome to Plutono

Need help?

@@ -25,7 +25,7 @@ export const WelcomeBanner: FC = () => { {option.label} @@ -37,7 +37,7 @@ export const WelcomeBanner: FC = () => { ); }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { const backgroundImage = theme.isDark ? 'public/img/login_background_dark.svg' : lightBackground; return { diff --git a/public/app/plugins/panel/welcome/module.ts b/public/app/plugins/panel/welcome/module.ts index d7b86178a2..a3801ed63e 100644 --- a/public/app/plugins/panel/welcome/module.ts +++ b/public/app/plugins/panel/welcome/module.ts @@ -1,4 +1,4 @@ -import { PanelPlugin } from '@grafana/data'; +import { PanelPlugin } from '@credativ/plutono-data'; import { WelcomeBanner } from './Welcome'; export const plugin = new PanelPlugin(WelcomeBanner).setNoPadding(); diff --git a/public/app/plugins/panel/xychart/XYChartPanel.tsx b/public/app/plugins/panel/xychart/XYChartPanel.tsx index f603939927..39998ea8f9 100644 --- a/public/app/plugins/panel/xychart/XYChartPanel.tsx +++ b/public/app/plugins/panel/xychart/XYChartPanel.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useMemo } from 'react'; -import { Button, TooltipPlugin, GraphNG, GraphNGLegendEvent } from '@grafana/ui'; -import { PanelProps } from '@grafana/data'; +import { Button, TooltipPlugin, GraphNG, GraphNGLegendEvent } from '@credativ/plutono-ui'; +import { PanelProps } from '@credativ/plutono-data'; import { Options } from './types'; import { hideSeriesConfigFactory } from '../timeseries/overrides/hideSeriesConfigFactory'; import { getXYDimensions } from './dims'; diff --git a/public/app/plugins/panel/xychart/XYDimsEditor.tsx b/public/app/plugins/panel/xychart/XYDimsEditor.tsx index da0cf0d454..f542a3f2f9 100644 --- a/public/app/plugins/panel/xychart/XYDimsEditor.tsx +++ b/public/app/plugins/panel/xychart/XYDimsEditor.tsx @@ -1,13 +1,13 @@ import React, { FC, useMemo } from 'react'; import { css } from 'emotion'; -import { IconButton, Label, Select, stylesFactory, useTheme } from '@grafana/ui'; +import { IconButton, Label, Select, stylesFactory, useTheme } from '@credativ/plutono-ui'; import { SelectableValue, getFrameDisplayName, - GrafanaTheme, + PlutonoTheme, StandardEditorProps, getFieldDisplayName, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { XYDimensionConfig, Options } from './types'; import { getXYDimensions, isGraphable } from './dims'; @@ -141,7 +141,7 @@ export const XYDimsEditor: FC ({ +const getStyles = stylesFactory((theme: PlutonoTheme) => ({ sorter: css` margin-top: 10px; display: flex; diff --git a/public/app/plugins/panel/xychart/dims.ts b/public/app/plugins/panel/xychart/dims.ts index b82fbb11a6..dec97cf6b3 100644 --- a/public/app/plugins/panel/xychart/dims.ts +++ b/public/app/plugins/panel/xychart/dims.ts @@ -1,8 +1,8 @@ -import { DataFrame, Field, FieldMatcher, FieldType, getFieldDisplayName } from '@grafana/data'; +import { DataFrame, Field, FieldMatcher, FieldType, getFieldDisplayName } from '@credativ/plutono-data'; import { XYDimensionConfig } from './types'; // TODO: fix import -import { XYFieldMatchers } from '@grafana/ui/src/components/GraphNG/types'; +import { XYFieldMatchers } from '@credativ/plutono-ui/src/components/GraphNG/types'; export enum DimensionError { NoData, diff --git a/public/app/plugins/panel/xychart/module.tsx b/public/app/plugins/panel/xychart/module.tsx index 844afd22c5..eebad1119d 100644 --- a/public/app/plugins/panel/xychart/module.tsx +++ b/public/app/plugins/panel/xychart/module.tsx @@ -1,5 +1,5 @@ -import { PanelPlugin } from '@grafana/data'; -import { DrawStyle, GraphFieldConfig } from '@grafana/ui'; +import { PanelPlugin } from '@credativ/plutono-data'; +import { DrawStyle, GraphFieldConfig } from '@credativ/plutono-ui'; import { XYChartPanel } from './XYChartPanel'; import { Options } from './types'; import { XYDimsEditor } from './XYDimsEditor'; diff --git a/public/app/plugins/panel/xychart/types.ts b/public/app/plugins/panel/xychart/types.ts index f31f100e1d..67dd88b8e6 100644 --- a/public/app/plugins/panel/xychart/types.ts +++ b/public/app/plugins/panel/xychart/types.ts @@ -1,4 +1,4 @@ -import { GraphTooltipOptions } from '@grafana/ui'; +import { GraphTooltipOptions } from '@credativ/plutono-ui'; import { OptionsWithLegend } from '../timeseries/types'; export interface XYDimensionConfig { diff --git a/public/app/plugins/sdk.ts b/public/app/plugins/sdk.ts index 04f73247e6..4530fb63c4 100644 --- a/public/app/plugins/sdk.ts +++ b/public/app/plugins/sdk.ts @@ -2,6 +2,6 @@ import { PanelCtrl } from 'app/features/panel/panel_ctrl'; import { MetricsPanelCtrl } from 'app/features/panel/metrics_panel_ctrl'; import { QueryCtrl } from 'app/features/panel/query_ctrl'; import { alertTab } from 'app/features/alerting/AlertTabCtrl'; -import { loadPluginCss } from '@grafana/runtime'; +import { loadPluginCss } from '@credativ/plutono-runtime'; export { PanelCtrl, MetricsPanelCtrl, QueryCtrl, alertTab, loadPluginCss }; diff --git a/public/app/routes/GrafanaCtrl.ts b/public/app/routes/PlutonoCtrl.ts similarity index 94% rename from public/app/routes/GrafanaCtrl.ts rename to public/app/routes/PlutonoCtrl.ts index db3633a933..05205bc13a 100644 --- a/public/app/routes/GrafanaCtrl.ts +++ b/public/app/routes/PlutonoCtrl.ts @@ -5,7 +5,7 @@ import $ from 'jquery'; import Drop from 'tether-drop'; // Utils and servies -import { colors } from '@grafana/ui'; +import { colors } from '@credativ/plutono-ui'; import { getTemplateSrv, setBackendSrv, @@ -13,7 +13,7 @@ import { setLegacyAngularInjector, LocationUpdate, setLocationSrv, -} from '@grafana/runtime'; +} from '@credativ/plutono-runtime'; import config from 'app/core/config'; import coreModule from 'app/core/core_module'; import { profiler } from 'app/core/profiler'; @@ -35,18 +35,18 @@ import { BridgeSrv } from 'app/core/services/bridge_srv'; import { PlaylistSrv } from 'app/features/playlist/playlist_srv'; import { DashboardSrv, setDashboardSrv } from 'app/features/dashboard/services/DashboardSrv'; import { ILocationService, ITimeoutService, IRootScopeService, IAngularEvent, auto } from 'angular'; -import { AppEvent, AppEvents, locationUtil } from '@grafana/data'; +import { AppEvent, AppEvents, locationUtil } from '@credativ/plutono-data'; import { backendSrv } from 'app/core/services/backend_srv'; -import { initGrafanaLive } from 'app/features/live/live'; +import { initPlutonoLive } from 'app/features/live/live'; -export type GrafanaRootScope = IRootScopeService & AppEventEmitter & AppEventConsumer & { colors: string[] }; +export type PlutonoRootScope = IRootScopeService & AppEventEmitter & AppEventConsumer & { colors: string[] }; -export class GrafanaCtrl { +export class PlutonoCtrl { /** @ngInject */ constructor( $scope: any, utilSrv: UtilSrv, - $rootScope: GrafanaRootScope, + $rootScope: PlutonoRootScope, contextSrv: ContextSrv, bridgeSrv: BridgeSrv, timeSrv: TimeSrv, @@ -85,7 +85,7 @@ export class GrafanaCtrl { // Initialize websocket event streaming if (config.featureToggles.live) { - initGrafanaLive(); + initPlutonoLive(); } $scope.init = () => { @@ -156,7 +156,7 @@ function setViewModeBodyClass(body: JQuery, mode: KioskUrlValue) { } /** @ngInject */ -export function grafanaAppDirective( +export function plutonoAppDirective( playlistSrv: PlaylistSrv, contextSrv: ContextSrv, $timeout: ITimeoutService, @@ -165,7 +165,7 @@ export function grafanaAppDirective( ) { return { restrict: 'E', - controller: GrafanaCtrl, + controller: PlutonoCtrl, link: (scope: IRootScopeService & AppEventEmitter, elem: JQuery) => { const body = $('body'); // see https://github.com/zenorocha/clipboard.js/issues/155 @@ -321,4 +321,4 @@ export function grafanaAppDirective( }; } -coreModule.directive('grafanaApp', grafanaAppDirective); +coreModule.directive('plutonoApp', plutonoAppDirective); diff --git a/public/app/routes/ReactContainer.tsx b/public/app/routes/ReactContainer.tsx index 0a156f0c84..48804db1f4 100644 --- a/public/app/routes/ReactContainer.tsx +++ b/public/app/routes/ReactContainer.tsx @@ -8,8 +8,8 @@ import coreModule from 'app/core/core_module'; import { store } from 'app/store/store'; import { ContextSrv } from 'app/core/services/context_srv'; import { provideTheme } from 'app/core/utils/ConfigProvider'; -import { ErrorBoundaryAlert, ModalRoot, ModalsProvider } from '@grafana/ui'; -import { GrafanaRootScope } from './GrafanaCtrl'; +import { ErrorBoundaryAlert, ModalRoot, ModalsProvider } from '@credativ/plutono-ui'; +import { PlutonoRootScope } from './PlutonoCtrl'; export function WrapInProvider(store: any, Component: any, props: any) { return ( @@ -38,7 +38,7 @@ export function reactContainer( $route: any, $location: any, $injector: any, - $rootScope: GrafanaRootScope, + $rootScope: PlutonoRootScope, contextSrv: ContextSrv ) { return { diff --git a/public/app/routes/dashboard_loaders.ts b/public/app/routes/dashboard_loaders.ts index 14a234acc9..b40bf94db9 100644 --- a/public/app/routes/dashboard_loaders.ts +++ b/public/app/routes/dashboard_loaders.ts @@ -1,5 +1,5 @@ import coreModule from 'app/core/core_module'; -import { locationUtil, UrlQueryMap } from '@grafana/data'; +import { locationUtil, UrlQueryMap } from '@credativ/plutono-data'; import { DashboardLoaderSrv } from 'app/features/dashboard/services/DashboardLoaderSrv'; import { ILocationService } from 'angular'; import { AppEventEmitter, Scope } from 'app/types'; diff --git a/public/app/types/alerting.ts b/public/app/types/alerting.ts index f34490f2f2..329b6856fa 100644 --- a/public/app/types/alerting.ts +++ b/public/app/types/alerting.ts @@ -1,4 +1,4 @@ -import { DataFrame, DataQuery, PanelData, SelectableValue, TimeRange } from '@grafana/data'; +import { DataFrame, DataQuery, PanelData, SelectableValue, TimeRange } from '@credativ/plutono-data'; import { PanelQueryRunner } from '../features/query/state/PanelQueryRunner'; import { QueryGroupOptions } from './query'; import { ExpressionQuery } from '../features/expressions/types'; diff --git a/public/app/types/appEvent.ts b/public/app/types/appEvent.ts index 940c2000ed..5fcd77e46d 100644 --- a/public/app/types/appEvent.ts +++ b/public/app/types/appEvent.ts @@ -1,5 +1,5 @@ import { IAngularEvent } from 'angular'; -import { AppEvent } from '@grafana/data'; +import { AppEvent } from '@credativ/plutono-data'; export interface AppEventEmitter { /** diff --git a/public/app/types/dashboard.ts b/public/app/types/dashboard.ts index 90900dc1d1..6961653ae3 100644 --- a/public/app/types/dashboard.ts +++ b/public/app/types/dashboard.ts @@ -1,7 +1,7 @@ import { DashboardAcl } from './acl'; -import { DataQuery, PanelPlugin } from '@grafana/data'; +import { DataQuery, PanelPlugin } from '@credativ/plutono-data'; import { DashboardModel } from 'app/features/dashboard/state/DashboardModel'; -import { AngularComponent } from '@grafana/runtime'; +import { AngularComponent } from '@credativ/plutono-runtime'; export interface DashboardDTO { redirectUri?: string; diff --git a/public/app/types/datasources.ts b/public/app/types/datasources.ts index a7eaf5c86b..ff4c2d8d93 100644 --- a/public/app/types/datasources.ts +++ b/public/app/types/datasources.ts @@ -1,5 +1,5 @@ import { LayoutMode } from '../core/components/LayoutSelector/LayoutSelector'; -import { DataSourcePluginMeta, DataSourceSettings } from '@grafana/data'; +import { DataSourcePluginMeta, DataSourceSettings } from '@credativ/plutono-data'; import { GenericDataSourcePlugin } from 'app/features/datasources/settings/PluginSettings'; export interface DataSourcesState { diff --git a/public/app/types/events.ts b/public/app/types/events.ts index 79f09071f8..4b3a92e5c4 100644 --- a/public/app/types/events.ts +++ b/public/app/types/events.ts @@ -1,4 +1,4 @@ -import { BusEventBase, BusEventWithPayload, eventFactory, GrafanaTheme, TimeRange } from '@grafana/data'; +import { BusEventBase, BusEventWithPayload, eventFactory, PlutonoTheme, TimeRange } from '@credativ/plutono-data'; import { DashboardModel } from 'app/features/dashboard/state'; /** @@ -157,6 +157,6 @@ export class RenderEvent extends BusEventBase { static type = 'render'; } -export class ThemeChangedEvent extends BusEventWithPayload { +export class ThemeChangedEvent extends BusEventWithPayload { static type = 'theme-changed'; } diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts index 3b3c83f3a5..ca954b8fa3 100644 --- a/public/app/types/explore.ts +++ b/public/app/types/explore.ts @@ -14,7 +14,7 @@ import { RawTimeRange, TimeRange, EventBusExtended, -} from '@grafana/data'; +} from '@credativ/plutono-data'; export enum ExploreId { left = 'left', @@ -57,7 +57,7 @@ export interface ExploreItemState { */ datasourceMissing: boolean; /** - * Emitter to send events to the rest of Grafana. + * Emitter to send events to the rest of Plutono. */ eventBridge: EventBusExtended; /** diff --git a/public/app/types/ldap.ts b/public/app/types/ldap.ts index 55f330064e..43396b924b 100644 --- a/public/app/types/ldap.ts +++ b/public/app/types/ldap.ts @@ -46,7 +46,7 @@ export interface LdapUserInfo { } export interface LdapPermissions { - isGrafanaAdmin: boolean; + isPlutonoAdmin: boolean; isDisabled: boolean; } diff --git a/public/app/types/location.ts b/public/app/types/location.ts index c55cae9a4d..c3ddee8cf7 100644 --- a/public/app/types/location.ts +++ b/public/app/types/location.ts @@ -1,4 +1,4 @@ -import { UrlQueryMap } from '@grafana/data'; +import { UrlQueryMap } from '@credativ/plutono-data'; export interface LocationState { url: string; diff --git a/public/app/types/plugins.ts b/public/app/types/plugins.ts index 17b2e32207..cb6cd39da3 100644 --- a/public/app/types/plugins.ts +++ b/public/app/types/plugins.ts @@ -1,5 +1,5 @@ -import { PluginError, PluginMeta, PanelPlugin } from '@grafana/data'; -import { TemplateSrv } from '@grafana/runtime'; +import { PluginError, PluginMeta, PanelPlugin } from '@credativ/plutono-data'; +import { TemplateSrv } from '@credativ/plutono-runtime'; export interface PluginDashboard { dashboardId: number; diff --git a/public/app/types/query.ts b/public/app/types/query.ts index e7f97e9252..f828cd0bce 100644 --- a/public/app/types/query.ts +++ b/public/app/types/query.ts @@ -1,4 +1,4 @@ -import { DataQuery } from '@grafana/data'; +import { DataQuery } from '@credativ/plutono-data'; import { ExpressionQuery } from '../features/expressions/types'; export interface QueryGroupOptions { diff --git a/public/app/types/store.ts b/public/app/types/store.ts index 26dce34903..1190d6aaf8 100644 --- a/public/app/types/store.ts +++ b/public/app/types/store.ts @@ -1,6 +1,6 @@ import { ThunkAction, ThunkDispatch as GenericThunkDispatch } from 'redux-thunk'; import { PayloadAction } from '@reduxjs/toolkit'; -import { NavIndex } from '@grafana/data'; +import { NavIndex } from '@credativ/plutono-data'; import { LocationState } from './location'; import { AlertDefinitionState, AlertRulesState, NotificationChannelState } from './alerting'; diff --git a/public/app/types/user.ts b/public/app/types/user.ts index 076b597718..aada26c6c9 100644 --- a/public/app/types/user.ts +++ b/public/app/types/user.ts @@ -1,4 +1,4 @@ -import { TimeZone } from '@grafana/data'; +import { TimeZone } from '@credativ/plutono-data'; import { OrgRole } from '.'; export interface OrgUser { @@ -28,7 +28,7 @@ export interface UserDTO { login: string; email: string; name: string; - isGrafanaAdmin: boolean; + isPlutonoAdmin: boolean; isDisabled: boolean; isAdmin?: boolean; isExternal?: boolean; diff --git a/public/dashboards/default.json b/public/dashboards/default.json index b16b5d710d..a1cb062be7 100644 --- a/public/dashboards/default.json +++ b/public/dashboards/default.json @@ -1,5 +1,5 @@ { - "title": "Grafana", + "title": "Plutono", "tags": [], "style": "dark", "timezone": "browser", @@ -24,7 +24,7 @@ ] }, { - "title": "Welcome to Grafana", + "title": "Welcome to Plutono", "height": "210px", "collapse": false, "editable": true, @@ -34,7 +34,7 @@ "span": 6, "type": "text", "mode": "html", - "content": "
\n\n
\n
\n \n
\n
\n \n
\n
", + "content": "
\n\n
\n
\n \n
\n
\n \n
\n
", "style": {}, "title": "Documentation Links" }, diff --git a/public/dashboards/scripted.js b/public/dashboards/scripted.js index 106f04202f..30f2583795 100644 --- a/public/dashboards/scripted.js +++ b/public/dashboards/scripted.js @@ -2,7 +2,7 @@ /* * Complex scripted dashboard - * This script generates a dashboard object that Grafana can load. It also takes a number of user + * This script generates a dashboard object that Plutono can load. It also takes a number of user * supplied URL parameters (in the ARGS variable) * * Return a dashboard object, or a function @@ -33,7 +33,7 @@ dashboard.title = 'Scripted dash'; // Set default time // time can be overridden in the url using from/to parameters, but this is -// handled automatically in grafana core during dashboard initialization +// handled automatically in plutono core during dashboard initialization dashboard.time = { from: 'now-6h', to: 'now', diff --git a/public/dashboards/scripted_async.js b/public/dashboards/scripted_async.js index f727588564..f3d19a1cad 100644 --- a/public/dashboards/scripted_async.js +++ b/public/dashboards/scripted_async.js @@ -2,7 +2,7 @@ /* * Complex scripted dashboard - * This script generates a dashboard object that Grafana can load. It also takes a number of user + * This script generates a dashboard object that Plutono can load. It also takes a number of user * supplied URL parameters (in the ARGS variable) * * Global accessible variables @@ -34,7 +34,7 @@ return function (callback) { // Set default time // time can be overridden in the url using from/to parameters, but this is - // handled automatically in grafana core during dashboard initialization + // handled automatically in plutono core during dashboard initialization dashboard.time = { from: 'now-6h', to: 'now', diff --git a/public/dashboards/scripted_templated.js b/public/dashboards/scripted_templated.js index ecfb60afa1..ad785c9609 100644 --- a/public/dashboards/scripted_templated.js +++ b/public/dashboards/scripted_templated.js @@ -2,7 +2,7 @@ /* * Complex scripted dashboard - * This script generates a dashboard object that Grafana can load. It also takes a number of user + * This script generates a dashboard object that Plutono can load. It also takes a number of user * supplied URL parameters (int ARGS variable) * * Return a dashboard object, or a function @@ -34,7 +34,7 @@ dashboard.title = 'Scripted and templated dash'; // Set default time // time can be overridden in the url using from/to parameters, but this is -// handled automatically in grafana core during dashboard initialization +// handled automatically in plutono core during dashboard initialization dashboard.time = { from: 'now-6h', to: 'now', diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index 0921c03395..c0ca803320 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -183,7 +183,7 @@
-

[[.InvitedBy]] has added you to the [[.OrgName]] organization in Grafana. +

[[.InvitedBy]] has added you to the [[.OrgName]] organization in Plutono.

Once logged in, [[.OrgName]] will be available in the left side menu, in the dropdown below your username.

- Sent by Grafana v[[.BuildVersion]] + Sent by Plutono v[[.BuildVersion]]
© 2019 Grafana Labs

diff --git a/emails/templates/new_user_invite.html b/emails/templates/new_user_invite.html index 6e75a20395..0c9ee3d3e6 100644 --- a/emails/templates/new_user_invite.html +++ b/emails/templates/new_user_invite.html @@ -1,6 +1,6 @@ - + -[[Subject .Subject "[[.InvitedBy]] has invited you to join Grafana"]] +[[Subject .Subject "[[.InvitedBy]] has invited you to join Plutono"]] diff --git a/emails/templates/reset_password.html b/emails/templates/reset_password.html index e9d1527116..bfd0c31773 100644 --- a/emails/templates/reset_password.html +++ b/emails/templates/reset_password.html @@ -1,4 +1,4 @@ -[[Subject .Subject "Reset your Grafana password - [[.Name]]"]] +[[Subject .Subject "Reset your Plutono password - [[.Name]]"]]
diff --git a/emails/templates/signup_started.html b/emails/templates/signup_started.html index 80b4c327ba..6fbfcea3f0 100644 --- a/emails/templates/signup_started.html +++ b/emails/templates/signup_started.html @@ -1,4 +1,4 @@ -[[Subject .Subject "Welcome to Grafana, please complete your sign up!"]] +[[Subject .Subject "Welcome to Plutono, please complete your sign up!"]]
diff --git a/emails/templates/welcome_on_signup.html b/emails/templates/welcome_on_signup.html index c75b68f602..d4848c4724 100644 --- a/emails/templates/welcome_on_signup.html +++ b/emails/templates/welcome_on_signup.html @@ -1,4 +1,4 @@ -[[Subject .Subject "Welcome to Grafana"]] +[[Subject .Subject "Welcome to Plutono"]]
@@ -29,7 +29,7 @@

Hi [[.Name]],

@@ -38,7 +38,7 @@

Hi [[.Name]],

- If you are new to Grafana please read the Getting Started guide. + If you are new to Plutono please read the Getting Started guide.

Thank you for joining our community.
-

The Grafana Team

+

The Plutono Team
diff --git a/go.mod b/go.mod index c1d6c0ee42..b6c717c51c 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ go 1.15 // Also, use our fork with fixes for unimplemented methods (required for Go 1.16). replace github.com/denisenkom/go-mssqldb => github.com/grafana/go-mssqldb v0.0.0-20210326084033-d0ce3c521036 -// Override k8s.io/client-go outdated dependency, which is an indirect dependency of grafana/loki. -// It's also present on grafana/loki's go.mod so we'll need till it gets updated. +// Override k8s.io/client-go outdated dependency, which is an indirect dependency of plutono/loki. +// It's also present on plutono/loki's go.mod so we'll need till it gets updated. replace k8s.io/client-go => k8s.io/client-go v0.18.8 require ( diff --git a/package.json b/package.json index 9ee281ca8a..7fd1595a69 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,9 @@ "author": "Grafana Labs", "license": "Apache-2.0", "private": true, - "name": "grafana", + "name": "plutono", "version": "7.5.17", - "repository": "github:grafana/grafana", + "repository": "github:credativ/plutono", "scripts": { "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js", "build": "node ./node_modules/webpack/bin/webpack.js --config scripts/webpack/webpack.prod.js", @@ -18,7 +18,7 @@ "lint:sass": "yarn run sass-lint -c public/sass/.sass-lint.yml 'public/sass/**/*.scss, packages/**/*.scss' -v -i '**/node_modules/**/*.scss'", "test:ci": "mkdir -p reports/junit && export JEST_JUNIT_OUTPUT_DIR=reports/junit && jest --ci --reporters=default --reporters=jest-junit -w ${TEST_MAX_WORKERS:-100%}", "lint:fix": "yarn lint --fix", - "packages:build": "lerna run clean && lerna run build --ignore @grafana-plugins/input-datasource", + "packages:build": "lerna run clean && lerna run build --ignore @credativ/plutono-plugins-input-datasource", "packages:docsExtract": "rm -rf ./reports/docs && lerna run docsExtract", "packages:docsToMarkdown": "api-documenter markdown --input-folder ./reports/docs/ --output-folder ./docs/sources/packages_api/ --hugo", "packages:prepare": "lerna version --no-push --no-git-tag-version --force-publish --exact", @@ -26,27 +26,27 @@ "packages:publishCanary": "lerna publish from-package --contents dist --dist-tag canary --yes", "packages:publishLatest": "lerna publish from-package --contents dist --yes", "packages:publishNext": "lerna publish from-package --contents dist --dist-tag next --yes", - "packages:publishDev": "lerna publish from-package --contents dist --dist-tag dev --yes --registry http://grafana-npm.local:4873 --force-publish=*", + "packages:publishDev": "lerna publish from-package --contents dist --dist-tag dev --yes --registry http://plutono-npm.local:4873 --force-publish=*", "packages:typecheck": "lerna run typecheck", "packages:clean": "lerna run clean", "postinstall": "patch-package", "precommit": "yarn run lint-staged", "prettier:check": "prettier --list-different \"**/*.{ts,tsx,scss}\"", "prettier:write": "prettier --list-different \"**/*.{ts,tsx,scss,js}\" --write", - "start": "grafana-toolkit core:start --watchTheme", - "start:hot": "grafana-toolkit core:start --hot --watchTheme", - "start:ignoreTheme": "grafana-toolkit core:start --hot", - "start:noTsCheck": "grafana-toolkit core:start --noTsCheck", + "start": "plutono-toolkit core:start --watchTheme", + "start:hot": "plutono-toolkit core:start --hot --watchTheme", + "start:ignoreTheme": "plutono-toolkit core:start --hot", + "start:noTsCheck": "plutono-toolkit core:start --noTsCheck", "stats": "webpack --mode production --config scripts/webpack/webpack.prod.js --profile --json > compilation-stats.json", - "storybook": "yarn workspace @grafana/ui storybook --ci", - "storybook:build": "yarn workspace @grafana/ui storybook:build", + "storybook": "yarn workspace @credativ/plutono-ui storybook --ci", + "storybook:build": "yarn workspace @credativ/plutono-ui storybook:build", "themes:generate": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/generateSassVariableFiles.ts", "typecheck": "tsc --noEmit && yarn run packages:typecheck", - "plugins:build-bundled": "grafana-toolkit plugin:bundle-managed", + "plugins:build-bundled": "plutono-toolkit plugin:bundle-managed", "watch": "yarn start -d watch,start core:start --watchTheme", - "ci:test-frontend": "yarn run prettier:check && yarn run typecheck && yarn run lint && yarn run test:ci && yarn grafana-toolkit node-version-check && ./scripts/ci-check-strict.sh" + "ci:test-frontend": "yarn run prettier:check && yarn run typecheck && yarn run lint && yarn run test:ci && yarn plutono-toolkit node-version-check && ./scripts/ci-check-strict.sh" }, - "grafana": { + "plutono": { "whatsNewUrl": "https://grafana.com/docs/grafana/latest/guides/whats-new-in-v7-5/", "releaseNotesUrl": "https://grafana.com/docs/grafana/latest/release-notes/" }, @@ -203,7 +203,7 @@ }, "dependencies": { "@emotion/core": "10.0.27", - "@grafana/aws-sdk": "0.0.3", + "@credativ/plutono-aws-sdk": "0.0.3", "@popperjs/core": "2.5.4", "@reduxjs/toolkit": "1.5.0", "@sentry/browser": "5.25.0", diff --git a/packages/README.md b/packages/README.md index 480716c414..395e2e7e92 100644 --- a/packages/README.md +++ b/packages/README.md @@ -1,16 +1,16 @@ -# Grafana frontend packages +# Plutono frontend packages -This document contains information about Grafana frontend package versioning and releases. +This document contains information about Plutono frontend package versioning and releases. ## Versioning We use [Lerna](https://github.com/lerna/lerna) for packages versioning and releases. -All packages are versioned according to the current Grafana version: -- Grafana v6.3.0-alpha1 -> @grafana/* packages @ 6.3.0-alpha.1 -- Grafana v6.2.5 -> @grafana/* packages @ 6.2.5 -- Grafana - master branch version (based on package.json, i.e. 6.4.0-pre) -> @grafana/* packages @ 6.4.0-pre- (see details below about packages publishing channels) +All packages are versioned according to the current Plutono version: +- Plutono v6.3.0-alpha1 -> @grafana/* packages @ 6.3.0-alpha.1 +- Plutono v6.2.5 -> @grafana/* packages @ 6.2.5 +- Plutono - master branch version (based on package.json, i.e. 6.4.0-pre) -> @grafana/* packages @ 6.4.0-pre- (see details below about packages publishing channels) -> Please note that @grafana/toolkit, @grafana/ui, @grafana/data, and @grafana/runtime packages are considered ALPHA even though they are not released as alpha versions. +> Please note that @credativ/plutono-toolkit, @credativ/plutono-ui, @credativ/plutono-data, and @credativ/plutono-runtime packages are considered ALPHA even though they are not released as alpha versions. ### Stable releases > **Even though packages are released under a stable version, they are considered ALPHA until further notice!** @@ -37,7 +37,7 @@ As mentioned above the `canary` releases are published to the Github package reg 2. Create / modify your `~/.npmrc` file with the following: ``` -@grafana:registry=https://npm.pkg.github.com +@credativ:registry=https://npm.pkg.github.com //npm.pkg.github.com/:_authToken={INSERT_GH_TOKEN_HERE} ``` @@ -47,21 +47,21 @@ As mentioned above the `canary` releases are published to the Github package reg // plugin's package.json { ... - "@grafana/data": "canary" + "@credativ/plutono-data": "canary" } ``` ### Manual release -> All of the steps below must be performed on a release branch, according to Grafana Release Guide. +> All of the steps below must be performed on a release branch, according to Plutono Release Guide. -> Make sure you are logged in to npm in your terminal and that you are a part of Grafana org on npm. +> Make sure you are logged in to npm in your terminal and that you are a part of Plutono org on npm. 1. Run `yarn packages:prepare` script from the root directory. This performs tests on the packages and prompts for the version of the packages. The version should be the same as the one being released. - Make sure you use semver convention. So, *place a dot between prerelease id and prerelease number*, i.e. 6.3.0-alpha.1 - Make sure you confirm the version bump when prompted! 2. Commit changes (lerna.json and package.json files) - *"Packages version update: \"* -3. Run `yarn packages:build` script that prepares distribution packages in `packages/grafana-*/dist`. These directories are going to be published to npm. +3. Run `yarn packages:build` script that prepares distribution packages in `packages/plutono-*/dist`. These directories are going to be published to npm. 4. Depending whether or not it's a prerelease: - When releasing a prerelease run `packages:publishNext` to publish new versions. - When releasing a stable version run `packages:publishLatest` to publish new versions. @@ -72,7 +72,7 @@ As mentioned above the `canary` releases are published to the Github package reg To build individual packages, run: ``` -grafana-toolkit package:build --scope= +plutono-toolkit package:build --scope= ``` ### Setting up @grafana/* packages for local development @@ -86,11 +86,11 @@ In this guide you will set up [Verdaccio](https://verdaccio.org/) registry local #### Setting up local npm registry From your terminal: -1. Modify `/etc/hosts` file and add the following entry: ```127.0.0.1 grafana-npm.local``` +1. Modify `/etc/hosts` file and add the following entry: ```127.0.0.1 plutono-npm.local``` 2. Navigate to `devenv/local-npm` directory. -3. Run `docker-compose up`. This will start your local npm registry, available at http://grafana-npm.local:4873/ -4. Run `npm login --registry=http://grafana-npm.local:4873 --scope=@grafana` . This will allow you to publish any @grafana/* package into the local registry. -5. Run `npm config set @grafana:registry http://grafana-npm.local:4873`. This will config your npm to install @grafana scoped packages from your local registry. +3. Run `docker-compose up`. This will start your local npm registry, available at http://plutono-npm.local:4873/ +4. Run `npm login --registry=http://plutono-npm.local:4873 --scope=@credativ` . This will allow you to publish any @grafana/* package into the local registry. +5. Run `npm config set @credativ:registry http://plutono-npm.local:4873`. This will config your npm to install @grafana scoped packages from your local registry. #### Publishing packages to local npm registry @@ -101,7 +101,7 @@ From your terminal: 2. Commit changes in package.json and lerna.json files 3. Build packages: `yarn packages:build` 4. Run `yarn packages:publishDev`. -5. Navigate to http://grafana-npm.local:4873 and verify that version was published +5. Navigate to http://plutono-npm.local:4873 and verify that version was published Locally published packages will be published under `dev` channel, so in your plugin package.json file you can use that channel. For example: @@ -110,6 +110,6 @@ Locally published packages will be published under `dev` channel, so in your plu { ... - "@grafana/data": "dev" + "@credativ/plutono-data": "dev" } ``` diff --git a/packages/grafana-data/.eslintrc b/packages/grafana-data/.eslintrc deleted file mode 100644 index 41e607e143..0000000000 --- a/packages/grafana-data/.eslintrc +++ /dev/null @@ -1,13 +0,0 @@ -{ - "rules": { - "no-restricted-imports": ["error", { "patterns": ["@grafana/runtime", "@grafana/ui", "@grafana/data", "@grafana/e2e/*"] }] - }, - "overrides": [ - { - "files": ["**/*.test.{ts,tsx}"], - "rules": { - "no-restricted-imports": "off" - } - } - ] -} diff --git a/packages/grafana-data/README.md b/packages/grafana-data/README.md deleted file mode 100644 index a1823ca639..0000000000 --- a/packages/grafana-data/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Grafana Data Library - -> **@grafana/data is currently in BETA**. - -This package holds the root data types and functions used within Grafana. diff --git a/packages/grafana-data/src/utils/testdata/testTheme.ts b/packages/grafana-data/src/utils/testdata/testTheme.ts deleted file mode 100644 index f706e04e18..0000000000 --- a/packages/grafana-data/src/utils/testdata/testTheme.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { GrafanaTheme, GrafanaThemeType } from '../../types/theme'; - -export function getTestTheme(type: GrafanaThemeType = GrafanaThemeType.Dark): GrafanaTheme { - return ({ - type, - isDark: type === GrafanaThemeType.Dark, - isLight: type === GrafanaThemeType.Light, - colors: { - panelBg: 'white', - }, - } as unknown) as GrafanaTheme; -} diff --git a/packages/grafana-e2e-selectors/README.md b/packages/grafana-e2e-selectors/README.md deleted file mode 100644 index 60c35d7b69..0000000000 --- a/packages/grafana-e2e-selectors/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Grafana End-to-End Test Selectors library - -> **@grafana/e2e-selectors is currently in ALPHA**. Core API is unstable and can be a subject of breaking changes! diff --git a/packages/grafana-e2e/README.md b/packages/grafana-e2e/README.md deleted file mode 100644 index 73c105edc3..0000000000 --- a/packages/grafana-e2e/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Grafana End-to-End Test library - -> **@grafana/e2e is currently in BETA**. - -This package contains an API wrapper built on top of [Cypress](https://www.cypress.io) that simplifies creating end-to-end tests for Grafana. More information can be found [here](https://github.com/grafana/grafana/blob/master/contribute/style-guides/e2e.md). diff --git a/packages/grafana-runtime/.eslintrc b/packages/grafana-runtime/.eslintrc deleted file mode 100644 index 566825e111..0000000000 --- a/packages/grafana-runtime/.eslintrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rules": { - "no-restricted-imports": ["error", { "patterns": ["@grafana/runtime", "@grafana/data/*", "@grafana/ui/*", "@grafana/e2e/*"] }] - } -} diff --git a/packages/grafana-runtime/README.md b/packages/grafana-runtime/README.md deleted file mode 100644 index c4732cc66e..0000000000 --- a/packages/grafana-runtime/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Grafana Runtime library - -> **@grafana/runtime is currently in BETA**. - -This package allows access to grafana services. It requires Grafana to be running already and the functions to be imported as externals. diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/build.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/build.sh deleted file mode 100755 index f024e61705..0000000000 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/build.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -eo pipefail - -source ./common.sh - -# -# No longer required, but useful to keep just in case we want to deploy -# changes in toolkit directly to the docker image -# -if [ -n "$INCLUDE_TOOLKIT" ]; then - /bin/rm -rfv install/grafana-toolkit - mkdir -pv install/grafana-toolkit - cp -rv ../../bin install/grafana-toolkit - cp -rv ../../src install/grafana-toolkit - cp -v ../../package.json install/grafana-toolkit - cp -v ../../tsconfig.json install/grafana-toolkit -fi - -docker build -t ${DOCKER_IMAGE_NAME} . -docker push $DOCKER_IMAGE_NAME - -[ -n "$INCLUDE_TOOLKIT" ] && /bin/rm -rfv install/grafana-toolkit diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/common.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/common.sh deleted file mode 100755 index dc617a84e4..0000000000 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/common.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -## -## Common variable declarations -## - -DOCKER_IMAGE_NAME="grafana/grafana-plugin-ci:1.2.0-alpine" diff --git a/packages/grafana-toolkit/src/config/prettier.plugin.rc.js b/packages/grafana-toolkit/src/config/prettier.plugin.rc.js deleted file mode 100644 index c14684b083..0000000000 --- a/packages/grafana-toolkit/src/config/prettier.plugin.rc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - ...require('@grafana/toolkit/src/config/prettier.plugin.config.json'), -}; diff --git a/packages/grafana-ui/README.md b/packages/grafana-ui/README.md deleted file mode 100644 index 59d7ed7c41..0000000000 --- a/packages/grafana-ui/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# Grafana UI components library - -> **@grafana/ui is currently in BETA**. - -@grafana/ui is a collection of components used by [Grafana](https://github.com/grafana/grafana) - -Our goal is to deliver Grafana's common UI elements for plugins developers and contributors. - -See [package source](https://github.com/grafana/grafana/tree/master/packages/grafana-ui) for more details. - -## Installation - -`yarn add @grafana/ui` - -`npm install @grafana/ui` - -## Development - -For development purposes we suggest using `yarn link` that will create symlink to @grafana/ui lib. To do so navigate to `packages/grafana-ui` and run `yarn link`. Then, navigate to your project and run `yarn link @grafana/ui` to use the linked version of the lib. To unlink follow the same procedure, but use `yarn unlink` instead. - -### Storybook 6.x migration - -We've upgraded Storybook to version 6 and with that we will convert to using [controls](https://storybook.js.org/docs/react/essentials/controls) instead of knobs for manipulating components. Controls will not require as much coding as knobs do. Please refer to the [storybook style-guide](https://github.com/grafana/grafana/blob/master/contribute/style-guides/storybook.md#contrls) for further information. diff --git a/packages/grafana-ui/src/themes/selectThemeVariant.ts b/packages/grafana-ui/src/themes/selectThemeVariant.ts deleted file mode 100644 index 8747a15d5c..0000000000 --- a/packages/grafana-ui/src/themes/selectThemeVariant.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { GrafanaThemeType } from '@grafana/data'; - -type VariantDescriptor = { [key in GrafanaThemeType]: string | number }; - -/** - * @deprecated use theme.isLight ? or theme.isDark instead - */ -export const selectThemeVariant = (variants: VariantDescriptor, currentTheme?: GrafanaThemeType) => { - return variants[currentTheme || GrafanaThemeType.Dark]; -}; diff --git a/packages/grafana-ui/src/types/theme.ts b/packages/grafana-ui/src/types/theme.ts deleted file mode 100644 index 904ebdf93e..0000000000 --- a/packages/grafana-ui/src/types/theme.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { GrafanaTheme } from '@grafana/data'; - -export interface Themeable { - theme: GrafanaTheme; -} diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json index 5ffcc32e68..fd885ae951 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -14,8 +14,8 @@ "typescript": "4.1.2" }, "dependencies": { - "@grafana/data": "7.5.17", - "@grafana/ui": "7.5.17", + "@credativ/plutono-data": "7.5.17", + "@credativ/plutono-ui": "7.5.17", "@types/classnames": "^2.2.7", "@types/deep-freeze": "^0.1.1", "@types/hoist-non-react-statics": "^3.3.1", diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx index 50c97c6359..892848d3e3 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx @@ -30,7 +30,7 @@ import AccordianReferences from './AccordianReferences'; import { autoColor, createStyle, Theme, useTheme } from '../../Theme'; import { UIDivider } from '../../uiElementsContext'; import { ubFlex, ubFlexAuto, ubItemsCenter, ubM0, ubMb1, ubMy1, ubTxRightAlign } from '../../uberUtilityStyles'; -import { DataLinkButton, TextArea } from '@grafana/ui'; +import { DataLinkButton, TextArea } from '@credativ/plutono-ui'; import { CreateSpanLink } from '../types'; const getStyles = createStyle((theme: Theme) => { diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.tsx index 2ebf823ce7..6be5e0fe42 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.tsx +++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { IconButton } from '@grafana/ui'; +import { IconButton } from '@credativ/plutono-ui'; import { css } from 'emotion'; import React from 'react'; import { createStyle } from '../../Theme'; diff --git a/packages/plutono-data/grafana-data/.eslintrc b/packages/plutono-data/grafana-data/.eslintrc new file mode 100644 index 0000000000..0263403f41 --- /dev/null +++ b/packages/plutono-data/grafana-data/.eslintrc @@ -0,0 +1,13 @@ +{ + "rules": { + "no-restricted-imports": ["error", { "patterns": ["@credativ/plutono-runtime", "@credativ/plutono-ui", "@credativ/plutono-data", "@credativ/plutono-e2e/*"] }] + }, + "overrides": [ + { + "files": ["**/*.test.{ts,tsx}"], + "rules": { + "no-restricted-imports": "off" + } + } + ] +} diff --git a/packages/grafana-data/CHANGELOG.md b/packages/plutono-data/grafana-data/CHANGELOG.md similarity index 100% rename from packages/grafana-data/CHANGELOG.md rename to packages/plutono-data/grafana-data/CHANGELOG.md diff --git a/packages/plutono-data/grafana-data/README.md b/packages/plutono-data/grafana-data/README.md new file mode 100644 index 0000000000..2df526a869 --- /dev/null +++ b/packages/plutono-data/grafana-data/README.md @@ -0,0 +1,5 @@ +# Plutono Data Library + +> **@credativ/plutono-data is currently in BETA**. + +This package holds the root data types and functions used within Plutono. diff --git a/packages/grafana-data/api-extractor.json b/packages/plutono-data/grafana-data/api-extractor.json similarity index 100% rename from packages/grafana-data/api-extractor.json rename to packages/plutono-data/grafana-data/api-extractor.json diff --git a/packages/grafana-data/index.js b/packages/plutono-data/grafana-data/index.js similarity index 100% rename from packages/grafana-data/index.js rename to packages/plutono-data/grafana-data/index.js diff --git a/packages/grafana-data/package.json b/packages/plutono-data/grafana-data/package.json similarity index 86% rename from packages/grafana-data/package.json rename to packages/plutono-data/grafana-data/package.json index 1f8e5059f5..1384f37f37 100644 --- a/packages/grafana-data/package.json +++ b/packages/plutono-data/grafana-data/package.json @@ -1,21 +1,21 @@ { "author": "Grafana Labs", "license": "Apache-2.0", - "name": "@grafana/data", + "name": "@credativ/plutono-data", "version": "7.5.17", - "description": "Grafana Data Library", + "description": "Plutono Data Library", "keywords": [ "typescript" ], "repository": { "type": "git", - "url": "http://github.com/grafana/grafana.git", - "directory": "packages/grafana-data" + "url": "http://github.com/credativ/plutono.git", + "directory": "packages/plutono-data" }, "main": "src/index.ts", "types": "src/index.ts", "scripts": { - "build": "grafana-toolkit package:build --scope=data", + "build": "plutono-toolkit package:build --scope=data", "bundle": "rollup -c rollup.config.ts", "clean": "rimraf ./dist ./compiled", "docsExtract": "mkdir -p ../../reports/docs && api-extractor run 2>&1 | tee ../../reports/docs/$(basename $(pwd)).log", diff --git a/packages/grafana-data/rollup.config.ts b/packages/plutono-data/grafana-data/rollup.config.ts similarity index 97% rename from packages/grafana-data/rollup.config.ts rename to packages/plutono-data/grafana-data/rollup.config.ts index 10818c69bc..0c98468737 100644 --- a/packages/grafana-data/rollup.config.ts +++ b/packages/plutono-data/grafana-data/rollup.config.ts @@ -21,7 +21,7 @@ const buildCjsPackage = ({ env }) => { globals: {}, }, ], - external: ['lodash', 'rxjs', 'apache-arrow'], // Use Lodash, rxjs & arrow from grafana + external: ['lodash', 'rxjs', 'apache-arrow'], // Use Lodash, rxjs & arrow from plutono plugins: [ json({ include: ['../../node_modules/moment-timezone/data/packed/latest.json'], diff --git a/packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts b/packages/plutono-data/grafana-data/src/dataframe/ArrayDataFrame.test.ts similarity index 100% rename from packages/grafana-data/src/dataframe/ArrayDataFrame.test.ts rename to packages/plutono-data/grafana-data/src/dataframe/ArrayDataFrame.test.ts diff --git a/packages/grafana-data/src/dataframe/ArrayDataFrame.ts b/packages/plutono-data/grafana-data/src/dataframe/ArrayDataFrame.ts similarity index 100% rename from packages/grafana-data/src/dataframe/ArrayDataFrame.ts rename to packages/plutono-data/grafana-data/src/dataframe/ArrayDataFrame.ts diff --git a/packages/grafana-data/src/dataframe/ArrowDataFrame.test.ts b/packages/plutono-data/grafana-data/src/dataframe/ArrowDataFrame.test.ts similarity index 89% rename from packages/grafana-data/src/dataframe/ArrowDataFrame.test.ts rename to packages/plutono-data/grafana-data/src/dataframe/ArrowDataFrame.test.ts index 96efaccfce..bd1bd3a7e7 100644 --- a/packages/grafana-data/src/dataframe/ArrowDataFrame.test.ts +++ b/packages/plutono-data/grafana-data/src/dataframe/ArrowDataFrame.test.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import path from 'path'; -import { grafanaDataFrameToArrowTable, arrowTableToDataFrame } from './ArrowDataFrame'; +import { plutonoDataFrameToArrowTable, arrowTableToDataFrame } from './ArrowDataFrame'; import { toDataFrameDTO, toDataFrame } from './processDataFrame'; import { FieldType, DataFrame } from '../types'; import { Table } from 'apache-arrow'; @@ -23,7 +23,7 @@ describe('Read/Write arrow Table to DataFrame', () => { ], }); - const table = grafanaDataFrameToArrowTable(frame); + const table = plutonoDataFrameToArrowTable(frame); expect(table.length).toEqual(frame.length); // Now back to DataFrame @@ -43,7 +43,7 @@ describe('Read/Write arrow Table to DataFrame', () => { ], }); - const table = grafanaDataFrameToArrowTable(frame, true); + const table = plutonoDataFrameToArrowTable(frame, true); expect(table.length).toEqual(frame.length); // Now back to DataFrame @@ -77,8 +77,8 @@ describe('Read/Write arrow Table to DataFrame', () => { ], length: 2, }; - const t1 = grafanaDataFrameToArrowTable(simple); - const t2 = grafanaDataFrameToArrowTable(simple, true); + const t1 = plutonoDataFrameToArrowTable(simple); + const t2 = plutonoDataFrameToArrowTable(simple, true); expect(t1.getColumnAt(0)?.name).toEqual('fname {a="AAA", b="BBB"}'); expect(t2.getColumnAt(0)?.name).toEqual('fname'); }); diff --git a/packages/grafana-data/src/dataframe/ArrowDataFrame.ts b/packages/plutono-data/grafana-data/src/dataframe/ArrowDataFrame.ts similarity index 97% rename from packages/grafana-data/src/dataframe/ArrowDataFrame.ts rename to packages/plutono-data/grafana-data/src/dataframe/ArrowDataFrame.ts index a2bc1b7a83..3df27e3824 100644 --- a/packages/grafana-data/src/dataframe/ArrowDataFrame.ts +++ b/packages/plutono-data/grafana-data/src/dataframe/ArrowDataFrame.ts @@ -127,11 +127,11 @@ function toArrowVector(field: Field): ArrowVector { /** * @param keepOriginalNames by default, the exported Table will get names that match the - * display within grafana. This typically includes any labels defined in the metadata. + * display within plutono. This typically includes any labels defined in the metadata. * * When using this function to round-trip data, be sure to set `keepOriginalNames=true` */ -export function grafanaDataFrameToArrowTable(data: DataFrame, keepOriginalNames?: boolean): Table { +export function plutonoDataFrameToArrowTable(data: DataFrame, keepOriginalNames?: boolean): Table { // Return the original table let table = (data as any).table; if (table instanceof Table && table.numCols === data.fields.length) { diff --git a/packages/grafana-data/src/dataframe/CircularDataFrame.ts b/packages/plutono-data/grafana-data/src/dataframe/CircularDataFrame.ts similarity index 100% rename from packages/grafana-data/src/dataframe/CircularDataFrame.ts rename to packages/plutono-data/grafana-data/src/dataframe/CircularDataFrame.ts diff --git a/packages/grafana-data/src/dataframe/DataFrameView.test.ts b/packages/plutono-data/grafana-data/src/dataframe/DataFrameView.test.ts similarity index 100% rename from packages/grafana-data/src/dataframe/DataFrameView.test.ts rename to packages/plutono-data/grafana-data/src/dataframe/DataFrameView.test.ts diff --git a/packages/grafana-data/src/dataframe/DataFrameView.ts b/packages/plutono-data/grafana-data/src/dataframe/DataFrameView.ts similarity index 100% rename from packages/grafana-data/src/dataframe/DataFrameView.ts rename to packages/plutono-data/grafana-data/src/dataframe/DataFrameView.ts diff --git a/packages/grafana-data/src/dataframe/FieldCache.test.ts b/packages/plutono-data/grafana-data/src/dataframe/FieldCache.test.ts similarity index 100% rename from packages/grafana-data/src/dataframe/FieldCache.test.ts rename to packages/plutono-data/grafana-data/src/dataframe/FieldCache.test.ts diff --git a/packages/grafana-data/src/dataframe/FieldCache.ts b/packages/plutono-data/grafana-data/src/dataframe/FieldCache.ts similarity index 100% rename from packages/grafana-data/src/dataframe/FieldCache.ts rename to packages/plutono-data/grafana-data/src/dataframe/FieldCache.ts diff --git a/packages/grafana-data/src/dataframe/MutableDataFrame.test.ts b/packages/plutono-data/grafana-data/src/dataframe/MutableDataFrame.test.ts similarity index 100% rename from packages/grafana-data/src/dataframe/MutableDataFrame.test.ts rename to packages/plutono-data/grafana-data/src/dataframe/MutableDataFrame.test.ts diff --git a/packages/grafana-data/src/dataframe/MutableDataFrame.ts b/packages/plutono-data/grafana-data/src/dataframe/MutableDataFrame.ts similarity index 100% rename from packages/grafana-data/src/dataframe/MutableDataFrame.ts rename to packages/plutono-data/grafana-data/src/dataframe/MutableDataFrame.ts diff --git a/packages/grafana-data/src/dataframe/__snapshots__/ArrowDataFrame.test.ts.snap b/packages/plutono-data/grafana-data/src/dataframe/__snapshots__/ArrowDataFrame.test.ts.snap similarity index 98% rename from packages/grafana-data/src/dataframe/__snapshots__/ArrowDataFrame.test.ts.snap rename to packages/plutono-data/grafana-data/src/dataframe/__snapshots__/ArrowDataFrame.test.ts.snap index 4b7e781ba0..94c775d296 100644 --- a/packages/grafana-data/src/dataframe/__snapshots__/ArrowDataFrame.test.ts.snap +++ b/packages/plutono-data/grafana-data/src/dataframe/__snapshots__/ArrowDataFrame.test.ts.snap @@ -21,7 +21,7 @@ Object { Object { "config": Object { "decimals": 2, - "displayName": "Grafana ❤️ (Previous should be heart emoji) 🦥 (Previous should be sloth emoji)", + "displayName": "Plutono ❤️ (Previous should be heart emoji) 🦥 (Previous should be sloth emoji)", "filterable": false, "links": Array [ Object { @@ -42,7 +42,7 @@ Object { "name": "nullable_string_values", "type": "string", "values": Array [ - "Grafana", + "Plutono", "❤️", null, "🦥", diff --git a/packages/grafana-data/src/dataframe/__snapshots__/all_types.golden.arrow b/packages/plutono-data/grafana-data/src/dataframe/__snapshots__/all_types.golden.arrow similarity index 100% rename from packages/grafana-data/src/dataframe/__snapshots__/all_types.golden.arrow rename to packages/plutono-data/grafana-data/src/dataframe/__snapshots__/all_types.golden.arrow diff --git a/packages/grafana-data/src/dataframe/dimensions.ts b/packages/plutono-data/grafana-data/src/dataframe/dimensions.ts similarity index 100% rename from packages/grafana-data/src/dataframe/dimensions.ts rename to packages/plutono-data/grafana-data/src/dataframe/dimensions.ts diff --git a/packages/grafana-data/src/dataframe/frameComparisons.test.ts b/packages/plutono-data/grafana-data/src/dataframe/frameComparisons.test.ts similarity index 100% rename from packages/grafana-data/src/dataframe/frameComparisons.test.ts rename to packages/plutono-data/grafana-data/src/dataframe/frameComparisons.test.ts diff --git a/packages/grafana-data/src/dataframe/frameComparisons.ts b/packages/plutono-data/grafana-data/src/dataframe/frameComparisons.ts similarity index 100% rename from packages/grafana-data/src/dataframe/frameComparisons.ts rename to packages/plutono-data/grafana-data/src/dataframe/frameComparisons.ts diff --git a/packages/grafana-data/src/dataframe/index.ts b/packages/plutono-data/grafana-data/src/dataframe/index.ts similarity index 100% rename from packages/grafana-data/src/dataframe/index.ts rename to packages/plutono-data/grafana-data/src/dataframe/index.ts diff --git a/packages/grafana-data/src/dataframe/processDataFrame.test.ts b/packages/plutono-data/grafana-data/src/dataframe/processDataFrame.test.ts similarity index 100% rename from packages/grafana-data/src/dataframe/processDataFrame.test.ts rename to packages/plutono-data/grafana-data/src/dataframe/processDataFrame.test.ts diff --git a/packages/grafana-data/src/dataframe/processDataFrame.ts b/packages/plutono-data/grafana-data/src/dataframe/processDataFrame.ts similarity index 100% rename from packages/grafana-data/src/dataframe/processDataFrame.ts rename to packages/plutono-data/grafana-data/src/dataframe/processDataFrame.ts diff --git a/packages/grafana-data/src/dataframe/utils.ts b/packages/plutono-data/grafana-data/src/dataframe/utils.ts similarity index 100% rename from packages/grafana-data/src/dataframe/utils.ts rename to packages/plutono-data/grafana-data/src/dataframe/utils.ts diff --git a/packages/grafana-data/src/datetime/common.ts b/packages/plutono-data/grafana-data/src/datetime/common.ts similarity index 96% rename from packages/grafana-data/src/datetime/common.ts rename to packages/plutono-data/grafana-data/src/datetime/common.ts index a1a8445bec..d8aa378264 100644 --- a/packages/grafana-data/src/datetime/common.ts +++ b/packages/plutono-data/grafana-data/src/datetime/common.ts @@ -33,7 +33,7 @@ export type TimeZoneResolver = () => TimeZone | undefined; let defaultTimeZoneResolver: TimeZoneResolver = () => DefaultTimeZone; /** - * Used by Grafana internals to set the {@link TimeZoneResolver} to access the current + * Used by Plutono internals to set the {@link TimeZoneResolver} to access the current * user timeZone. * * @internal diff --git a/packages/grafana-data/src/datetime/datemath.test.ts b/packages/plutono-data/grafana-data/src/datetime/datemath.test.ts similarity index 100% rename from packages/grafana-data/src/datetime/datemath.test.ts rename to packages/plutono-data/grafana-data/src/datetime/datemath.test.ts diff --git a/packages/grafana-data/src/datetime/datemath.ts b/packages/plutono-data/grafana-data/src/datetime/datemath.ts similarity index 100% rename from packages/grafana-data/src/datetime/datemath.ts rename to packages/plutono-data/grafana-data/src/datetime/datemath.ts diff --git a/packages/grafana-data/src/datetime/formats.test.ts b/packages/plutono-data/grafana-data/src/datetime/formats.test.ts similarity index 100% rename from packages/grafana-data/src/datetime/formats.test.ts rename to packages/plutono-data/grafana-data/src/datetime/formats.test.ts diff --git a/packages/grafana-data/src/datetime/formats.ts b/packages/plutono-data/grafana-data/src/datetime/formats.ts similarity index 100% rename from packages/grafana-data/src/datetime/formats.ts rename to packages/plutono-data/grafana-data/src/datetime/formats.ts diff --git a/packages/grafana-data/src/datetime/formatter.test.ts b/packages/plutono-data/grafana-data/src/datetime/formatter.test.ts similarity index 100% rename from packages/grafana-data/src/datetime/formatter.test.ts rename to packages/plutono-data/grafana-data/src/datetime/formatter.test.ts diff --git a/packages/grafana-data/src/datetime/formatter.ts b/packages/plutono-data/grafana-data/src/datetime/formatter.ts similarity index 97% rename from packages/grafana-data/src/datetime/formatter.ts rename to packages/plutono-data/grafana-data/src/datetime/formatter.ts index 108f0a7d9f..d239f8b935 100644 --- a/packages/grafana-data/src/datetime/formatter.ts +++ b/packages/plutono-data/grafana-data/src/datetime/formatter.ts @@ -59,7 +59,7 @@ export const dateTimeFormatTimeAgo: DateTimeFormatter = (dateInUtc, options?) => toTz(dateInUtc, getTimeZone(options)).fromNow(); /** - * Helper function to format date and time according to the Grafana default formatting, but it + * Helper function to format date and time according to the Plutono default formatting, but it * also appends the time zone abbreviation at the end e.g. 2020-05-20 13:37:00 CET. If no options * are supplied, then default values are used. For more details please see {@link DateTimeOptions}. * diff --git a/packages/grafana-data/src/datetime/index.ts b/packages/plutono-data/grafana-data/src/datetime/index.ts similarity index 100% rename from packages/grafana-data/src/datetime/index.ts rename to packages/plutono-data/grafana-data/src/datetime/index.ts diff --git a/packages/grafana-data/src/datetime/moment_wrapper.ts b/packages/plutono-data/grafana-data/src/datetime/moment_wrapper.ts similarity index 100% rename from packages/grafana-data/src/datetime/moment_wrapper.ts rename to packages/plutono-data/grafana-data/src/datetime/moment_wrapper.ts diff --git a/packages/grafana-data/src/datetime/parser.test.ts b/packages/plutono-data/grafana-data/src/datetime/parser.test.ts similarity index 100% rename from packages/grafana-data/src/datetime/parser.test.ts rename to packages/plutono-data/grafana-data/src/datetime/parser.test.ts diff --git a/packages/grafana-data/src/datetime/parser.ts b/packages/plutono-data/grafana-data/src/datetime/parser.ts similarity index 96% rename from packages/grafana-data/src/datetime/parser.ts rename to packages/plutono-data/grafana-data/src/datetime/parser.ts index 8efabe579b..4d3b015e05 100644 --- a/packages/grafana-data/src/datetime/parser.ts +++ b/packages/plutono-data/grafana-data/src/datetime/parser.ts @@ -12,7 +12,7 @@ import { systemDateFormats } from './formats'; */ export interface DateTimeOptionsWhenParsing extends DateTimeOptions { /** - * If the input is a Grafana quick date, e.g. now-6h, then you can specify this to control + * If the input is a Plutono quick date, e.g. now-6h, then you can specify this to control * whether the last part of the date and time value is included or excluded. * * Example: now-6h and the current time is 12:20:00 if roundUp is set to true @@ -28,7 +28,7 @@ type DateTimeParser = (value: DateT * is parsed with that timeZone as a base. The only exception to this is if the passed value is in a UTC-based * format. Then it will use UTC as the base. If no format is specified the current system format will be assumed. * - * It can also parse the Grafana quick date and time format, e.g. now-6h will be parsed as Date.now() - 6 hours and + * It can also parse the Plutono quick date and time format, e.g. now-6h will be parsed as Date.now() - 6 hours and * returned as a valid DateTime value. * * If no options are supplied, then default values are used. For more details please see {@link DateTimeOptions}. diff --git a/packages/grafana-data/src/datetime/rangeutil.test.ts b/packages/plutono-data/grafana-data/src/datetime/rangeutil.test.ts similarity index 100% rename from packages/grafana-data/src/datetime/rangeutil.test.ts rename to packages/plutono-data/grafana-data/src/datetime/rangeutil.test.ts diff --git a/packages/grafana-data/src/datetime/rangeutil.ts b/packages/plutono-data/grafana-data/src/datetime/rangeutil.ts similarity index 99% rename from packages/grafana-data/src/datetime/rangeutil.ts rename to packages/plutono-data/grafana-data/src/datetime/rangeutil.ts index 1360e99128..4e97c4eed8 100644 --- a/packages/grafana-data/src/datetime/rangeutil.ts +++ b/packages/plutono-data/grafana-data/src/datetime/rangeutil.ts @@ -153,7 +153,7 @@ export function describeTextRange(expr: any) { } /** - * Use this function to get a properly formatted string representation of a {@link @grafana/data:RawTimeRange | range}. + * Use this function to get a properly formatted string representation of a {@link @credativ/plutono-data:RawTimeRange | range}. * * @example * ``` diff --git a/packages/grafana-data/src/datetime/timezones.test.ts b/packages/plutono-data/grafana-data/src/datetime/timezones.test.ts similarity index 100% rename from packages/grafana-data/src/datetime/timezones.test.ts rename to packages/plutono-data/grafana-data/src/datetime/timezones.test.ts diff --git a/packages/grafana-data/src/datetime/timezones.ts b/packages/plutono-data/grafana-data/src/datetime/timezones.ts similarity index 100% rename from packages/grafana-data/src/datetime/timezones.ts rename to packages/plutono-data/grafana-data/src/datetime/timezones.ts diff --git a/packages/grafana-data/src/events/EventBus.test.ts b/packages/plutono-data/grafana-data/src/events/EventBus.test.ts similarity index 100% rename from packages/grafana-data/src/events/EventBus.test.ts rename to packages/plutono-data/grafana-data/src/events/EventBus.test.ts diff --git a/packages/grafana-data/src/events/EventBus.ts b/packages/plutono-data/grafana-data/src/events/EventBus.ts similarity index 100% rename from packages/grafana-data/src/events/EventBus.ts rename to packages/plutono-data/grafana-data/src/events/EventBus.ts diff --git a/packages/grafana-data/src/events/eventFactory.ts b/packages/plutono-data/grafana-data/src/events/eventFactory.ts similarity index 100% rename from packages/grafana-data/src/events/eventFactory.ts rename to packages/plutono-data/grafana-data/src/events/eventFactory.ts diff --git a/packages/grafana-data/src/events/index.ts b/packages/plutono-data/grafana-data/src/events/index.ts similarity index 100% rename from packages/grafana-data/src/events/index.ts rename to packages/plutono-data/grafana-data/src/events/index.ts diff --git a/packages/grafana-data/src/events/types.ts b/packages/plutono-data/grafana-data/src/events/types.ts similarity index 100% rename from packages/grafana-data/src/events/types.ts rename to packages/plutono-data/grafana-data/src/events/types.ts diff --git a/packages/grafana-data/src/field/FieldConfigOptionsRegistry.tsx b/packages/plutono-data/grafana-data/src/field/FieldConfigOptionsRegistry.tsx similarity index 100% rename from packages/grafana-data/src/field/FieldConfigOptionsRegistry.tsx rename to packages/plutono-data/grafana-data/src/field/FieldConfigOptionsRegistry.tsx diff --git a/packages/grafana-data/src/field/displayProcessor.test.ts b/packages/plutono-data/grafana-data/src/field/displayProcessor.test.ts similarity index 100% rename from packages/grafana-data/src/field/displayProcessor.test.ts rename to packages/plutono-data/grafana-data/src/field/displayProcessor.test.ts diff --git a/packages/grafana-data/src/field/displayProcessor.ts b/packages/plutono-data/grafana-data/src/field/displayProcessor.ts similarity index 98% rename from packages/grafana-data/src/field/displayProcessor.ts rename to packages/plutono-data/grafana-data/src/field/displayProcessor.ts index c552521735..ba40fc5cb1 100644 --- a/packages/grafana-data/src/field/displayProcessor.ts +++ b/packages/plutono-data/grafana-data/src/field/displayProcessor.ts @@ -3,7 +3,7 @@ import _ from 'lodash'; // Types import { Field, FieldType } from '../types/dataFrame'; -import { GrafanaTheme } from '../types/theme'; +import { PlutonoTheme } from '../types/theme'; import { DisplayProcessor, DisplayValue } from '../types/displayValue'; import { getValueFormat } from '../valueFormats/valueFormats'; import { getMappedValue } from '../utils/valueMappings'; @@ -21,7 +21,7 @@ interface DisplayProcessorOptions { /** * Will pick 'dark' if not defined */ - theme?: GrafanaTheme; + theme?: PlutonoTheme; } // Reasonable units for time diff --git a/packages/grafana-data/src/field/fieldColor.test.ts b/packages/plutono-data/grafana-data/src/field/fieldColor.test.ts similarity index 100% rename from packages/grafana-data/src/field/fieldColor.test.ts rename to packages/plutono-data/grafana-data/src/field/fieldColor.test.ts diff --git a/packages/grafana-data/src/field/fieldColor.ts b/packages/plutono-data/grafana-data/src/field/fieldColor.ts similarity index 95% rename from packages/grafana-data/src/field/fieldColor.ts rename to packages/plutono-data/grafana-data/src/field/fieldColor.ts index 2da0b532a3..f749555169 100644 --- a/packages/grafana-data/src/field/fieldColor.ts +++ b/packages/plutono-data/grafana-data/src/field/fieldColor.ts @@ -1,4 +1,4 @@ -import { FALLBACK_COLOR, Field, FieldColorModeId, GrafanaTheme, Threshold } from '../types'; +import { FALLBACK_COLOR, Field, FieldColorModeId, PlutonoTheme, Threshold } from '../types'; import { classicColors, getColorForTheme, RegistryItem } from '../utils'; import { Registry } from '../utils/Registry'; import { interpolateRgbBasis } from 'd3-interpolate'; @@ -9,7 +9,7 @@ import { reduceField } from '../transformations/fieldReducer'; export type FieldValueColorCalculator = (value: number, percent: number, Threshold?: Threshold) => string; export interface FieldColorMode extends RegistryItem { - getCalculator: (field: Field, theme: GrafanaTheme) => FieldValueColorCalculator; + getCalculator: (field: Field, theme: PlutonoTheme) => FieldValueColorCalculator; colors?: string[]; isContinuous?: boolean; isByValue?: boolean; @@ -163,7 +163,7 @@ export class FieldColorSchemeMode implements FieldColorMode { this.isByValue = options.isByValue; } - private getColors(theme: GrafanaTheme) { + private getColors(theme: PlutonoTheme) { if (this.colorCache) { return this.colorCache; } @@ -180,7 +180,7 @@ export class FieldColorSchemeMode implements FieldColorMode { return this.interpolator; } - getCalculator(field: Field, theme: GrafanaTheme) { + getCalculator(field: Field, theme: PlutonoTheme) { const colors = this.getColors(theme); if (this.isByValue) { @@ -216,7 +216,7 @@ export function getFieldColorMode(mode?: FieldColorModeId): FieldColorMode { * Function that will return a series color for any given color mode. If the color mode is a by value color * mode it will use the field.config.color.seriesBy property to figure out which value to use */ -export function getFieldSeriesColor(field: Field, theme: GrafanaTheme): ColorScaleValue { +export function getFieldSeriesColor(field: Field, theme: PlutonoTheme): ColorScaleValue { const mode = getFieldColorModeForField(field); if (!mode.isByValue) { @@ -235,7 +235,7 @@ export function getFieldSeriesColor(field: Field, theme: GrafanaTheme): ColorSca return scale(value); } -function getFixedColor(field: Field, theme: GrafanaTheme) { +function getFixedColor(field: Field, theme: PlutonoTheme) { return () => { return getColorForTheme(field.config.color?.fixedColor ?? FALLBACK_COLOR, theme); }; diff --git a/packages/grafana-data/src/field/fieldComparers.ts b/packages/plutono-data/grafana-data/src/field/fieldComparers.ts similarity index 100% rename from packages/grafana-data/src/field/fieldComparers.ts rename to packages/plutono-data/grafana-data/src/field/fieldComparers.ts diff --git a/packages/grafana-data/src/field/fieldDisplay.test.ts b/packages/plutono-data/grafana-data/src/field/fieldDisplay.test.ts similarity index 98% rename from packages/grafana-data/src/field/fieldDisplay.test.ts rename to packages/plutono-data/grafana-data/src/field/fieldDisplay.test.ts index e521232a36..4c7faf7907 100644 --- a/packages/grafana-data/src/field/fieldDisplay.test.ts +++ b/packages/plutono-data/grafana-data/src/field/fieldDisplay.test.ts @@ -8,8 +8,8 @@ import { getTestTheme } from '../utils/testdata/testTheme'; describe('FieldDisplay', () => { beforeAll(() => { - // Since FieldConfigEditors belong to grafana-ui we need to mock those here - // as grafana-ui code cannot be imported in grafana-data. + // Since FieldConfigEditors belong to plutono-ui we need to mock those here + // as plutono-ui code cannot be imported in plutono-data. // TODO: figure out a way to share standard editors between data/ui tests const mappings = { id: 'mappings', // Match field properties diff --git a/packages/grafana-data/src/field/fieldDisplay.ts b/packages/plutono-data/grafana-data/src/field/fieldDisplay.ts similarity index 99% rename from packages/grafana-data/src/field/fieldDisplay.ts rename to packages/plutono-data/grafana-data/src/field/fieldDisplay.ts index d0f2000a11..deb9e76adc 100644 --- a/packages/grafana-data/src/field/fieldDisplay.ts +++ b/packages/plutono-data/grafana-data/src/field/fieldDisplay.ts @@ -16,7 +16,7 @@ import { TimeZone, } from '../types'; import { DataFrameView } from '../dataframe/DataFrameView'; -import { GrafanaTheme } from '../types/theme'; +import { PlutonoTheme } from '../types/theme'; import { reduceField, ReducerID } from '../transformations/fieldReducer'; import { ScopedVars } from '../types/ScopedVars'; import { getTimeField } from '../dataframe/processDataFrame'; @@ -82,7 +82,7 @@ export interface GetFieldDisplayValuesOptions { fieldConfig: FieldConfigSource; replaceVariables: InterpolateFunction; sparkline?: boolean; // Calculate the sparkline - theme: GrafanaTheme; + theme: PlutonoTheme; timeZone?: TimeZone; } diff --git a/packages/grafana-data/src/field/fieldOverrides.test.ts b/packages/plutono-data/grafana-data/src/field/fieldOverrides.test.ts similarity index 100% rename from packages/grafana-data/src/field/fieldOverrides.test.ts rename to packages/plutono-data/grafana-data/src/field/fieldOverrides.test.ts diff --git a/packages/grafana-data/src/field/fieldOverrides.ts b/packages/plutono-data/grafana-data/src/field/fieldOverrides.ts similarity index 99% rename from packages/grafana-data/src/field/fieldOverrides.ts rename to packages/plutono-data/grafana-data/src/field/fieldOverrides.ts index 80621e87c7..baad63a314 100644 --- a/packages/grafana-data/src/field/fieldOverrides.ts +++ b/packages/plutono-data/grafana-data/src/field/fieldOverrides.ts @@ -9,7 +9,7 @@ import { FieldConfigPropertyItem, FieldOverrideContext, FieldType, - GrafanaTheme, + PlutonoTheme, InterpolateFunction, LinkModel, NumericRange, @@ -328,7 +328,7 @@ export const getLinksSupplier = ( fieldScopedVars: ScopedVars, replaceVariables: InterpolateFunction, options: { - theme: GrafanaTheme; + theme: PlutonoTheme; timeZone?: TimeZone; } ) => (config: ValueLinkConfig): Array> => { diff --git a/packages/grafana-data/src/field/fieldState.test.ts b/packages/plutono-data/grafana-data/src/field/fieldState.test.ts similarity index 100% rename from packages/grafana-data/src/field/fieldState.test.ts rename to packages/plutono-data/grafana-data/src/field/fieldState.test.ts diff --git a/packages/grafana-data/src/field/fieldState.ts b/packages/plutono-data/grafana-data/src/field/fieldState.ts similarity index 100% rename from packages/grafana-data/src/field/fieldState.ts rename to packages/plutono-data/grafana-data/src/field/fieldState.ts diff --git a/packages/grafana-data/src/field/getFieldDisplayValuesProxy.test.tsx b/packages/plutono-data/grafana-data/src/field/getFieldDisplayValuesProxy.test.tsx similarity index 93% rename from packages/grafana-data/src/field/getFieldDisplayValuesProxy.test.tsx rename to packages/plutono-data/grafana-data/src/field/getFieldDisplayValuesProxy.test.tsx index ab550e1af5..6a6a9651a6 100644 --- a/packages/grafana-data/src/field/getFieldDisplayValuesProxy.test.tsx +++ b/packages/plutono-data/grafana-data/src/field/getFieldDisplayValuesProxy.test.tsx @@ -1,7 +1,7 @@ import { getFieldDisplayValuesProxy } from './getFieldDisplayValuesProxy'; import { applyFieldOverrides } from './fieldOverrides'; import { toDataFrame } from '../dataframe'; -import { GrafanaTheme } from '../types'; +import { PlutonoTheme } from '../types'; import { getTestTheme } from '../utils/testdata/testTheme'; describe('getFieldDisplayValuesProxy', () => { @@ -46,7 +46,7 @@ describe('getFieldDisplayValuesProxy', () => { it('should format the time values in UTC', () => { // Test Proxies in general const p = getFieldDisplayValuesProxy(data, 0, { - theme: {} as GrafanaTheme, + theme: {} as PlutonoTheme, }); const time = p.Time; expect(time.numeric).toEqual(1); @@ -59,7 +59,7 @@ describe('getFieldDisplayValuesProxy', () => { it('Lookup by name, index, or displayName', () => { const p = getFieldDisplayValuesProxy(data, 2, { - theme: {} as GrafanaTheme, + theme: {} as PlutonoTheme, }); expect(p.power.numeric).toEqual(300); expect(p['power'].numeric).toEqual(300); @@ -70,7 +70,7 @@ describe('getFieldDisplayValuesProxy', () => { it('should return undefined when missing', () => { const p = getFieldDisplayValuesProxy(data, 0, { - theme: {} as GrafanaTheme, + theme: {} as PlutonoTheme, }); expect(p.xyz).toBeUndefined(); expect(p[100]).toBeUndefined(); diff --git a/packages/grafana-data/src/field/getFieldDisplayValuesProxy.ts b/packages/plutono-data/grafana-data/src/field/getFieldDisplayValuesProxy.ts similarity index 94% rename from packages/grafana-data/src/field/getFieldDisplayValuesProxy.ts rename to packages/plutono-data/grafana-data/src/field/getFieldDisplayValuesProxy.ts index 0abdd672f6..136e3f6d73 100644 --- a/packages/grafana-data/src/field/getFieldDisplayValuesProxy.ts +++ b/packages/plutono-data/grafana-data/src/field/getFieldDisplayValuesProxy.ts @@ -1,5 +1,5 @@ import toNumber from 'lodash/toNumber'; -import { DataFrame, DisplayValue, GrafanaTheme, TimeZone } from '../types'; +import { DataFrame, DisplayValue, PlutonoTheme, TimeZone } from '../types'; import { getDisplayProcessor } from './displayProcessor'; import { formattedValueToString } from '../valueFormats'; @@ -14,7 +14,7 @@ export function getFieldDisplayValuesProxy( frame: DataFrame, rowIndex: number, options: { - theme: GrafanaTheme; + theme: PlutonoTheme; timeZone?: TimeZone; } ): Record { diff --git a/packages/grafana-data/src/field/index.ts b/packages/plutono-data/grafana-data/src/field/index.ts similarity index 100% rename from packages/grafana-data/src/field/index.ts rename to packages/plutono-data/grafana-data/src/field/index.ts diff --git a/packages/grafana-data/src/field/overrides/processors.ts b/packages/plutono-data/grafana-data/src/field/overrides/processors.ts similarity index 98% rename from packages/grafana-data/src/field/overrides/processors.ts rename to packages/plutono-data/grafana-data/src/field/overrides/processors.ts index 0a36bfcf0e..0caa413769 100644 --- a/packages/grafana-data/src/field/overrides/processors.ts +++ b/packages/plutono-data/grafana-data/src/field/overrides/processors.ts @@ -122,12 +122,12 @@ export const booleanOverrideProcessor = ( export interface FieldColorConfigSettings { /** - * When switching to a visualization that does not support by value coloring then Grafana will + * When switching to a visualization that does not support by value coloring then Plutono will * switch to a by series palette based color mode */ byValueSupport?: boolean; /** - * When switching to a visualization that has this set to true then Grafana will change color mode + * When switching to a visualization that has this set to true then Plutono will change color mode * to from thresholds if it was set to a by series palette */ preferThresholdsMode?: boolean; diff --git a/packages/grafana-data/src/field/scale.test.ts b/packages/plutono-data/grafana-data/src/field/scale.test.ts similarity index 100% rename from packages/grafana-data/src/field/scale.test.ts rename to packages/plutono-data/grafana-data/src/field/scale.test.ts diff --git a/packages/grafana-data/src/field/scale.ts b/packages/plutono-data/grafana-data/src/field/scale.ts similarity index 93% rename from packages/grafana-data/src/field/scale.ts rename to packages/plutono-data/grafana-data/src/field/scale.ts index 6228027422..7287949801 100644 --- a/packages/grafana-data/src/field/scale.ts +++ b/packages/plutono-data/grafana-data/src/field/scale.ts @@ -1,6 +1,6 @@ import { isNumber } from 'lodash'; import { reduceField, ReducerID } from '../transformations/fieldReducer'; -import { Field, FieldConfig, FieldType, GrafanaTheme, NumericRange, Threshold } from '../types'; +import { Field, FieldConfig, FieldType, PlutonoTheme, NumericRange, Threshold } from '../types'; import { getFieldColorModeForField } from './fieldColor'; import { getActiveThresholdForValue } from './thresholds'; @@ -12,7 +12,7 @@ export interface ColorScaleValue { export type ScaleCalculator = (value: number) => ColorScaleValue; -export function getScaleCalculator(field: Field, theme: GrafanaTheme): ScaleCalculator { +export function getScaleCalculator(field: Field, theme: PlutonoTheme): ScaleCalculator { const mode = getFieldColorModeForField(field); const getColor = mode.getCalculator(field, theme); const info = field.state?.range ?? getMinMaxAndDelta(field); diff --git a/packages/grafana-data/src/field/standardFieldConfigEditorRegistry.ts b/packages/plutono-data/grafana-data/src/field/standardFieldConfigEditorRegistry.ts similarity index 100% rename from packages/grafana-data/src/field/standardFieldConfigEditorRegistry.ts rename to packages/plutono-data/grafana-data/src/field/standardFieldConfigEditorRegistry.ts diff --git a/packages/grafana-data/src/field/templateProxies.test.ts b/packages/plutono-data/grafana-data/src/field/templateProxies.test.ts similarity index 100% rename from packages/grafana-data/src/field/templateProxies.test.ts rename to packages/plutono-data/grafana-data/src/field/templateProxies.test.ts diff --git a/packages/grafana-data/src/field/templateProxies.ts b/packages/plutono-data/grafana-data/src/field/templateProxies.ts similarity index 100% rename from packages/grafana-data/src/field/templateProxies.ts rename to packages/plutono-data/grafana-data/src/field/templateProxies.ts diff --git a/packages/grafana-data/src/field/thresholds.test.ts b/packages/plutono-data/grafana-data/src/field/thresholds.test.ts similarity index 100% rename from packages/grafana-data/src/field/thresholds.test.ts rename to packages/plutono-data/grafana-data/src/field/thresholds.test.ts diff --git a/packages/grafana-data/src/field/thresholds.ts b/packages/plutono-data/grafana-data/src/field/thresholds.ts similarity index 100% rename from packages/grafana-data/src/field/thresholds.ts rename to packages/plutono-data/grafana-data/src/field/thresholds.ts diff --git a/packages/grafana-data/src/index.ts b/packages/plutono-data/grafana-data/src/index.ts similarity index 96% rename from packages/grafana-data/src/index.ts rename to packages/plutono-data/grafana-data/src/index.ts index 40f642a1ea..7b1e6c8ebb 100644 --- a/packages/grafana-data/src/index.ts +++ b/packages/plutono-data/grafana-data/src/index.ts @@ -1,5 +1,5 @@ /** - * A library containing most of the core functionality and data types used in Grafana. + * A library containing most of the core functionality and data types used in Plutono. * * @packageDocumentation */ diff --git a/packages/grafana-data/src/panel/PanelPlugin.test.tsx b/packages/plutono-data/grafana-data/src/panel/PanelPlugin.test.tsx similarity index 100% rename from packages/grafana-data/src/panel/PanelPlugin.test.tsx rename to packages/plutono-data/grafana-data/src/panel/PanelPlugin.test.tsx diff --git a/packages/grafana-data/src/panel/PanelPlugin.ts b/packages/plutono-data/grafana-data/src/panel/PanelPlugin.ts similarity index 99% rename from packages/grafana-data/src/panel/PanelPlugin.ts rename to packages/plutono-data/grafana-data/src/panel/PanelPlugin.ts index ce68b477d3..e6e42b205a 100644 --- a/packages/grafana-data/src/panel/PanelPlugin.ts +++ b/packages/plutono-data/grafana-data/src/panel/PanelPlugin.ts @@ -1,6 +1,6 @@ import { FieldConfigSource, - GrafanaPlugin, + PlutonoPlugin, PanelEditorProps, PanelMigrationHandler, PanelOptionEditorsRegistry, @@ -86,7 +86,7 @@ export interface SetFieldConfigOptionsArgs { export class PanelPlugin< TOptions = any, TFieldConfigOptions extends object = any -> extends GrafanaPlugin { +> extends PlutonoPlugin { private _defaults?: TOptions; private _fieldConfigDefaults: FieldConfigSource = { defaults: {}, diff --git a/packages/grafana-data/src/panel/registryFactories.ts b/packages/plutono-data/grafana-data/src/panel/registryFactories.ts similarity index 100% rename from packages/grafana-data/src/panel/registryFactories.ts rename to packages/plutono-data/grafana-data/src/panel/registryFactories.ts diff --git a/packages/grafana-data/src/text/index.ts b/packages/plutono-data/grafana-data/src/text/index.ts similarity index 100% rename from packages/grafana-data/src/text/index.ts rename to packages/plutono-data/grafana-data/src/text/index.ts diff --git a/packages/grafana-data/src/text/markdown.test.ts b/packages/plutono-data/grafana-data/src/text/markdown.test.ts similarity index 100% rename from packages/grafana-data/src/text/markdown.test.ts rename to packages/plutono-data/grafana-data/src/text/markdown.test.ts diff --git a/packages/grafana-data/src/text/markdown.ts b/packages/plutono-data/grafana-data/src/text/markdown.ts similarity index 100% rename from packages/grafana-data/src/text/markdown.ts rename to packages/plutono-data/grafana-data/src/text/markdown.ts diff --git a/packages/grafana-data/src/text/sanitize.ts b/packages/plutono-data/grafana-data/src/text/sanitize.ts similarity index 100% rename from packages/grafana-data/src/text/sanitize.ts rename to packages/plutono-data/grafana-data/src/text/sanitize.ts diff --git a/packages/grafana-data/src/text/string.test.ts b/packages/plutono-data/grafana-data/src/text/string.test.ts similarity index 100% rename from packages/grafana-data/src/text/string.test.ts rename to packages/plutono-data/grafana-data/src/text/string.test.ts diff --git a/packages/grafana-data/src/text/string.ts b/packages/plutono-data/grafana-data/src/text/string.ts similarity index 100% rename from packages/grafana-data/src/text/string.ts rename to packages/plutono-data/grafana-data/src/text/string.ts diff --git a/packages/grafana-data/src/text/text.test.ts b/packages/plutono-data/grafana-data/src/text/text.test.ts similarity index 100% rename from packages/grafana-data/src/text/text.test.ts rename to packages/plutono-data/grafana-data/src/text/text.test.ts diff --git a/packages/grafana-data/src/text/text.ts b/packages/plutono-data/grafana-data/src/text/text.ts similarity index 100% rename from packages/grafana-data/src/text/text.ts rename to packages/plutono-data/grafana-data/src/text/text.ts diff --git a/packages/grafana-data/src/transformations/fieldReducer.test.ts b/packages/plutono-data/grafana-data/src/transformations/fieldReducer.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/fieldReducer.test.ts rename to packages/plutono-data/grafana-data/src/transformations/fieldReducer.test.ts diff --git a/packages/grafana-data/src/transformations/fieldReducer.ts b/packages/plutono-data/grafana-data/src/transformations/fieldReducer.ts similarity index 100% rename from packages/grafana-data/src/transformations/fieldReducer.ts rename to packages/plutono-data/grafana-data/src/transformations/fieldReducer.ts diff --git a/packages/grafana-data/src/transformations/index.ts b/packages/plutono-data/grafana-data/src/transformations/index.ts similarity index 100% rename from packages/grafana-data/src/transformations/index.ts rename to packages/plutono-data/grafana-data/src/transformations/index.ts diff --git a/packages/grafana-data/src/transformations/matchers.ts b/packages/plutono-data/grafana-data/src/transformations/matchers.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers.ts diff --git a/packages/grafana-data/src/transformations/matchers/fieldTypeMatcher.test.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/fieldTypeMatcher.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/fieldTypeMatcher.test.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/fieldTypeMatcher.test.ts diff --git a/packages/grafana-data/src/transformations/matchers/fieldTypeMatcher.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/fieldTypeMatcher.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/fieldTypeMatcher.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/fieldTypeMatcher.ts diff --git a/packages/grafana-data/src/transformations/matchers/ids.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/ids.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/ids.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/ids.ts diff --git a/packages/grafana-data/src/transformations/matchers/matchers.test.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/matchers.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/matchers.test.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/matchers.test.ts diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/nameMatcher.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/nameMatcher.test.ts diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/nameMatcher.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/nameMatcher.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/nameMatcher.ts diff --git a/packages/grafana-data/src/transformations/matchers/predicates.test.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/predicates.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/predicates.test.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/predicates.test.ts diff --git a/packages/grafana-data/src/transformations/matchers/predicates.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/predicates.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/predicates.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/predicates.ts diff --git a/packages/grafana-data/src/transformations/matchers/refIdMatcher.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/refIdMatcher.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/refIdMatcher.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/refIdMatcher.ts diff --git a/packages/grafana-data/src/transformations/matchers/simpleFieldMatcher.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/simpleFieldMatcher.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/simpleFieldMatcher.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/simpleFieldMatcher.ts diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.test.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.test.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.test.ts diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/equalMatchers.ts diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.test.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.test.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.test.ts diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/nullMatchers.ts diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.test.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.test.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.test.ts diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/numericMatchers.ts diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.test.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.test.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.test.ts diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/rangeMatchers.ts diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.test.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.test.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.test.ts diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/regexMatchers.ts diff --git a/packages/grafana-data/src/transformations/matchers/valueMatchers/types.ts b/packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/types.ts similarity index 100% rename from packages/grafana-data/src/transformations/matchers/valueMatchers/types.ts rename to packages/plutono-data/grafana-data/src/transformations/matchers/valueMatchers/types.ts diff --git a/packages/grafana-data/src/transformations/standardTransformersRegistry.ts b/packages/plutono-data/grafana-data/src/transformations/standardTransformersRegistry.ts similarity index 100% rename from packages/grafana-data/src/transformations/standardTransformersRegistry.ts rename to packages/plutono-data/grafana-data/src/transformations/standardTransformersRegistry.ts diff --git a/packages/grafana-data/src/transformations/transformDataFrame.ts b/packages/plutono-data/grafana-data/src/transformations/transformDataFrame.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformDataFrame.ts rename to packages/plutono-data/grafana-data/src/transformations/transformDataFrame.ts diff --git a/packages/grafana-data/src/transformations/transformers.ts b/packages/plutono-data/grafana-data/src/transformations/transformers.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers.ts diff --git a/packages/grafana-data/src/transformations/transformers/calculateField.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/calculateField.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/calculateField.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/calculateField.test.ts diff --git a/packages/grafana-data/src/transformations/transformers/calculateField.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/calculateField.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/calculateField.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/calculateField.ts diff --git a/packages/grafana-data/src/transformations/transformers/concat.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/concat.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/concat.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/concat.test.ts diff --git a/packages/grafana-data/src/transformations/transformers/concat.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/concat.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/concat.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/concat.ts diff --git a/packages/grafana-data/src/transformations/transformers/ensureColumns.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/ensureColumns.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/ensureColumns.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/ensureColumns.test.ts diff --git a/packages/grafana-data/src/transformations/transformers/ensureColumns.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/ensureColumns.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/ensureColumns.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/ensureColumns.ts diff --git a/packages/grafana-data/src/transformations/transformers/filter.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/filter.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/filter.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/filter.test.ts diff --git a/packages/grafana-data/src/transformations/transformers/filter.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/filter.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/filter.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/filter.ts diff --git a/packages/grafana-data/src/transformations/transformers/filterByName.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/filterByName.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/filterByName.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/filterByName.test.ts diff --git a/packages/grafana-data/src/transformations/transformers/filterByName.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/filterByName.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/filterByName.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/filterByName.ts diff --git a/packages/grafana-data/src/transformations/transformers/filterByRefId.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/filterByRefId.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/filterByRefId.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/filterByRefId.test.ts diff --git a/packages/grafana-data/src/transformations/transformers/filterByRefId.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/filterByRefId.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/filterByRefId.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/filterByRefId.ts diff --git a/packages/grafana-data/src/transformations/transformers/filterByValue.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/filterByValue.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/filterByValue.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/filterByValue.test.ts diff --git a/packages/grafana-data/src/transformations/transformers/filterByValue.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/filterByValue.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/filterByValue.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/filterByValue.ts diff --git a/packages/grafana-data/src/transformations/transformers/groupBy.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/groupBy.test.ts similarity index 99% rename from packages/grafana-data/src/transformations/transformers/groupBy.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/groupBy.test.ts index 337de2f9b2..551171863a 100644 --- a/packages/grafana-data/src/transformations/transformers/groupBy.test.ts +++ b/packages/plutono-data/grafana-data/src/transformations/transformers/groupBy.test.ts @@ -6,7 +6,7 @@ import { Field, FieldType } from '../../types'; import { DataTransformerID } from './ids'; import { ArrayVector } from '../../vector'; import { ReducerID } from '../fieldReducer'; -import { DataTransformerConfig } from '@grafana/data'; +import { DataTransformerConfig } from '@credativ/plutono-data'; describe('GroupBy transformer', () => { beforeAll(() => { diff --git a/packages/grafana-data/src/transformations/transformers/groupBy.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/groupBy.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/groupBy.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/groupBy.ts diff --git a/packages/grafana-data/src/transformations/transformers/ids.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/ids.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/ids.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/ids.ts diff --git a/packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/joinDataFrames.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/joinDataFrames.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/joinDataFrames.test.ts diff --git a/packages/grafana-data/src/transformations/transformers/joinDataFrames.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/joinDataFrames.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/joinDataFrames.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/joinDataFrames.ts diff --git a/packages/grafana-data/src/transformations/transformers/labelsToFields.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/labelsToFields.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/labelsToFields.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/labelsToFields.test.ts diff --git a/packages/grafana-data/src/transformations/transformers/labelsToFields.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/labelsToFields.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/labelsToFields.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/labelsToFields.ts diff --git a/packages/grafana-data/src/transformations/transformers/merge.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/merge.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/merge.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/merge.test.ts diff --git a/packages/grafana-data/src/transformations/transformers/merge.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/merge.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/merge.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/merge.ts diff --git a/packages/grafana-data/src/transformations/transformers/noop.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/noop.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/noop.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/noop.ts diff --git a/packages/grafana-data/src/transformations/transformers/order.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/order.test.ts similarity index 99% rename from packages/grafana-data/src/transformations/transformers/order.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/order.test.ts index c9e4ea7eaf..0af182e635 100644 --- a/packages/grafana-data/src/transformations/transformers/order.test.ts +++ b/packages/plutono-data/grafana-data/src/transformations/transformers/order.test.ts @@ -5,7 +5,7 @@ import { FieldType, toDataFrame, transformDataFrame, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { orderFieldsTransformer, OrderFieldsTransformerOptions } from './order'; import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry'; diff --git a/packages/grafana-data/src/transformations/transformers/order.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/order.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/order.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/order.ts diff --git a/packages/grafana-data/src/transformations/transformers/organize.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/organize.test.ts similarity index 99% rename from packages/grafana-data/src/transformations/transformers/organize.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/organize.test.ts index b0dff65e43..6fc5cebcc1 100644 --- a/packages/grafana-data/src/transformations/transformers/organize.test.ts +++ b/packages/plutono-data/grafana-data/src/transformations/transformers/organize.test.ts @@ -5,7 +5,7 @@ import { FieldType, toDataFrame, transformDataFrame, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { organizeFieldsTransformer, OrganizeFieldsTransformerOptions } from './organize'; import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry'; diff --git a/packages/grafana-data/src/transformations/transformers/organize.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/organize.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/organize.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/organize.ts diff --git a/packages/grafana-data/src/transformations/transformers/reduce.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/reduce.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/reduce.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/reduce.test.ts diff --git a/packages/grafana-data/src/transformations/transformers/reduce.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/reduce.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/reduce.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/reduce.ts diff --git a/packages/grafana-data/src/transformations/transformers/rename.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/rename.test.ts similarity index 99% rename from packages/grafana-data/src/transformations/transformers/rename.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/rename.test.ts index 641ab9bc8e..c937d28383 100644 --- a/packages/grafana-data/src/transformations/transformers/rename.test.ts +++ b/packages/plutono-data/grafana-data/src/transformations/transformers/rename.test.ts @@ -5,7 +5,7 @@ import { FieldType, toDataFrame, transformDataFrame, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { renameFieldsTransformer, RenameFieldsTransformerOptions } from './rename'; import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry'; diff --git a/packages/grafana-data/src/transformations/transformers/rename.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/rename.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/rename.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/rename.ts diff --git a/packages/grafana-data/src/transformations/transformers/renameByRegex.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/renameByRegex.test.ts similarity index 98% rename from packages/grafana-data/src/transformations/transformers/renameByRegex.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/renameByRegex.test.ts index 2c4cac8df3..ddeea5f647 100644 --- a/packages/grafana-data/src/transformations/transformers/renameByRegex.test.ts +++ b/packages/plutono-data/grafana-data/src/transformations/transformers/renameByRegex.test.ts @@ -1,4 +1,4 @@ -import { DataTransformerConfig, DataTransformerID, FieldType, toDataFrame, transformDataFrame } from '@grafana/data'; +import { DataTransformerConfig, DataTransformerID, FieldType, toDataFrame, transformDataFrame } from '@credativ/plutono-data'; import { renameByRegexTransformer, RenameByRegexTransformerOptions } from './renameByRegex'; import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry'; diff --git a/packages/grafana-data/src/transformations/transformers/renameByRegex.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/renameByRegex.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/renameByRegex.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/renameByRegex.ts diff --git a/packages/grafana-data/src/transformations/transformers/seriesToColumns.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/seriesToColumns.test.ts similarity index 99% rename from packages/grafana-data/src/transformations/transformers/seriesToColumns.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/seriesToColumns.test.ts index d97edad7ef..c659d3d06b 100644 --- a/packages/grafana-data/src/transformations/transformers/seriesToColumns.test.ts +++ b/packages/plutono-data/grafana-data/src/transformations/transformers/seriesToColumns.test.ts @@ -5,7 +5,7 @@ import { FieldType, toDataFrame, transformDataFrame, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { SeriesToColumnsOptions, seriesToColumnsTransformer } from './seriesToColumns'; import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry'; diff --git a/packages/grafana-data/src/transformations/transformers/seriesToColumns.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/seriesToColumns.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/seriesToColumns.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/seriesToColumns.ts diff --git a/packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/seriesToRows.test.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/seriesToRows.test.ts diff --git a/packages/grafana-data/src/transformations/transformers/seriesToRows.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/seriesToRows.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/seriesToRows.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/seriesToRows.ts diff --git a/packages/grafana-data/src/transformations/transformers/sortBy.test.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/sortBy.test.ts similarity index 97% rename from packages/grafana-data/src/transformations/transformers/sortBy.test.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/sortBy.test.ts index 534bd5680e..34501972b3 100644 --- a/packages/grafana-data/src/transformations/transformers/sortBy.test.ts +++ b/packages/plutono-data/grafana-data/src/transformations/transformers/sortBy.test.ts @@ -4,7 +4,7 @@ import { mockTransformationsRegistry } from '../../utils/tests/mockTransformatio import { transformDataFrame } from '../transformDataFrame'; import { Field, FieldType } from '../../types'; import { DataTransformerID } from './ids'; -import { DataTransformerConfig } from '@grafana/data'; +import { DataTransformerConfig } from '@credativ/plutono-data'; const testFrame = toDataFrame({ name: 'A', diff --git a/packages/grafana-data/src/transformations/transformers/sortBy.ts b/packages/plutono-data/grafana-data/src/transformations/transformers/sortBy.ts similarity index 100% rename from packages/grafana-data/src/transformations/transformers/sortBy.ts rename to packages/plutono-data/grafana-data/src/transformations/transformers/sortBy.ts diff --git a/packages/grafana-data/src/types/OptionsUIRegistryBuilder.ts b/packages/plutono-data/grafana-data/src/types/OptionsUIRegistryBuilder.ts similarity index 100% rename from packages/grafana-data/src/types/OptionsUIRegistryBuilder.ts rename to packages/plutono-data/grafana-data/src/types/OptionsUIRegistryBuilder.ts diff --git a/packages/grafana-data/src/types/ScopedVars.ts b/packages/plutono-data/grafana-data/src/types/ScopedVars.ts similarity index 100% rename from packages/grafana-data/src/types/ScopedVars.ts rename to packages/plutono-data/grafana-data/src/types/ScopedVars.ts diff --git a/packages/grafana-data/src/types/annotations.ts b/packages/plutono-data/grafana-data/src/types/annotations.ts similarity index 99% rename from packages/grafana-data/src/types/annotations.ts rename to packages/plutono-data/grafana-data/src/types/annotations.ts index e907725741..3886a09c8f 100644 --- a/packages/grafana-data/src/types/annotations.ts +++ b/packages/plutono-data/grafana-data/src/types/annotations.ts @@ -61,7 +61,7 @@ export interface AnnotationEventFieldMapping { export type AnnotationEventMappings = Partial>; /** - * Since Grafana 7.2 + * Since Plutono 7.2 * * This offers a generic approach to annotation processing */ diff --git a/packages/grafana-data/src/types/app.ts b/packages/plutono-data/grafana-data/src/types/app.ts similarity index 94% rename from packages/grafana-data/src/types/app.ts rename to packages/plutono-data/grafana-data/src/types/app.ts index ed76f8be9e..bc987f78f9 100644 --- a/packages/grafana-data/src/types/app.ts +++ b/packages/plutono-data/grafana-data/src/types/app.ts @@ -1,7 +1,7 @@ import { ComponentClass } from 'react'; import { KeyValue } from './data'; import { NavModel } from './navModel'; -import { PluginMeta, GrafanaPlugin, PluginIncludeType } from './plugin'; +import { PluginMeta, PlutonoPlugin, PluginIncludeType } from './plugin'; export enum CoreApp { Dashboard = 'dashboard', @@ -24,7 +24,7 @@ export interface AppPluginMeta extends PluginMeta { // TODO anything specific to apps? } -export class AppPlugin extends GrafanaPlugin> { +export class AppPlugin extends PlutonoPlugin> { // Content under: /a/${plugin-id}/* root?: ComponentClass>; rootNav?: NavModel; // Initial navigation model diff --git a/packages/grafana-data/src/types/config.ts b/packages/plutono-data/grafana-data/src/types/config.ts similarity index 84% rename from packages/grafana-data/src/types/config.ts rename to packages/plutono-data/grafana-data/src/types/config.ts index 23f2962652..24dfe0c6e9 100644 --- a/packages/grafana-data/src/types/config.ts +++ b/packages/plutono-data/grafana-data/src/types/config.ts @@ -1,10 +1,10 @@ import { DataSourceInstanceSettings } from './datasource'; import { PanelPluginMeta } from './panel'; -import { GrafanaTheme } from './theme'; +import { PlutonoTheme } from './theme'; import { SystemDateFormatSettings } from '../datetime'; /** - * Describes the build information that will be available via the Grafana configuration. + * Describes the build information that will be available via the Plutono configuration. * * @public */ @@ -12,13 +12,13 @@ export interface BuildInfo { version: string; commit: string; /** - * Is set to true when running Grafana Enterprise edition. + * Is set to true when running Plutono Enterprise edition. * * @deprecated use `licenseInfo.hasLicense` instead */ isEnterprise: boolean; env: string; - edition: GrafanaEdition; + edition: PlutonoEdition; latestVersion: string; hasUpdate: boolean; hideVersion: boolean; @@ -27,14 +27,14 @@ export interface BuildInfo { /** * @internal */ -export enum GrafanaEdition { +export enum PlutonoEdition { OpenSource = 'Open Source', Pro = 'Pro', Enterprise = 'Enterprise', } /** - * Describes available feature toggles in Grafana. These can be configured via the + * Describes available feature toggles in Plutono. These can be configured via the * `conf/custom.ini` to enable features under development or not yet available in * stable version. * @@ -47,14 +47,14 @@ export interface FeatureToggles { /** * @remarks - * Available only in Grafana Enterprise + * Available only in Plutono Enterprise */ meta: boolean; reportVariables: boolean; } /** - * Describes the license information about the current running instance of Grafana. + * Describes the license information about the current running instance of Plutono. * * @public */ @@ -64,7 +64,7 @@ export interface LicenseInfo { licenseUrl: string; stateInfo: string; hasValidLicense: boolean; - edition: GrafanaEdition; + edition: PlutonoEdition; } /** @@ -80,11 +80,11 @@ export interface SentryConfig { } /** - * Describes all the different Grafana configuration values available for an instance. + * Describes all the different Plutono configuration values available for an instance. * * @public */ -export interface GrafanaConfig { +export interface PlutonoConfig { datasources: { [str: string]: DataSourceInstanceSettings }; panels: { [key: string]: PanelPluginMeta }; minRefreshInterval: string; @@ -119,7 +119,7 @@ export interface GrafanaConfig { viewersCanEdit: boolean; editorsCanAdmin: boolean; disableSanitizeHtml: boolean; - theme: GrafanaTheme; + theme: PlutonoTheme; pluginsToPreload: string[]; featureToggles: FeatureToggles; licenseInfo: LicenseInfo; diff --git a/packages/grafana-data/src/types/data.ts b/packages/plutono-data/grafana-data/src/types/data.ts similarity index 98% rename from packages/grafana-data/src/types/data.ts rename to packages/plutono-data/grafana-data/src/types/data.ts index bb0c8b91c4..5ecfb6c408 100644 --- a/packages/grafana-data/src/types/data.ts +++ b/packages/plutono-data/grafana-data/src/types/data.ts @@ -95,7 +95,7 @@ export interface QueryResultMetaNotice { /** * An optional link that may be displayed in the UI. - * This value may be an absolute URL or relative to grafana root + * This value may be an absolute URL or relative to plutono root */ link?: string; diff --git a/packages/grafana-data/src/types/dataFrame.ts b/packages/plutono-data/grafana-data/src/types/dataFrame.ts similarity index 100% rename from packages/grafana-data/src/types/dataFrame.ts rename to packages/plutono-data/grafana-data/src/types/dataFrame.ts diff --git a/packages/grafana-data/src/types/dataLink.ts b/packages/plutono-data/grafana-data/src/types/dataLink.ts similarity index 98% rename from packages/grafana-data/src/types/dataLink.ts rename to packages/plutono-data/grafana-data/src/types/dataLink.ts index b83f18277d..3762cb4420 100644 --- a/packages/grafana-data/src/types/dataLink.ts +++ b/packages/plutono-data/grafana-data/src/types/dataLink.ts @@ -64,7 +64,7 @@ export interface LinkModel { /** * Provides a way to produce links on demand * - * TODO: ScopedVars in in GrafanaUI package! + * TODO: ScopedVars in in PlutonoUI package! */ export interface LinkModelSupplier { getLinks(replaceVariables?: InterpolateFunction): Array>; diff --git a/packages/grafana-data/src/types/datasource.ts b/packages/plutono-data/grafana-data/src/types/datasource.ts similarity index 99% rename from packages/grafana-data/src/types/datasource.ts rename to packages/plutono-data/grafana-data/src/types/datasource.ts index 6a7aff0487..d8dfb16351 100644 --- a/packages/grafana-data/src/types/datasource.ts +++ b/packages/plutono-data/grafana-data/src/types/datasource.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; import { ComponentType } from 'react'; -import { GrafanaPlugin, PluginMeta } from './plugin'; +import { PlutonoPlugin, PluginMeta } from './plugin'; import { PanelData } from './panel'; import { LogRowModel } from './logs'; import { AnnotationEvent, AnnotationSupport } from './annotations'; @@ -28,7 +28,7 @@ export class DataSourcePlugin< TQuery extends DataQuery = DataSourceQueryType, TOptions extends DataSourceJsonData = DataSourceOptionsType, TSecureOptions = {} -> extends GrafanaPlugin> { +> extends PlutonoPlugin> { components: DataSourcePluginComponents = {}; constructor(public DataSourceClass: DataSourceConstructor) { @@ -400,7 +400,7 @@ export interface DataQueryResponse { /** * When returning multiple partial responses or streams - * Use this key to inform Grafana how to combine the partial responses + * Use this key to inform Plutono how to combine the partial responses * Multiple responses with same key are replaced (latest used) */ key?: string; diff --git a/packages/grafana-data/src/types/displayValue.ts b/packages/plutono-data/grafana-data/src/types/displayValue.ts similarity index 100% rename from packages/grafana-data/src/types/displayValue.ts rename to packages/plutono-data/grafana-data/src/types/displayValue.ts diff --git a/packages/grafana-data/src/types/explore.ts b/packages/plutono-data/grafana-data/src/types/explore.ts similarity index 100% rename from packages/grafana-data/src/types/explore.ts rename to packages/plutono-data/grafana-data/src/types/explore.ts diff --git a/packages/grafana-data/src/types/fieldColor.ts b/packages/plutono-data/grafana-data/src/types/fieldColor.ts similarity index 100% rename from packages/grafana-data/src/types/fieldColor.ts rename to packages/plutono-data/grafana-data/src/types/fieldColor.ts diff --git a/packages/grafana-data/src/types/fieldOverrides.ts b/packages/plutono-data/grafana-data/src/types/fieldOverrides.ts similarity index 97% rename from packages/grafana-data/src/types/fieldOverrides.ts rename to packages/plutono-data/grafana-data/src/types/fieldOverrides.ts index ae99ac312b..5aaa5fbc61 100644 --- a/packages/grafana-data/src/types/fieldOverrides.ts +++ b/packages/plutono-data/grafana-data/src/types/fieldOverrides.ts @@ -1,5 +1,5 @@ import { ComponentType } from 'react'; -import { MatcherConfig, FieldConfig, Field, DataFrame, GrafanaTheme, TimeZone } from '../types'; +import { MatcherConfig, FieldConfig, Field, DataFrame, PlutonoTheme, TimeZone } from '../types'; import { InterpolateFunction } from './panel'; import { StandardEditorProps, FieldConfigOptionsRegistry, StandardEditorContext } from '../field'; import { OptionsEditorItem } from './OptionsUIRegistryBuilder'; @@ -16,7 +16,7 @@ export interface ConfigOverrideRule { } /** - * Describes config override rules created when interacting with Grafana. + * Describes config override rules created when interacting with Plutono. * * @internal */ @@ -114,7 +114,7 @@ export interface ApplyFieldOverrideOptions { fieldConfig: FieldConfigSource; fieldConfigRegistry?: FieldConfigOptionsRegistry; replaceVariables: InterpolateFunction; - theme: GrafanaTheme; + theme: PlutonoTheme; timeZone?: TimeZone; } diff --git a/packages/grafana-data/src/types/flot.ts b/packages/plutono-data/grafana-data/src/types/flot.ts similarity index 100% rename from packages/grafana-data/src/types/flot.ts rename to packages/plutono-data/grafana-data/src/types/flot.ts diff --git a/packages/grafana-data/src/types/geometry.ts b/packages/plutono-data/grafana-data/src/types/geometry.ts similarity index 100% rename from packages/grafana-data/src/types/geometry.ts rename to packages/plutono-data/grafana-data/src/types/geometry.ts diff --git a/packages/grafana-data/src/types/graph.ts b/packages/plutono-data/grafana-data/src/types/graph.ts similarity index 100% rename from packages/grafana-data/src/types/graph.ts rename to packages/plutono-data/grafana-data/src/types/graph.ts diff --git a/packages/grafana-data/src/types/index.ts b/packages/plutono-data/grafana-data/src/types/index.ts similarity index 93% rename from packages/grafana-data/src/types/index.ts rename to packages/plutono-data/grafana-data/src/types/index.ts index 3e88ca59bf..abb8a3c298 100644 --- a/packages/grafana-data/src/types/index.ts +++ b/packages/plutono-data/grafana-data/src/types/index.ts @@ -31,4 +31,4 @@ export * from './live'; export * from './variables'; export * from './geometry'; -export { GrafanaConfig, BuildInfo, FeatureToggles, LicenseInfo } from './config'; +export { PlutonoConfig, BuildInfo, FeatureToggles, LicenseInfo } from './config'; diff --git a/packages/grafana-data/src/types/legacyEvents.ts b/packages/plutono-data/grafana-data/src/types/legacyEvents.ts similarity index 100% rename from packages/grafana-data/src/types/legacyEvents.ts rename to packages/plutono-data/grafana-data/src/types/legacyEvents.ts diff --git a/packages/grafana-data/src/types/live.ts b/packages/plutono-data/grafana-data/src/types/live.ts similarity index 99% rename from packages/grafana-data/src/types/live.ts rename to packages/plutono-data/grafana-data/src/types/live.ts index 999be33591..748f29c296 100644 --- a/packages/grafana-data/src/types/live.ts +++ b/packages/plutono-data/grafana-data/src/types/live.ts @@ -10,7 +10,7 @@ import { Observable } from 'rxjs'; export enum LiveChannelScope { DataSource = 'ds', // namespace = data source ID Plugin = 'plugin', // namespace = plugin name (singleton works for apps too) - Grafana = 'grafana', // namespace = feature + Plutono = 'plutono', // namespace = feature } /** diff --git a/packages/grafana-data/src/types/logs.ts b/packages/plutono-data/grafana-data/src/types/logs.ts similarity index 100% rename from packages/grafana-data/src/types/logs.ts rename to packages/plutono-data/grafana-data/src/types/logs.ts diff --git a/packages/grafana-data/src/types/navModel.ts b/packages/plutono-data/grafana-data/src/types/navModel.ts similarity index 100% rename from packages/grafana-data/src/types/navModel.ts rename to packages/plutono-data/grafana-data/src/types/navModel.ts diff --git a/packages/grafana-data/src/types/options.ts b/packages/plutono-data/grafana-data/src/types/options.ts similarity index 100% rename from packages/grafana-data/src/types/options.ts rename to packages/plutono-data/grafana-data/src/types/options.ts diff --git a/packages/grafana-data/src/types/orgs.ts b/packages/plutono-data/grafana-data/src/types/orgs.ts similarity index 100% rename from packages/grafana-data/src/types/orgs.ts rename to packages/plutono-data/grafana-data/src/types/orgs.ts diff --git a/packages/grafana-data/src/types/panel.ts b/packages/plutono-data/grafana-data/src/types/panel.ts similarity index 100% rename from packages/grafana-data/src/types/panel.ts rename to packages/plutono-data/grafana-data/src/types/panel.ts diff --git a/packages/grafana-data/src/types/plugin.ts b/packages/plutono-data/grafana-data/src/types/plugin.ts similarity index 94% rename from packages/grafana-data/src/types/plugin.ts rename to packages/plutono-data/grafana-data/src/types/plugin.ts index d7cbad6819..aa3d215473 100644 --- a/packages/grafana-data/src/types/plugin.ts +++ b/packages/plutono-data/grafana-data/src/types/plugin.ts @@ -27,14 +27,14 @@ export enum PluginSignatureStatus { missing = 'missing', // missing signature file } -/** Describes error code returned from Grafana plugins API call */ +/** Describes error code returned from Plutono plugins API call */ export enum PluginErrorCode { missingSignature = 'signatureMissing', invalidSignature = 'signatureInvalid', modifiedSignature = 'signatureModified', } -/** Describes error returned from Grafana plugins API call */ +/** Describes error returned from Plutono plugins API call */ export interface PluginError { errorCode: PluginErrorCode; pluginId: string; @@ -76,7 +76,7 @@ interface PluginDependencyInfo { } export interface PluginDependencies { - grafanaVersion: string; + plutonoVersion: string; plugins: PluginDependencyInfo[]; } @@ -139,7 +139,7 @@ export interface PluginMetaInfo { } export interface PluginConfigPageProps { - plugin: GrafanaPlugin; + plugin: PlutonoPlugin; query: KeyValue; // The URL query parameters } @@ -151,7 +151,7 @@ export interface PluginConfigPage { body: ComponentClass>; } -export class GrafanaPlugin { +export class PlutonoPlugin { // Meta is filled in by the plugin loading system meta: T; diff --git a/packages/grafana-data/src/types/select.ts b/packages/plutono-data/grafana-data/src/types/select.ts similarity index 100% rename from packages/grafana-data/src/types/select.ts rename to packages/plutono-data/grafana-data/src/types/select.ts diff --git a/packages/grafana-data/src/types/templateVars.ts b/packages/plutono-data/grafana-data/src/types/templateVars.ts similarity index 100% rename from packages/grafana-data/src/types/templateVars.ts rename to packages/plutono-data/grafana-data/src/types/templateVars.ts diff --git a/packages/grafana-data/src/types/theme.ts b/packages/plutono-data/grafana-data/src/types/theme.ts similarity index 97% rename from packages/grafana-data/src/types/theme.ts rename to packages/plutono-data/grafana-data/src/types/theme.ts index 51349529fe..3a68691286 100644 --- a/packages/grafana-data/src/types/theme.ts +++ b/packages/plutono-data/grafana-data/src/types/theme.ts @@ -1,9 +1,9 @@ -export enum GrafanaThemeType { +export enum PlutonoThemeType { Light = 'light', Dark = 'dark', } -export interface GrafanaThemeCommons { +export interface PlutonoThemeCommons { name: string; // TODO: not sure if should be a part of theme breakpoints: { @@ -110,8 +110,8 @@ export interface GrafanaThemeCommons { }; } -export interface GrafanaTheme extends GrafanaThemeCommons { - type: GrafanaThemeType; +export interface PlutonoTheme extends PlutonoThemeCommons { + type: PlutonoThemeType; isDark: boolean; isLight: boolean; palette: { diff --git a/packages/grafana-data/src/types/thresholds.ts b/packages/plutono-data/grafana-data/src/types/thresholds.ts similarity index 100% rename from packages/grafana-data/src/types/thresholds.ts rename to packages/plutono-data/grafana-data/src/types/thresholds.ts diff --git a/packages/grafana-data/src/types/time.ts b/packages/plutono-data/grafana-data/src/types/time.ts similarity index 100% rename from packages/grafana-data/src/types/time.ts rename to packages/plutono-data/grafana-data/src/types/time.ts diff --git a/packages/grafana-data/src/types/trace.ts b/packages/plutono-data/grafana-data/src/types/trace.ts similarity index 100% rename from packages/grafana-data/src/types/trace.ts rename to packages/plutono-data/grafana-data/src/types/trace.ts diff --git a/packages/grafana-data/src/types/transformations.ts b/packages/plutono-data/grafana-data/src/types/transformations.ts similarity index 98% rename from packages/grafana-data/src/types/transformations.ts rename to packages/plutono-data/grafana-data/src/types/transformations.ts index eac4f44850..b406a69762 100644 --- a/packages/grafana-data/src/types/transformations.ts +++ b/packages/plutono-data/grafana-data/src/types/transformations.ts @@ -44,7 +44,7 @@ export interface FrameMatcherInfo extends RegistryItemWithOption /** * Registry item to represent all the different valu matchers supported - * in the Grafana platform. + * in the Plutono platform. * @public */ export interface ValueMatcherInfo extends RegistryItemWithOptions { diff --git a/packages/grafana-data/src/types/valueMapping.ts b/packages/plutono-data/grafana-data/src/types/valueMapping.ts similarity index 100% rename from packages/grafana-data/src/types/valueMapping.ts rename to packages/plutono-data/grafana-data/src/types/valueMapping.ts diff --git a/packages/grafana-data/src/types/variables.ts b/packages/plutono-data/grafana-data/src/types/variables.ts similarity index 100% rename from packages/grafana-data/src/types/variables.ts rename to packages/plutono-data/grafana-data/src/types/variables.ts diff --git a/packages/grafana-data/src/types/vector.ts b/packages/plutono-data/grafana-data/src/types/vector.ts similarity index 100% rename from packages/grafana-data/src/types/vector.ts rename to packages/plutono-data/grafana-data/src/types/vector.ts diff --git a/packages/grafana-data/src/utils/OptionsUIBuilders.ts b/packages/plutono-data/grafana-data/src/utils/OptionsUIBuilders.ts similarity index 100% rename from packages/grafana-data/src/utils/OptionsUIBuilders.ts rename to packages/plutono-data/grafana-data/src/utils/OptionsUIBuilders.ts diff --git a/packages/grafana-data/src/utils/Registry.test.ts b/packages/plutono-data/grafana-data/src/utils/Registry.test.ts similarity index 100% rename from packages/grafana-data/src/utils/Registry.test.ts rename to packages/plutono-data/grafana-data/src/utils/Registry.test.ts diff --git a/packages/grafana-data/src/utils/Registry.ts b/packages/plutono-data/grafana-data/src/utils/Registry.ts similarity index 100% rename from packages/grafana-data/src/utils/Registry.ts rename to packages/plutono-data/grafana-data/src/utils/Registry.ts diff --git a/packages/grafana-data/src/utils/__snapshots__/csv.test.ts.snap b/packages/plutono-data/grafana-data/src/utils/__snapshots__/csv.test.ts.snap similarity index 100% rename from packages/grafana-data/src/utils/__snapshots__/csv.test.ts.snap rename to packages/plutono-data/grafana-data/src/utils/__snapshots__/csv.test.ts.snap diff --git a/packages/grafana-data/src/utils/binaryOperators.ts b/packages/plutono-data/grafana-data/src/utils/binaryOperators.ts similarity index 100% rename from packages/grafana-data/src/utils/binaryOperators.ts rename to packages/plutono-data/grafana-data/src/utils/binaryOperators.ts diff --git a/packages/grafana-data/src/utils/csv.test.ts b/packages/plutono-data/grafana-data/src/utils/csv.test.ts similarity index 100% rename from packages/grafana-data/src/utils/csv.test.ts rename to packages/plutono-data/grafana-data/src/utils/csv.test.ts diff --git a/packages/grafana-data/src/utils/csv.ts b/packages/plutono-data/grafana-data/src/utils/csv.ts similarity index 100% rename from packages/grafana-data/src/utils/csv.ts rename to packages/plutono-data/grafana-data/src/utils/csv.ts diff --git a/packages/grafana-data/src/utils/dataLinks.test.ts b/packages/plutono-data/grafana-data/src/utils/dataLinks.test.ts similarity index 100% rename from packages/grafana-data/src/utils/dataLinks.test.ts rename to packages/plutono-data/grafana-data/src/utils/dataLinks.test.ts diff --git a/packages/grafana-data/src/utils/dataLinks.ts b/packages/plutono-data/grafana-data/src/utils/dataLinks.ts similarity index 98% rename from packages/grafana-data/src/utils/dataLinks.ts rename to packages/plutono-data/grafana-data/src/utils/dataLinks.ts index bad07dafd2..583e5d8854 100644 --- a/packages/grafana-data/src/utils/dataLinks.ts +++ b/packages/plutono-data/grafana-data/src/utils/dataLinks.ts @@ -26,7 +26,7 @@ export const DataLinkBuiltInVars = { valueCalc: '__value.calc', }; -// We inject these because we cannot import them directly as they reside inside grafana main package. +// We inject these because we cannot import them directly as they reside inside plutono main package. export type LinkToExploreOptions = { link: DataLink; scopedVars: ScopedVars; diff --git a/packages/grafana-data/src/utils/datasource.ts b/packages/plutono-data/grafana-data/src/utils/datasource.ts similarity index 100% rename from packages/grafana-data/src/utils/datasource.ts rename to packages/plutono-data/grafana-data/src/utils/datasource.ts diff --git a/packages/grafana-data/src/utils/deprecationWarning.test.ts b/packages/plutono-data/grafana-data/src/utils/deprecationWarning.test.ts similarity index 100% rename from packages/grafana-data/src/utils/deprecationWarning.test.ts rename to packages/plutono-data/grafana-data/src/utils/deprecationWarning.test.ts diff --git a/packages/grafana-data/src/utils/deprecationWarning.ts b/packages/plutono-data/grafana-data/src/utils/deprecationWarning.ts similarity index 100% rename from packages/grafana-data/src/utils/deprecationWarning.ts rename to packages/plutono-data/grafana-data/src/utils/deprecationWarning.ts diff --git a/packages/grafana-data/src/utils/docs.ts b/packages/plutono-data/grafana-data/src/utils/docs.ts similarity index 100% rename from packages/grafana-data/src/utils/docs.ts rename to packages/plutono-data/grafana-data/src/utils/docs.ts diff --git a/packages/grafana-data/src/utils/fieldParser.ts b/packages/plutono-data/grafana-data/src/utils/fieldParser.ts similarity index 100% rename from packages/grafana-data/src/utils/fieldParser.ts rename to packages/plutono-data/grafana-data/src/utils/fieldParser.ts diff --git a/packages/grafana-data/src/utils/flotPairs.test.ts b/packages/plutono-data/grafana-data/src/utils/flotPairs.test.ts similarity index 100% rename from packages/grafana-data/src/utils/flotPairs.test.ts rename to packages/plutono-data/grafana-data/src/utils/flotPairs.test.ts diff --git a/packages/grafana-data/src/utils/flotPairs.ts b/packages/plutono-data/grafana-data/src/utils/flotPairs.ts similarity index 98% rename from packages/grafana-data/src/utils/flotPairs.ts rename to packages/plutono-data/grafana-data/src/utils/flotPairs.ts index 7f99dd11fd..f421adbe12 100644 --- a/packages/grafana-data/src/utils/flotPairs.ts +++ b/packages/plutono-data/grafana-data/src/utils/flotPairs.ts @@ -4,7 +4,7 @@ import { GraphSeriesValue } from '../types/graph'; import { TimeRange } from '../types/time'; // Types -// import { NullValueMode, GraphSeriesValue, Field, TimeRange } from '@grafana/data'; +// import { NullValueMode, GraphSeriesValue, Field, TimeRange } from '@credativ/plutono-data'; export interface FlotPairsOptions { xField: Field; yField: Field; diff --git a/packages/grafana-data/src/utils/index.ts b/packages/plutono-data/grafana-data/src/utils/index.ts similarity index 100% rename from packages/grafana-data/src/utils/index.ts rename to packages/plutono-data/grafana-data/src/utils/index.ts diff --git a/packages/grafana-data/src/utils/labels.test.ts b/packages/plutono-data/grafana-data/src/utils/labels.test.ts similarity index 100% rename from packages/grafana-data/src/utils/labels.test.ts rename to packages/plutono-data/grafana-data/src/utils/labels.test.ts diff --git a/packages/grafana-data/src/utils/labels.ts b/packages/plutono-data/grafana-data/src/utils/labels.ts similarity index 100% rename from packages/grafana-data/src/utils/labels.ts rename to packages/plutono-data/grafana-data/src/utils/labels.ts diff --git a/packages/grafana-data/src/utils/location.test.ts b/packages/plutono-data/grafana-data/src/utils/location.test.ts similarity index 88% rename from packages/grafana-data/src/utils/location.test.ts rename to packages/plutono-data/grafana-data/src/utils/location.test.ts index dfedfa712a..6dd014c11a 100644 --- a/packages/grafana-data/src/utils/location.test.ts +++ b/packages/plutono-data/grafana-data/src/utils/location.test.ts @@ -14,8 +14,8 @@ describe('locationUtil', () => { }); describe('With /subUrl as appSubUrl', () => { it('/subUrl should be stripped', () => { - const urlWithoutMaster = locationUtil.stripBaseFromUrl('/subUrl/grafana/'); - expect(urlWithoutMaster).toBe('/grafana/'); + const urlWithoutMaster = locationUtil.stripBaseFromUrl('/subUrl/plutono/'); + expect(urlWithoutMaster).toBe('/plutono/'); }); }); }); diff --git a/packages/grafana-data/src/utils/location.ts b/packages/plutono-data/grafana-data/src/utils/location.ts similarity index 82% rename from packages/grafana-data/src/utils/location.ts rename to packages/plutono-data/grafana-data/src/utils/location.ts index af1ae515f5..b7a3563bb5 100644 --- a/packages/grafana-data/src/utils/location.ts +++ b/packages/plutono-data/grafana-data/src/utils/location.ts @@ -1,8 +1,8 @@ -import { GrafanaConfig, RawTimeRange, ScopedVars } from '../types'; +import { PlutonoConfig, RawTimeRange, ScopedVars } from '../types'; import { urlUtil } from './url'; import { textUtil } from '../text'; -let grafanaConfig: () => GrafanaConfig; +let plutonoConfig: () => PlutonoConfig; let getTimeRangeUrlParams: () => RawTimeRange; let getVariablesUrlParams: (params?: Record, scopedVars?: ScopedVars) => string; @@ -12,7 +12,7 @@ let getVariablesUrlParams: (params?: Record, scopedVars?: ScopedVar * @internal */ const stripBaseFromUrl = (url: string): string => { - const appSubUrl = grafanaConfig ? grafanaConfig().appSubUrl : ''; + const appSubUrl = plutonoConfig ? plutonoConfig().appSubUrl : ''; const stripExtraChars = appSubUrl.endsWith('/') ? 1 : 0; const urlWithoutBase = url.length > 0 && url.indexOf(appSubUrl) === 0 ? url.slice(appSubUrl.length - stripExtraChars) : url; @@ -27,13 +27,13 @@ const stripBaseFromUrl = (url: string): string => { */ const assureBaseUrl = (url: string): string => { if (url.startsWith('/')) { - return `${grafanaConfig ? grafanaConfig().appSubUrl : ''}${stripBaseFromUrl(url)}`; + return `${plutonoConfig ? plutonoConfig().appSubUrl : ''}${stripBaseFromUrl(url)}`; } return url; }; interface LocationUtilDependencies { - getConfig: () => GrafanaConfig; + getConfig: () => PlutonoConfig; getTimeRangeForUrl: () => RawTimeRange; buildParamsFromVariables: (params: any, scopedVars?: ScopedVars) => string; } @@ -47,7 +47,7 @@ export const locationUtil = { * @internal */ initialize: ({ getConfig, buildParamsFromVariables, getTimeRangeForUrl }: LocationUtilDependencies) => { - grafanaConfig = getConfig; + plutonoConfig = getConfig; getTimeRangeUrlParams = getTimeRangeForUrl; getVariablesUrlParams = buildParamsFromVariables; }, @@ -68,6 +68,6 @@ export const locationUtil = { return urlUtil.toUrlParams(params); }, processUrl: (url: string) => { - return grafanaConfig().disableSanitizeHtml ? url : textUtil.sanitizeUrl(url); + return plutonoConfig().disableSanitizeHtml ? url : textUtil.sanitizeUrl(url); }, }; diff --git a/packages/grafana-data/src/utils/logs.test.ts b/packages/plutono-data/grafana-data/src/utils/logs.test.ts similarity index 100% rename from packages/grafana-data/src/utils/logs.test.ts rename to packages/plutono-data/grafana-data/src/utils/logs.test.ts diff --git a/packages/grafana-data/src/utils/logs.ts b/packages/plutono-data/grafana-data/src/utils/logs.ts similarity index 100% rename from packages/grafana-data/src/utils/logs.ts rename to packages/plutono-data/grafana-data/src/utils/logs.ts diff --git a/packages/grafana-data/src/utils/namedColorsPalette.test.ts b/packages/plutono-data/grafana-data/src/utils/namedColorsPalette.test.ts similarity index 92% rename from packages/grafana-data/src/utils/namedColorsPalette.test.ts rename to packages/plutono-data/grafana-data/src/utils/namedColorsPalette.test.ts index 3cfc68c9e4..b18e34aecf 100644 --- a/packages/grafana-data/src/utils/namedColorsPalette.test.ts +++ b/packages/plutono-data/grafana-data/src/utils/namedColorsPalette.test.ts @@ -1,5 +1,5 @@ import { getColorFromHexRgbOrName, getColorDefinitionByName } from './namedColorsPalette'; -import { GrafanaThemeType } from '../types/theme'; +import { PlutonoThemeType } from '../types/theme'; describe('colors', () => { const SemiDarkBlue = getColorDefinitionByName('semi-dark-blue'); @@ -14,7 +14,7 @@ describe('colors', () => { }); it("returns correct variant's hex for known color if theme specified", () => { - expect(getColorFromHexRgbOrName(SemiDarkBlue.name, GrafanaThemeType.Light)).toBe(SemiDarkBlue.variants.light); + expect(getColorFromHexRgbOrName(SemiDarkBlue.name, PlutonoThemeType.Light)).toBe(SemiDarkBlue.variants.light); }); it('returns color if specified as hex or rgb/a', () => { diff --git a/packages/grafana-data/src/utils/namedColorsPalette.ts b/packages/plutono-data/grafana-data/src/utils/namedColorsPalette.ts similarity index 93% rename from packages/grafana-data/src/utils/namedColorsPalette.ts rename to packages/plutono-data/grafana-data/src/utils/namedColorsPalette.ts index c64a169d83..0227a062ac 100644 --- a/packages/grafana-data/src/utils/namedColorsPalette.ts +++ b/packages/plutono-data/grafana-data/src/utils/namedColorsPalette.ts @@ -1,6 +1,6 @@ import flatten from 'lodash/flatten'; import tinycolor from 'tinycolor2'; -import { GrafanaTheme, GrafanaThemeType } from '../types/theme'; +import { PlutonoTheme, PlutonoThemeType } from '../types/theme'; type Hue = 'green' | 'yellow' | 'red' | 'blue' | 'orange' | 'purple'; @@ -51,7 +51,7 @@ export type ColorDefinition = { let colorsPaletteInstance: Map; let colorsMap: Record | undefined; -let colorsMapTheme: GrafanaTheme | undefined; +let colorsMapTheme: PlutonoTheme | undefined; const buildColorDefinition = ( hue: Hue, @@ -72,8 +72,8 @@ export function getColorDefinitionByName(name: Color): ColorDefinition { return flatten(Array.from(getNamedColorPalette().values())).filter((definition) => definition.name === name)[0]; } -export function buildColorsMapForTheme(theme: GrafanaTheme): Record { - theme = theme ?? GrafanaThemeType.Dark; +export function buildColorsMapForTheme(theme: PlutonoTheme): Record { + theme = theme ?? PlutonoThemeType.Dark; colorsMap = {} as Record; @@ -88,7 +88,7 @@ export function buildColorsMapForTheme(theme: GrafanaTheme): Record **@credativ/plutono-e2e-selectors is currently in ALPHA**. Core API is unstable and can be a subject of breaking changes! diff --git a/packages/grafana-e2e-selectors/api-extractor.json b/packages/plutono-e2e-selectors/grafana-e2e-selectors/api-extractor.json similarity index 100% rename from packages/grafana-e2e-selectors/api-extractor.json rename to packages/plutono-e2e-selectors/grafana-e2e-selectors/api-extractor.json diff --git a/packages/grafana-e2e-selectors/index.js b/packages/plutono-e2e-selectors/grafana-e2e-selectors/index.js similarity index 100% rename from packages/grafana-e2e-selectors/index.js rename to packages/plutono-e2e-selectors/grafana-e2e-selectors/index.js diff --git a/packages/grafana-e2e-selectors/package.json b/packages/plutono-e2e-selectors/grafana-e2e-selectors/package.json similarity index 79% rename from packages/grafana-e2e-selectors/package.json rename to packages/plutono-e2e-selectors/grafana-e2e-selectors/package.json index 84b1e4a1a9..e3612145dd 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/plutono-e2e-selectors/grafana-e2e-selectors/package.json @@ -1,23 +1,23 @@ { "author": "Grafana Labs", "license": "Apache-2.0", - "name": "@grafana/e2e-selectors", + "name": "@credativ/plutono-e2e-selectors", "version": "7.5.17", - "description": "Grafana End-to-End Test Selectors Library", + "description": "Plutono End-to-End Test Selectors Library", "keywords": [ "cli", - "grafana", + "plutono", "e2e", "typescript" ], "repository": { "type": "git", - "url": "http://github.com/grafana/grafana.git", - "directory": "packages/grafana-e2e-selectors" + "url": "http://github.com/credativ/plutono.git", + "directory": "packages/plutono-e2e-selectors" }, "main": "src/index.ts", "scripts": { - "build": "grafana-toolkit package:build --scope=e2e-selectors", + "build": "plutono-toolkit package:build --scope=e2e-selectors", "bundle": "rollup -c rollup.config.ts", "clean": "rimraf ./dist ./compiled", "docsExtract": "mkdir -p ../../reports/docs && api-extractor run 2>&1 | tee ../../reports/docs/$(basename $(pwd)).log", diff --git a/packages/grafana-e2e-selectors/rollup.config.ts b/packages/plutono-e2e-selectors/grafana-e2e-selectors/rollup.config.ts similarity index 100% rename from packages/grafana-e2e-selectors/rollup.config.ts rename to packages/plutono-e2e-selectors/grafana-e2e-selectors/rollup.config.ts diff --git a/packages/grafana-e2e-selectors/src/index.ts b/packages/plutono-e2e-selectors/grafana-e2e-selectors/src/index.ts similarity index 52% rename from packages/grafana-e2e-selectors/src/index.ts rename to packages/plutono-e2e-selectors/grafana-e2e-selectors/src/index.ts index 8c17fa0afd..43e955943f 100644 --- a/packages/grafana-e2e-selectors/src/index.ts +++ b/packages/plutono-e2e-selectors/grafana-e2e-selectors/src/index.ts @@ -1,5 +1,5 @@ /** - * A library containing the different design components of the Grafana ecosystem. + * A library containing the different design components of the Plutono ecosystem. * * @packageDocumentation */ diff --git a/packages/grafana-e2e-selectors/src/selectors/components.ts b/packages/plutono-e2e-selectors/grafana-e2e-selectors/src/selectors/components.ts similarity index 100% rename from packages/grafana-e2e-selectors/src/selectors/components.ts rename to packages/plutono-e2e-selectors/grafana-e2e-selectors/src/selectors/components.ts diff --git a/packages/grafana-e2e-selectors/src/selectors/index.ts b/packages/plutono-e2e-selectors/grafana-e2e-selectors/src/selectors/index.ts similarity index 100% rename from packages/grafana-e2e-selectors/src/selectors/index.ts rename to packages/plutono-e2e-selectors/grafana-e2e-selectors/src/selectors/index.ts diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/plutono-e2e-selectors/grafana-e2e-selectors/src/selectors/pages.ts similarity index 100% rename from packages/grafana-e2e-selectors/src/selectors/pages.ts rename to packages/plutono-e2e-selectors/grafana-e2e-selectors/src/selectors/pages.ts diff --git a/packages/grafana-e2e-selectors/src/types/index.ts b/packages/plutono-e2e-selectors/grafana-e2e-selectors/src/types/index.ts similarity index 100% rename from packages/grafana-e2e-selectors/src/types/index.ts rename to packages/plutono-e2e-selectors/grafana-e2e-selectors/src/types/index.ts diff --git a/packages/grafana-e2e-selectors/src/types/selectors.ts b/packages/plutono-e2e-selectors/grafana-e2e-selectors/src/types/selectors.ts similarity index 100% rename from packages/grafana-e2e-selectors/src/types/selectors.ts rename to packages/plutono-e2e-selectors/grafana-e2e-selectors/src/types/selectors.ts diff --git a/packages/grafana-e2e-selectors/tsconfig.build.json b/packages/plutono-e2e-selectors/grafana-e2e-selectors/tsconfig.build.json similarity index 100% rename from packages/grafana-e2e-selectors/tsconfig.build.json rename to packages/plutono-e2e-selectors/grafana-e2e-selectors/tsconfig.build.json diff --git a/packages/grafana-e2e-selectors/tsconfig.json b/packages/plutono-e2e-selectors/grafana-e2e-selectors/tsconfig.json similarity index 100% rename from packages/grafana-e2e-selectors/tsconfig.json rename to packages/plutono-e2e-selectors/grafana-e2e-selectors/tsconfig.json diff --git a/packages/grafana-e2e/.gitignore b/packages/plutono-e2e/grafana-e2e/.gitignore similarity index 100% rename from packages/grafana-e2e/.gitignore rename to packages/plutono-e2e/grafana-e2e/.gitignore diff --git a/packages/grafana-e2e/CHANGELOG.md b/packages/plutono-e2e/grafana-e2e/CHANGELOG.md similarity index 100% rename from packages/grafana-e2e/CHANGELOG.md rename to packages/plutono-e2e/grafana-e2e/CHANGELOG.md diff --git a/packages/plutono-e2e/grafana-e2e/README.md b/packages/plutono-e2e/grafana-e2e/README.md new file mode 100644 index 0000000000..41162fbbee --- /dev/null +++ b/packages/plutono-e2e/grafana-e2e/README.md @@ -0,0 +1,5 @@ +# Plutono End-to-End Test library + +> **@credativ/plutono-e2e is currently in BETA**. + +This package contains an API wrapper built on top of [Cypress](https://www.cypress.io) that simplifies creating end-to-end tests for Plutono. More information can be found [here](https://github.com/credativ/plutono/blob/master/contribute/style-guides/e2e.md). diff --git a/packages/grafana-e2e/api-extractor.json b/packages/plutono-e2e/grafana-e2e/api-extractor.json similarity index 100% rename from packages/grafana-e2e/api-extractor.json rename to packages/plutono-e2e/grafana-e2e/api-extractor.json diff --git a/packages/grafana-e2e/bin/grafana-e2e.js b/packages/plutono-e2e/grafana-e2e/bin/plutono-e2e.js similarity index 100% rename from packages/grafana-e2e/bin/grafana-e2e.js rename to packages/plutono-e2e/grafana-e2e/bin/plutono-e2e.js diff --git a/packages/grafana-e2e/cli.js b/packages/plutono-e2e/grafana-e2e/cli.js similarity index 100% rename from packages/grafana-e2e/cli.js rename to packages/plutono-e2e/grafana-e2e/cli.js diff --git a/packages/grafana-e2e/cypress.json b/packages/plutono-e2e/grafana-e2e/cypress.json similarity index 100% rename from packages/grafana-e2e/cypress.json rename to packages/plutono-e2e/grafana-e2e/cypress.json diff --git a/packages/grafana-e2e/cypress/fixtures/example.json b/packages/plutono-e2e/grafana-e2e/cypress/fixtures/example.json similarity index 100% rename from packages/grafana-e2e/cypress/fixtures/example.json rename to packages/plutono-e2e/grafana-e2e/cypress/fixtures/example.json diff --git a/packages/grafana-e2e/cypress/fixtures/long-trace-response.json b/packages/plutono-e2e/grafana-e2e/cypress/fixtures/long-trace-response.json similarity index 100% rename from packages/grafana-e2e/cypress/fixtures/long-trace-response.json rename to packages/plutono-e2e/grafana-e2e/cypress/fixtures/long-trace-response.json diff --git a/packages/grafana-e2e/cypress/plugins/compareScreenshots.js b/packages/plutono-e2e/grafana-e2e/cypress/plugins/compareScreenshots.js similarity index 100% rename from packages/grafana-e2e/cypress/plugins/compareScreenshots.js rename to packages/plutono-e2e/grafana-e2e/cypress/plugins/compareScreenshots.js diff --git a/packages/grafana-e2e/cypress/plugins/extendConfig.js b/packages/plutono-e2e/grafana-e2e/cypress/plugins/extendConfig.js similarity index 97% rename from packages/grafana-e2e/cypress/plugins/extendConfig.js rename to packages/plutono-e2e/grafana-e2e/cypress/plugins/extendConfig.js index 85b9088cd9..d010e3dbc9 100644 --- a/packages/grafana-e2e/cypress/plugins/extendConfig.js +++ b/packages/plutono-e2e/grafana-e2e/cypress/plugins/extendConfig.js @@ -73,7 +73,7 @@ module.exports = async (baseConfig) => { }, }; } else { - // Temporary legacy support for Grafana core (using `yarn start`) + // Temporary legacy support for Plutono core (using `yarn start`) return baseConfig; } }; diff --git a/packages/grafana-e2e/cypress/plugins/index.js b/packages/plutono-e2e/grafana-e2e/cypress/plugins/index.js similarity index 100% rename from packages/grafana-e2e/cypress/plugins/index.js rename to packages/plutono-e2e/grafana-e2e/cypress/plugins/index.js diff --git a/packages/grafana-e2e/cypress/plugins/readProvisions.js b/packages/plutono-e2e/grafana-e2e/cypress/plugins/readProvisions.js similarity index 100% rename from packages/grafana-e2e/cypress/plugins/readProvisions.js rename to packages/plutono-e2e/grafana-e2e/cypress/plugins/readProvisions.js diff --git a/packages/grafana-e2e/cypress/plugins/typescriptPreprocessor.js b/packages/plutono-e2e/grafana-e2e/cypress/plugins/typescriptPreprocessor.js similarity index 100% rename from packages/grafana-e2e/cypress/plugins/typescriptPreprocessor.js rename to packages/plutono-e2e/grafana-e2e/cypress/plugins/typescriptPreprocessor.js diff --git a/packages/grafana-e2e/cypress/support/commands.ts b/packages/plutono-e2e/grafana-e2e/cypress/support/commands.ts similarity index 100% rename from packages/grafana-e2e/cypress/support/commands.ts rename to packages/plutono-e2e/grafana-e2e/cypress/support/commands.ts diff --git a/packages/grafana-e2e/cypress/support/index.d.ts b/packages/plutono-e2e/grafana-e2e/cypress/support/index.d.ts similarity index 100% rename from packages/grafana-e2e/cypress/support/index.d.ts rename to packages/plutono-e2e/grafana-e2e/cypress/support/index.d.ts diff --git a/packages/grafana-e2e/cypress/support/index.ts b/packages/plutono-e2e/grafana-e2e/cypress/support/index.ts similarity index 92% rename from packages/grafana-e2e/cypress/support/index.ts rename to packages/plutono-e2e/grafana-e2e/cypress/support/index.ts index 0e38642a09..d92d7089dc 100644 --- a/packages/grafana-e2e/cypress/support/index.ts +++ b/packages/plutono-e2e/grafana-e2e/cypress/support/index.ts @@ -1,5 +1,5 @@ // yarn build fails with: -// >> /Users/hugo/go/src/github.com/grafana/grafana/node_modules/stringmap/stringmap.js:99 +// >> /Users/hugo/go/src/github.com/credativ/plutono/node_modules/stringmap/stringmap.js:99 // >> throw new Error("StringMap expected string key"); // require('cypress-failed-log'); import './commands'; diff --git a/packages/grafana-e2e/cypress/tsconfig.json b/packages/plutono-e2e/grafana-e2e/cypress/tsconfig.json similarity index 100% rename from packages/grafana-e2e/cypress/tsconfig.json rename to packages/plutono-e2e/grafana-e2e/cypress/tsconfig.json diff --git a/packages/grafana-e2e/index.js b/packages/plutono-e2e/grafana-e2e/index.js similarity index 100% rename from packages/grafana-e2e/index.js rename to packages/plutono-e2e/grafana-e2e/index.js diff --git a/packages/grafana-e2e/package.json b/packages/plutono-e2e/grafana-e2e/package.json similarity index 77% rename from packages/grafana-e2e/package.json rename to packages/plutono-e2e/grafana-e2e/package.json index 9638dc30c3..2849d20d32 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/plutono-e2e/grafana-e2e/package.json @@ -1,32 +1,32 @@ { "author": "Grafana Labs", "license": "Apache-2.0", - "name": "@grafana/e2e", + "name": "@credativ/plutono-e2e", "version": "7.5.17", - "description": "Grafana End-to-End Test Library", + "description": "Plutono End-to-End Test Library", "keywords": [ "cli", - "grafana", + "plutono", "e2e", "typescript" ], "repository": { "type": "git", - "url": "http://github.com/grafana/grafana.git", - "directory": "packages/grafana-e2e" + "url": "http://github.com/credativ/plutono.git", + "directory": "packages/plutono-e2e" }, "main": "src/index.ts", "bin": { - "grafana-e2e": "bin/grafana-e2e.js" + "plutono-e2e": "bin/plutono-e2e.js" }, "scripts": { - "build": "grafana-toolkit package:build --scope=e2e", + "build": "plutono-toolkit package:build --scope=e2e", "bundle": "rollup -c rollup.config.ts", "clean": "rimraf ./dist ./compiled", "docsExtract": "mkdir -p ../../reports/docs && api-extractor run 2>&1 | tee ../../reports/docs/$(basename $(pwd)).log", "open": "cypress open", "start": "cypress run --headless --browser chrome", - "test": "pushd test && node ../dist/bin/grafana-e2e.js run", + "test": "pushd test && node ../dist/bin/plutono-e2e.js run", "typecheck": "tsc --noEmit" }, "devDependencies": { @@ -44,7 +44,7 @@ "types": "src/index.ts", "dependencies": { "@cypress/webpack-preprocessor": "4.1.3", - "@grafana/e2e-selectors": "7.5.17", + "@credativ/plutono-e2e-selectors": "7.5.17", "@grafana/tsconfig": "^1.0.0-rc1", "@mochajs/json-file-reporter": "^1.2.0", "blink-diff": "1.0.13", diff --git a/packages/grafana-e2e/rollup.config.ts b/packages/plutono-e2e/grafana-e2e/rollup.config.ts similarity index 95% rename from packages/grafana-e2e/rollup.config.ts rename to packages/plutono-e2e/grafana-e2e/rollup.config.ts index 341c18b871..6b71f23433 100644 --- a/packages/grafana-e2e/rollup.config.ts +++ b/packages/plutono-e2e/grafana-e2e/rollup.config.ts @@ -16,7 +16,7 @@ const buildCjsPackage = ({ env }) => ({ exports: 'named', globals: {}, }, - external: ['@grafana/e2e-selectors'], + external: ['@credativ/plutono-e2e-selectors'], plugins: [ copy({ flatten: false, diff --git a/packages/grafana-e2e/src/components/index.ts b/packages/plutono-e2e/grafana-e2e/src/components/index.ts similarity index 100% rename from packages/grafana-e2e/src/components/index.ts rename to packages/plutono-e2e/grafana-e2e/src/components/index.ts diff --git a/packages/grafana-e2e/src/flows/addDashboard.ts b/packages/plutono-e2e/grafana-e2e/src/flows/addDashboard.ts similarity index 100% rename from packages/grafana-e2e/src/flows/addDashboard.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/addDashboard.ts diff --git a/packages/grafana-e2e/src/flows/addDataSource.ts b/packages/plutono-e2e/grafana-e2e/src/flows/addDataSource.ts similarity index 100% rename from packages/grafana-e2e/src/flows/addDataSource.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/addDataSource.ts diff --git a/packages/grafana-e2e/src/flows/addPanel.ts b/packages/plutono-e2e/grafana-e2e/src/flows/addPanel.ts similarity index 100% rename from packages/grafana-e2e/src/flows/addPanel.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/addPanel.ts diff --git a/packages/grafana-e2e/src/flows/assertSuccessNotification.ts b/packages/plutono-e2e/grafana-e2e/src/flows/assertSuccessNotification.ts similarity index 100% rename from packages/grafana-e2e/src/flows/assertSuccessNotification.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/assertSuccessNotification.ts diff --git a/packages/grafana-e2e/src/flows/configurePanel.ts b/packages/plutono-e2e/grafana-e2e/src/flows/configurePanel.ts similarity index 98% rename from packages/grafana-e2e/src/flows/configurePanel.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/configurePanel.ts index 07cedf08eb..a8c3b8dc75 100644 --- a/packages/grafana-e2e/src/flows/configurePanel.ts +++ b/packages/plutono-e2e/grafana-e2e/src/flows/configurePanel.ts @@ -250,14 +250,14 @@ const getOptionsGroup = (name: string) => e2e().get(`.options-group:has([aria-la // @todo this actually returns type `Cypress.Chainable` const isOptionsGroupOpen = (name: string): any => - requireLocalStorage(`grafana.dashboard.editor.ui.optionGroup[Panel ${name}]`).then(({ defaultToClosed }: any) => { + requireLocalStorage(`plutono.dashboard.editor.ui.optionGroup[Panel ${name}]`).then(({ defaultToClosed }: any) => { // @todo remove `wrap` when possible return e2e().wrap(!defaultToClosed, { log: false }); }); // @todo this actually returns type `Cypress.Chainable` const isOptionsOpen = (): any => - getLocalStorage('grafana.dashboard.editor.ui').then((data: any) => { + getLocalStorage('plutono.dashboard.editor.ui').then((data: any) => { if (data) { // @todo remove `wrap` when possible return e2e().wrap(data.isPanelOptionsVisible, { log: false }); diff --git a/packages/grafana-e2e/src/flows/deleteDashboard.ts b/packages/plutono-e2e/grafana-e2e/src/flows/deleteDashboard.ts similarity index 100% rename from packages/grafana-e2e/src/flows/deleteDashboard.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/deleteDashboard.ts diff --git a/packages/grafana-e2e/src/flows/deleteDataSource.ts b/packages/plutono-e2e/grafana-e2e/src/flows/deleteDataSource.ts similarity index 100% rename from packages/grafana-e2e/src/flows/deleteDataSource.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/deleteDataSource.ts diff --git a/packages/grafana-e2e/src/flows/editPanel.ts b/packages/plutono-e2e/grafana-e2e/src/flows/editPanel.ts similarity index 100% rename from packages/grafana-e2e/src/flows/editPanel.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/editPanel.ts diff --git a/packages/grafana-e2e/src/flows/explore.ts b/packages/plutono-e2e/grafana-e2e/src/flows/explore.ts similarity index 100% rename from packages/grafana-e2e/src/flows/explore.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/explore.ts diff --git a/packages/grafana-e2e/src/flows/index.ts b/packages/plutono-e2e/grafana-e2e/src/flows/index.ts similarity index 100% rename from packages/grafana-e2e/src/flows/index.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/index.ts diff --git a/packages/grafana-e2e/src/flows/login.ts b/packages/plutono-e2e/grafana-e2e/src/flows/login.ts similarity index 100% rename from packages/grafana-e2e/src/flows/login.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/login.ts diff --git a/packages/grafana-e2e/src/flows/openDashboard.ts b/packages/plutono-e2e/grafana-e2e/src/flows/openDashboard.ts similarity index 100% rename from packages/grafana-e2e/src/flows/openDashboard.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/openDashboard.ts diff --git a/packages/grafana-e2e/src/flows/openPanelMenuItem.ts b/packages/plutono-e2e/grafana-e2e/src/flows/openPanelMenuItem.ts similarity index 100% rename from packages/grafana-e2e/src/flows/openPanelMenuItem.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/openPanelMenuItem.ts diff --git a/packages/grafana-e2e/src/flows/revertAllChanges.ts b/packages/plutono-e2e/grafana-e2e/src/flows/revertAllChanges.ts similarity index 100% rename from packages/grafana-e2e/src/flows/revertAllChanges.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/revertAllChanges.ts diff --git a/packages/grafana-e2e/src/flows/saveDashboard.ts b/packages/plutono-e2e/grafana-e2e/src/flows/saveDashboard.ts similarity index 100% rename from packages/grafana-e2e/src/flows/saveDashboard.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/saveDashboard.ts diff --git a/packages/grafana-e2e/src/flows/selectOption.ts b/packages/plutono-e2e/grafana-e2e/src/flows/selectOption.ts similarity index 100% rename from packages/grafana-e2e/src/flows/selectOption.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/selectOption.ts diff --git a/packages/grafana-e2e/src/flows/setDashboardTimeRange.ts b/packages/plutono-e2e/grafana-e2e/src/flows/setDashboardTimeRange.ts similarity index 100% rename from packages/grafana-e2e/src/flows/setDashboardTimeRange.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/setDashboardTimeRange.ts diff --git a/packages/grafana-e2e/src/flows/setTimeRange.ts b/packages/plutono-e2e/grafana-e2e/src/flows/setTimeRange.ts similarity index 100% rename from packages/grafana-e2e/src/flows/setTimeRange.ts rename to packages/plutono-e2e/grafana-e2e/src/flows/setTimeRange.ts diff --git a/packages/grafana-e2e/src/index.ts b/packages/plutono-e2e/grafana-e2e/src/index.ts similarity index 86% rename from packages/grafana-e2e/src/index.ts rename to packages/plutono-e2e/grafana-e2e/src/index.ts index 87a0a6a8f2..70238fe22b 100644 --- a/packages/grafana-e2e/src/index.ts +++ b/packages/plutono-e2e/grafana-e2e/src/index.ts @@ -1,12 +1,12 @@ /** - * A library for writing end-to-end tests for Grafana and its ecosystem. + * A library for writing end-to-end tests for Plutono and its ecosystem. * * @packageDocumentation */ import { e2eScenario, ScenarioArguments } from './support/scenario'; import { getScenarioContext, setScenarioContext } from './support/scenarioContext'; import { e2eFactory } from './support'; -import { E2ESelectors, Selectors, selectors } from '@grafana/e2e-selectors'; +import { E2ESelectors, Selectors, selectors } from '@credativ/plutono-e2e-selectors'; import * as flows from './flows'; import * as typings from './typings'; diff --git a/packages/grafana-e2e/src/support/index.ts b/packages/plutono-e2e/grafana-e2e/src/support/index.ts similarity index 100% rename from packages/grafana-e2e/src/support/index.ts rename to packages/plutono-e2e/grafana-e2e/src/support/index.ts diff --git a/packages/grafana-e2e/src/support/localStorage.ts b/packages/plutono-e2e/grafana-e2e/src/support/localStorage.ts similarity index 100% rename from packages/grafana-e2e/src/support/localStorage.ts rename to packages/plutono-e2e/grafana-e2e/src/support/localStorage.ts diff --git a/packages/grafana-e2e/src/support/scenario.ts b/packages/plutono-e2e/grafana-e2e/src/support/scenario.ts similarity index 94% rename from packages/grafana-e2e/src/support/scenario.ts rename to packages/plutono-e2e/grafana-e2e/src/support/scenario.ts index 1a499c8218..02a1b0bfbc 100644 --- a/packages/grafana-e2e/src/support/scenario.ts +++ b/packages/plutono-e2e/grafana-e2e/src/support/scenario.ts @@ -24,7 +24,7 @@ export const e2eScenario = ({ before(() => e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'))); beforeEach(() => { - Cypress.Cookies.preserveOnce('grafana_session'); + Cypress.Cookies.preserveOnce('plutono_session'); if (addScenarioDataSource) { e2e.flows.addDataSource(); diff --git a/packages/grafana-e2e/src/support/scenarioContext.ts b/packages/plutono-e2e/grafana-e2e/src/support/scenarioContext.ts similarity index 100% rename from packages/grafana-e2e/src/support/scenarioContext.ts rename to packages/plutono-e2e/grafana-e2e/src/support/scenarioContext.ts diff --git a/packages/grafana-e2e/src/support/selector.ts b/packages/plutono-e2e/grafana-e2e/src/support/selector.ts similarity index 100% rename from packages/grafana-e2e/src/support/selector.ts rename to packages/plutono-e2e/grafana-e2e/src/support/selector.ts diff --git a/packages/grafana-e2e/src/support/types.ts b/packages/plutono-e2e/grafana-e2e/src/support/types.ts similarity index 98% rename from packages/grafana-e2e/src/support/types.ts rename to packages/plutono-e2e/grafana-e2e/src/support/types.ts index 0476d317cb..34178cef45 100644 --- a/packages/grafana-e2e/src/support/types.ts +++ b/packages/plutono-e2e/grafana-e2e/src/support/types.ts @@ -1,4 +1,4 @@ -import { CssSelector, FunctionSelector, Selectors, StringSelector, UrlSelector } from '@grafana/e2e-selectors'; +import { CssSelector, FunctionSelector, Selectors, StringSelector, UrlSelector } from '@credativ/plutono-e2e-selectors'; import { e2e } from '../index'; import { Selector } from './selector'; import { fromBaseUrl } from './url'; diff --git a/packages/grafana-e2e/src/support/url.ts b/packages/plutono-e2e/grafana-e2e/src/support/url.ts similarity index 100% rename from packages/grafana-e2e/src/support/url.ts rename to packages/plutono-e2e/grafana-e2e/src/support/url.ts diff --git a/packages/grafana-e2e/src/typings/index.ts b/packages/plutono-e2e/grafana-e2e/src/typings/index.ts similarity index 100% rename from packages/grafana-e2e/src/typings/index.ts rename to packages/plutono-e2e/grafana-e2e/src/typings/index.ts diff --git a/packages/grafana-e2e/src/typings/undo.ts b/packages/plutono-e2e/grafana-e2e/src/typings/undo.ts similarity index 100% rename from packages/grafana-e2e/src/typings/undo.ts rename to packages/plutono-e2e/grafana-e2e/src/typings/undo.ts diff --git a/packages/grafana-e2e/test/cypress/integration/0.cli.ts b/packages/plutono-e2e/grafana-e2e/test/cypress/integration/0.cli.ts similarity index 100% rename from packages/grafana-e2e/test/cypress/integration/0.cli.ts rename to packages/plutono-e2e/grafana-e2e/test/cypress/integration/0.cli.ts diff --git a/packages/grafana-e2e/test/cypress/integration/1.api.ts b/packages/plutono-e2e/grafana-e2e/test/cypress/integration/1.api.ts similarity index 100% rename from packages/grafana-e2e/test/cypress/integration/1.api.ts rename to packages/plutono-e2e/grafana-e2e/test/cypress/integration/1.api.ts diff --git a/packages/grafana-e2e/test/cypress/tsconfig.json b/packages/plutono-e2e/grafana-e2e/test/cypress/tsconfig.json similarity index 65% rename from packages/grafana-e2e/test/cypress/tsconfig.json rename to packages/plutono-e2e/grafana-e2e/test/cypress/tsconfig.json index 1fa1340278..0d2af27d38 100644 --- a/packages/grafana-e2e/test/cypress/tsconfig.json +++ b/packages/plutono-e2e/grafana-e2e/test/cypress/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@grafana/toolkit/src/config/tsconfig.plugin.json", + "extends": "@credativ/plutono-toolkit/src/config/tsconfig.plugin.json", "include": ["**/*.ts"], "compilerOptions": { "baseUrl": "../node_modules", diff --git a/packages/grafana-e2e/tsconfig.build.json b/packages/plutono-e2e/grafana-e2e/tsconfig.build.json similarity index 100% rename from packages/grafana-e2e/tsconfig.build.json rename to packages/plutono-e2e/grafana-e2e/tsconfig.build.json diff --git a/packages/grafana-e2e/tsconfig.json b/packages/plutono-e2e/grafana-e2e/tsconfig.json similarity index 100% rename from packages/grafana-e2e/tsconfig.json rename to packages/plutono-e2e/grafana-e2e/tsconfig.json diff --git a/packages/plutono-runtime/grafana-runtime/.eslintrc b/packages/plutono-runtime/grafana-runtime/.eslintrc new file mode 100644 index 0000000000..d099ccff3a --- /dev/null +++ b/packages/plutono-runtime/grafana-runtime/.eslintrc @@ -0,0 +1,5 @@ +{ + "rules": { + "no-restricted-imports": ["error", { "patterns": ["@credativ/plutono-runtime", "@credativ/plutono-data/*", "@credativ/plutono-ui/*", "@credativ/plutono-e2e/*"] }] + } +} diff --git a/packages/grafana-runtime/CHANGELOG.md b/packages/plutono-runtime/grafana-runtime/CHANGELOG.md similarity index 100% rename from packages/grafana-runtime/CHANGELOG.md rename to packages/plutono-runtime/grafana-runtime/CHANGELOG.md diff --git a/packages/plutono-runtime/grafana-runtime/README.md b/packages/plutono-runtime/grafana-runtime/README.md new file mode 100644 index 0000000000..9a6c545e00 --- /dev/null +++ b/packages/plutono-runtime/grafana-runtime/README.md @@ -0,0 +1,5 @@ +# Plutono Runtime library + +> **@credativ/plutono-runtime is currently in BETA**. + +This package allows access to plutono services. It requires Plutono to be running already and the functions to be imported as externals. diff --git a/packages/grafana-runtime/api-extractor.json b/packages/plutono-runtime/grafana-runtime/api-extractor.json similarity index 100% rename from packages/grafana-runtime/api-extractor.json rename to packages/plutono-runtime/grafana-runtime/api-extractor.json diff --git a/packages/grafana-runtime/index.js b/packages/plutono-runtime/grafana-runtime/index.js similarity index 100% rename from packages/grafana-runtime/index.js rename to packages/plutono-runtime/grafana-runtime/index.js diff --git a/packages/grafana-runtime/package.json b/packages/plutono-runtime/grafana-runtime/package.json similarity index 76% rename from packages/grafana-runtime/package.json rename to packages/plutono-runtime/grafana-runtime/package.json index 8a66ffc501..1fef736bd8 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/plutono-runtime/grafana-runtime/package.json @@ -1,29 +1,29 @@ { "author": "Grafana Labs", "license": "Apache-2.0", - "name": "@grafana/runtime", + "name": "@credativ/plutono-runtime", "version": "7.5.17", - "description": "Grafana Runtime Library", + "description": "Plutono Runtime Library", "keywords": [ - "grafana", + "plutono", "typescript" ], "repository": { "type": "git", - "url": "http://github.com/grafana/grafana.git", - "directory": "packages/grafana-runtime" + "url": "http://github.com/credativ/plutono.git", + "directory": "packages/plutono-runtime" }, "main": "src/index.ts", "scripts": { - "build": "grafana-toolkit package:build --scope=runtime", + "build": "plutono-toolkit package:build --scope=runtime", "bundle": "rollup -c rollup.config.ts", "clean": "rimraf ./dist ./compiled", "docsExtract": "mkdir -p ../../reports/docs && api-extractor run 2>&1 | tee ../../reports/docs/$(basename $(pwd)).log", "typecheck": "tsc --noEmit" }, "dependencies": { - "@grafana/data": "7.5.17", - "@grafana/ui": "7.5.17", + "@credativ/plutono-data": "7.5.17", + "@credativ/plutono-ui": "7.5.17", "systemjs": "0.20.19", "systemjs-plugin-css": "0.1.37" }, diff --git a/packages/grafana-runtime/rollup.config.ts b/packages/plutono-runtime/grafana-runtime/rollup.config.ts similarity index 88% rename from packages/grafana-runtime/rollup.config.ts rename to packages/plutono-runtime/grafana-runtime/rollup.config.ts index 6b9900df1b..f2a2ea420e 100644 --- a/packages/grafana-runtime/rollup.config.ts +++ b/packages/plutono-runtime/grafana-runtime/rollup.config.ts @@ -20,7 +20,7 @@ const buildCjsPackage = ({ env }) => { globals: {}, }, ], - external: ['lodash', '@grafana/ui', '@grafana/data'], // Use Lodash from grafana + external: ['lodash', '@credativ/plutono-ui', '@credativ/plutono-data'], // Use Lodash from plutono plugins: [ commonjs({ include: /node_modules/, diff --git a/packages/grafana-runtime/src/config.ts b/packages/plutono-runtime/grafana-runtime/src/config.ts similarity index 79% rename from packages/grafana-runtime/src/config.ts rename to packages/plutono-runtime/grafana-runtime/src/config.ts index d88e059a43..b5180b5be0 100644 --- a/packages/grafana-runtime/src/config.ts +++ b/packages/plutono-runtime/grafana-runtime/src/config.ts @@ -1,19 +1,19 @@ import merge from 'lodash/merge'; -import { getTheme } from '@grafana/ui'; +import { getTheme } from '@credativ/plutono-ui'; import { BuildInfo, DataSourceInstanceSettings, FeatureToggles, - GrafanaConfig, - GrafanaTheme, - GrafanaThemeType, + PlutonoConfig, + PlutonoTheme, + PlutonoThemeType, LicenseInfo, PanelPluginMeta, systemDateFormats, SystemDateFormatSettings, -} from '@grafana/data'; +} from '@credativ/plutono-data'; -export class GrafanaBootConfig implements GrafanaConfig { +export class PlutonoBootConfig implements PlutonoConfig { datasources: { [str: string]: DataSourceInstanceSettings } = {}; panels: { [key: string]: PanelPluginMeta } = {}; minRefreshInterval = ''; @@ -49,7 +49,7 @@ export class GrafanaBootConfig implements GrafanaConfig { viewersCanEdit = false; editorsCanAdmin = false; disableSanitizeHtml = false; - theme: GrafanaTheme; + theme: PlutonoTheme; pluginsToPreload: string[] = []; featureToggles: FeatureToggles = { live: false, @@ -74,12 +74,12 @@ export class GrafanaBootConfig implements GrafanaConfig { awsAllowedAuthProviders: string[] = []; awsAssumeRoleEnabled = false; - constructor(options: GrafanaBootConfig) { - this.theme = options.bootData.user.lightTheme ? getTheme(GrafanaThemeType.Light) : getTheme(GrafanaThemeType.Dark); + constructor(options: PlutonoBootConfig) { + this.theme = options.bootData.user.lightTheme ? getTheme(PlutonoThemeType.Light) : getTheme(PlutonoThemeType.Dark); const defaults = { datasources: {}, - windowTitlePrefix: 'Grafana - ', + windowTitlePrefix: 'Plutono - ', panels: {}, newPanelTitle: 'Panel Title', playlist_timespan: '1m', @@ -105,7 +105,7 @@ export class GrafanaBootConfig implements GrafanaConfig { } } -const bootData = (window as any).grafanaBootData || { +const bootData = (window as any).plutonoBootData || { settings: {}, user: {}, navTree: [], @@ -115,8 +115,8 @@ const options = bootData.settings; options.bootData = bootData; /** - * Use this to access the {@link GrafanaBootConfig} for the current running Grafana instance. + * Use this to access the {@link PlutonoBootConfig} for the current running Plutono instance. * * @public */ -export const config = new GrafanaBootConfig(options); +export const config = new PlutonoBootConfig(options); diff --git a/packages/grafana-runtime/src/index.ts b/packages/plutono-runtime/grafana-runtime/src/index.ts similarity index 95% rename from packages/grafana-runtime/src/index.ts rename to packages/plutono-runtime/grafana-runtime/src/index.ts index a8f139042d..5480a444f5 100644 --- a/packages/grafana-runtime/src/index.ts +++ b/packages/plutono-runtime/grafana-runtime/src/index.ts @@ -1,5 +1,5 @@ /** - * A library containing services, configurations etc. used to interact with the Grafana engine. + * A library containing services, configurations etc. used to interact with the Plutono engine. * * @packageDocumentation */ diff --git a/packages/grafana-runtime/src/measurement/collector.test.ts b/packages/plutono-runtime/grafana-runtime/src/measurement/collector.test.ts similarity index 100% rename from packages/grafana-runtime/src/measurement/collector.test.ts rename to packages/plutono-runtime/grafana-runtime/src/measurement/collector.test.ts diff --git a/packages/grafana-runtime/src/measurement/collector.ts b/packages/plutono-runtime/grafana-runtime/src/measurement/collector.ts similarity index 99% rename from packages/grafana-runtime/src/measurement/collector.ts rename to packages/plutono-runtime/grafana-runtime/src/measurement/collector.ts index f84070ebb0..f40372af18 100644 --- a/packages/grafana-runtime/src/measurement/collector.ts +++ b/packages/plutono-runtime/grafana-runtime/src/measurement/collector.ts @@ -8,7 +8,7 @@ import { parseLabels, CircularVector, ArrayVector, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { Measurement, MeasurementBatch, LiveMeasurements, MeasurementsQuery, MeasurementAction } from './types'; interface MeasurementCacheConfig { diff --git a/packages/grafana-runtime/src/measurement/index.ts b/packages/plutono-runtime/grafana-runtime/src/measurement/index.ts similarity index 100% rename from packages/grafana-runtime/src/measurement/index.ts rename to packages/plutono-runtime/grafana-runtime/src/measurement/index.ts diff --git a/packages/grafana-runtime/src/measurement/query.ts b/packages/plutono-runtime/grafana-runtime/src/measurement/query.ts similarity index 89% rename from packages/grafana-runtime/src/measurement/query.ts rename to packages/plutono-runtime/grafana-runtime/src/measurement/query.ts index e4cbf0f590..f650d3c258 100644 --- a/packages/grafana-runtime/src/measurement/query.ts +++ b/packages/plutono-runtime/grafana-runtime/src/measurement/query.ts @@ -5,9 +5,9 @@ import { isValidLiveChannelAddress, LiveChannelAddress, LoadingState, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { LiveMeasurements, MeasurementsQuery } from './types'; -import { getGrafanaLiveSrv } from '../services/live'; +import { getPlutonoLiveSrv } from '../services/live'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -20,7 +20,7 @@ export function getLiveMeasurements(addr: LiveChannelAddress): LiveMeasurements return undefined; } - const live = getGrafanaLiveSrv(); + const live = getPlutonoLiveSrv(); if (!live) { return undefined; } @@ -45,10 +45,10 @@ export function getLiveMeasurementsObserver( return of(rsp); // Address not configured yet } - const live = getGrafanaLiveSrv(); + const live = getPlutonoLiveSrv(); if (!live) { // This will only happen with the feature flag is not enabled - rsp.error = { message: 'Grafana live is not initalized' }; + rsp.error = { message: 'Plutono live is not initalized' }; return of(rsp); } diff --git a/packages/grafana-runtime/src/measurement/types.ts b/packages/plutono-runtime/grafana-runtime/src/measurement/types.ts similarity index 95% rename from packages/grafana-runtime/src/measurement/types.ts rename to packages/plutono-runtime/grafana-runtime/src/measurement/types.ts index 687e494734..ab1d6b9519 100644 --- a/packages/grafana-runtime/src/measurement/types.ts +++ b/packages/plutono-runtime/grafana-runtime/src/measurement/types.ts @@ -1,4 +1,4 @@ -import { DataFrame, Labels, FieldConfig } from '@grafana/data'; +import { DataFrame, Labels, FieldConfig } from '@credativ/plutono-data'; /** * the raw channel events are batches of Measurements diff --git a/packages/grafana-runtime/src/services/AngularLoader.ts b/packages/plutono-runtime/grafana-runtime/src/services/AngularLoader.ts similarity index 97% rename from packages/grafana-runtime/src/services/AngularLoader.ts rename to packages/plutono-runtime/grafana-runtime/src/services/AngularLoader.ts index c7beac4fbb..b872bf3b22 100644 --- a/packages/grafana-runtime/src/services/AngularLoader.ts +++ b/packages/plutono-runtime/grafana-runtime/src/services/AngularLoader.ts @@ -65,7 +65,7 @@ export interface AngularLoader { let instance: AngularLoader; /** - * Used during startup by Grafana to set the AngularLoader so it is available + * Used during startup by Plutono to set the AngularLoader so it is available * via the {@link getAngularLoader} to the rest of the application. * * @internal diff --git a/packages/grafana-runtime/src/services/EchoSrv.ts b/packages/plutono-runtime/grafana-runtime/src/services/EchoSrv.ts similarity index 92% rename from packages/grafana-runtime/src/services/EchoSrv.ts rename to packages/plutono-runtime/grafana-runtime/src/services/EchoSrv.ts index 098051d5c6..87477091eb 100644 --- a/packages/grafana-runtime/src/services/EchoSrv.ts +++ b/packages/plutono-runtime/grafana-runtime/src/services/EchoSrv.ts @@ -23,7 +23,7 @@ export interface EchoMeta { */ sessionId: string; /** - * The current users username used to login into Grafana e.g. email. + * The current users username used to login into Plutono e.g. email. */ userLogin: string; /** @@ -31,7 +31,7 @@ export interface EchoMeta { */ userId: number; /** - * True when user is logged in into Grafana. + * True when user is logged in into Plutono. */ userSignedIn: boolean; /** @@ -110,7 +110,7 @@ export interface EchoSrv { let singletonInstance: EchoSrv; /** - * Used during startup by Grafana to set the EchoSrv so it is available + * Used during startup by Plutono to set the EchoSrv so it is available * via the {@link getEchoSrv} to the rest of the application. * * @internal @@ -130,7 +130,7 @@ export function getEchoSrv(): EchoSrv { } /** - * Used to register echo backends that will receive Grafana echo events during application + * Used to register echo backends that will receive Plutono echo events during application * runtime. * * @public diff --git a/packages/grafana-runtime/src/services/LocationSrv.ts b/packages/plutono-runtime/grafana-runtime/src/services/LocationSrv.ts similarity index 91% rename from packages/grafana-runtime/src/services/LocationSrv.ts rename to packages/plutono-runtime/grafana-runtime/src/services/LocationSrv.ts index c1cdd03144..de60882606 100644 --- a/packages/grafana-runtime/src/services/LocationSrv.ts +++ b/packages/plutono-runtime/grafana-runtime/src/services/LocationSrv.ts @@ -4,7 +4,7 @@ * * @public */ -import { UrlQueryMap } from '@grafana/data'; +import { UrlQueryMap } from '@credativ/plutono-data'; /** * @public @@ -55,7 +55,7 @@ export interface LocationSrv { let singletonInstance: LocationSrv; /** - * Used during startup by Grafana to set the LocationSrv so it is available + * Used during startup by Plutono to set the LocationSrv so it is available * via the {@link getLocationSrv} to the rest of the application. * * @internal @@ -66,7 +66,7 @@ export function setLocationSrv(instance: LocationSrv) { /** * Used to retrieve the {@link LocationSrv} that can be used to automatically navigate - * the user to a new place in Grafana. + * the user to a new place in Plutono. * * @public */ diff --git a/packages/grafana-runtime/src/services/backendSrv.ts b/packages/plutono-runtime/grafana-runtime/src/services/backendSrv.ts similarity index 94% rename from packages/grafana-runtime/src/services/backendSrv.ts rename to packages/plutono-runtime/grafana-runtime/src/services/backendSrv.ts index 734980a687..a0fbca81ce 100644 --- a/packages/grafana-runtime/src/services/backendSrv.ts +++ b/packages/plutono-runtime/grafana-runtime/src/services/backendSrv.ts @@ -124,7 +124,7 @@ export interface FetchError { } /** - * Used to communicate via http(s) to a remote backend such as the Grafana backend, + * Used to communicate via http(s) to a remote backend such as the Plutono backend, * a datasource etc. The BackendSrv is using the {@link https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API | Fetch API} * under the hood to handle all the communication. * @@ -133,7 +133,7 @@ export interface FetchError { * use default values executing the request. * * @remarks - * By default, Grafana displays an error message alert if the remote call fails. To prevent this from + * By default, Plutono displays an error message alert if the remote call fails. To prevent this from * happening `showErrorAlert = true` on the options object. * * @public @@ -154,7 +154,7 @@ export interface BackendSrv { /** * @deprecated Use the fetch function instead * Special function used to communicate with datasources that will emit core - * events that the Grafana QueryInspector and QueryEditor is listening for to be able + * events that the Plutono QueryInspector and QueryEditor is listening for to be able * to display datasource query information. Can be skipped by adding `option.silent` * when initializing the request. */ @@ -169,7 +169,7 @@ export interface BackendSrv { let singletonInstance: BackendSrv; /** - * Used during startup by Grafana to set the BackendSrv so it is available + * Used during startup by Plutono to set the BackendSrv so it is available * via the {@link getBackendSrv} to the rest of the application. * * @internal @@ -180,7 +180,7 @@ export const setBackendSrv = (instance: BackendSrv) => { /** * Used to retrieve the {@link BackendSrv} that can be used to communicate - * via http(s) to a remote backend such as the Grafana backend, a datasource etc. + * via http(s) to a remote backend such as the Plutono backend, a datasource etc. * * @public */ diff --git a/packages/grafana-runtime/src/services/dataSourceSrv.ts b/packages/plutono-runtime/grafana-runtime/src/services/dataSourceSrv.ts similarity index 91% rename from packages/grafana-runtime/src/services/dataSourceSrv.ts rename to packages/plutono-runtime/grafana-runtime/src/services/dataSourceSrv.ts index 25094299e9..0cf1f698ad 100644 --- a/packages/grafana-runtime/src/services/dataSourceSrv.ts +++ b/packages/plutono-runtime/grafana-runtime/src/services/dataSourceSrv.ts @@ -1,9 +1,9 @@ -import { ScopedVars, DataSourceApi, DataSourceInstanceSettings } from '@grafana/data'; +import { ScopedVars, DataSourceApi, DataSourceInstanceSettings } from '@credativ/plutono-data'; /** * This is the entry point for communicating with a datasource that is added as * a plugin (both external and internal). Via this service you will get access - * to the {@link @grafana/data#DataSourceApi | DataSourceApi} that have a rich API for + * to the {@link @credativ/plutono-data#DataSourceApi | DataSourceApi} that have a rich API for * communicating with the datasource. * * @public @@ -59,7 +59,7 @@ export interface GetDataSourceListFilters { let singletonInstance: DataSourceSrv; /** - * Used during startup by Grafana to set the DataSourceSrv so it is available + * Used during startup by Plutono to set the DataSourceSrv so it is available * via the {@link getDataSourceSrv} to the rest of the application. * * @internal diff --git a/packages/grafana-runtime/src/services/index.ts b/packages/plutono-runtime/grafana-runtime/src/services/index.ts similarity index 100% rename from packages/grafana-runtime/src/services/index.ts rename to packages/plutono-runtime/grafana-runtime/src/services/index.ts diff --git a/packages/grafana-runtime/src/services/legacyAngularInjector.ts b/packages/plutono-runtime/grafana-runtime/src/services/legacyAngularInjector.ts similarity index 91% rename from packages/grafana-runtime/src/services/legacyAngularInjector.ts rename to packages/plutono-runtime/grafana-runtime/src/services/legacyAngularInjector.ts index 4c581ffd97..d155ebb99d 100644 --- a/packages/grafana-runtime/src/services/legacyAngularInjector.ts +++ b/packages/plutono-runtime/grafana-runtime/src/services/legacyAngularInjector.ts @@ -3,7 +3,7 @@ import { auto } from 'angular'; let singleton: auto.IInjectorService; /** - * Used during startup by Grafana to temporarily expose the angular injector to + * Used during startup by Plutono to temporarily expose the angular injector to * pure javascript plugins using {@link getLegacyAngularInjector}. * * @internal diff --git a/packages/grafana-runtime/src/services/live.ts b/packages/plutono-runtime/grafana-runtime/src/services/live.ts similarity index 65% rename from packages/grafana-runtime/src/services/live.ts rename to packages/plutono-runtime/grafana-runtime/src/services/live.ts index 76ec6b6ff8..53d84e77ee 100644 --- a/packages/grafana-runtime/src/services/live.ts +++ b/packages/plutono-runtime/grafana-runtime/src/services/live.ts @@ -1,10 +1,10 @@ -import { LiveChannel, LiveChannelAddress } from '@grafana/data'; +import { LiveChannel, LiveChannelAddress } from '@credativ/plutono-data'; import { Observable } from 'rxjs'; /** * @alpha -- experimental */ -export interface GrafanaLiveSrv { +export interface PlutonoLiveSrv { /** * Is the server currently connected */ @@ -26,22 +26,22 @@ export interface GrafanaLiveSrv { getChannel(address: LiveChannelAddress): LiveChannel; } -let singletonInstance: GrafanaLiveSrv; +let singletonInstance: PlutonoLiveSrv; /** - * Used during startup by Grafana to set the GrafanaLiveSrv so it is available - * via the {@link getGrafanaLiveSrv} to the rest of the application. + * Used during startup by Plutono to set the PlutonoLiveSrv so it is available + * via the {@link getPlutonoLiveSrv} to the rest of the application. * * @internal */ -export const setGrafanaLiveSrv = (instance: GrafanaLiveSrv) => { +export const setPlutonoLiveSrv = (instance: PlutonoLiveSrv) => { singletonInstance = instance; }; /** - * Used to retrieve the GrafanaLiveSrv that allows you to subscribe to + * Used to retrieve the PlutonoLiveSrv that allows you to subscribe to * server side events and streams * * @alpha -- experimental */ -export const getGrafanaLiveSrv = (): GrafanaLiveSrv => singletonInstance; +export const getPlutonoLiveSrv = (): PlutonoLiveSrv => singletonInstance; diff --git a/packages/grafana-runtime/src/services/templateSrv.ts b/packages/plutono-runtime/grafana-runtime/src/services/templateSrv.ts similarity index 88% rename from packages/grafana-runtime/src/services/templateSrv.ts rename to packages/plutono-runtime/grafana-runtime/src/services/templateSrv.ts index 962dacd70c..56249d0168 100644 --- a/packages/grafana-runtime/src/services/templateSrv.ts +++ b/packages/plutono-runtime/grafana-runtime/src/services/templateSrv.ts @@ -1,4 +1,4 @@ -import { VariableModel, ScopedVars } from '@grafana/data'; +import { VariableModel, ScopedVars } from '@credativ/plutono-data'; /** * Via the TemplateSrv consumers get access to all the available template variables @@ -22,7 +22,7 @@ export interface TemplateSrv { let singletonInstance: TemplateSrv; /** - * Used during startup by Grafana to set the TemplateSrv so it is available + * Used during startup by Plutono to set the TemplateSrv so it is available * via the {@link getTemplateSrv} to the rest of the application. * * @internal diff --git a/packages/grafana-runtime/src/types/analytics.ts b/packages/plutono-runtime/grafana-runtime/src/types/analytics.ts similarity index 100% rename from packages/grafana-runtime/src/types/analytics.ts rename to packages/plutono-runtime/grafana-runtime/src/types/analytics.ts diff --git a/packages/grafana-runtime/src/types/index.ts b/packages/plutono-runtime/grafana-runtime/src/types/index.ts similarity index 100% rename from packages/grafana-runtime/src/types/index.ts rename to packages/plutono-runtime/grafana-runtime/src/types/index.ts diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts b/packages/plutono-runtime/grafana-runtime/src/utils/DataSourceWithBackend.test.ts similarity index 97% rename from packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts rename to packages/plutono-runtime/grafana-runtime/src/utils/DataSourceWithBackend.test.ts index 9cc83b45ed..42bf4a48f5 100644 --- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts +++ b/packages/plutono-runtime/grafana-runtime/src/utils/DataSourceWithBackend.test.ts @@ -1,6 +1,6 @@ import { BackendSrv, BackendSrvRequest } from 'src/services'; import { DataSourceWithBackend } from './DataSourceWithBackend'; -import { DataSourceJsonData, DataQuery, DataSourceInstanceSettings, DataQueryRequest } from '@grafana/data'; +import { DataSourceJsonData, DataQuery, DataSourceInstanceSettings, DataQueryRequest } from '@credativ/plutono-data'; import { of } from 'rxjs'; class MyDataSource extends DataSourceWithBackend { diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts b/packages/plutono-runtime/grafana-runtime/src/utils/DataSourceWithBackend.ts similarity index 98% rename from packages/grafana-runtime/src/utils/DataSourceWithBackend.ts rename to packages/plutono-runtime/grafana-runtime/src/utils/DataSourceWithBackend.ts index 6c942f70c2..986c61da04 100644 --- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts +++ b/packages/plutono-runtime/grafana-runtime/src/utils/DataSourceWithBackend.ts @@ -6,7 +6,7 @@ import { DataQuery, DataSourceJsonData, ScopedVars, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { Observable, of } from 'rxjs'; import { map, catchError } from 'rxjs/operators'; import { getBackendSrv, getDataSourceSrv } from '../services'; @@ -38,7 +38,7 @@ export interface HealthCheckResult { } /** - * Extend this class to implement a data source plugin that is depending on the Grafana + * Extend this class to implement a data source plugin that is depending on the Plutono * backend API. * * @public diff --git a/packages/grafana-runtime/src/utils/analytics.ts b/packages/plutono-runtime/grafana-runtime/src/utils/analytics.ts similarity index 100% rename from packages/grafana-runtime/src/utils/analytics.ts rename to packages/plutono-runtime/grafana-runtime/src/utils/analytics.ts diff --git a/packages/grafana-runtime/src/utils/logging.ts b/packages/plutono-runtime/grafana-runtime/src/utils/logging.ts similarity index 100% rename from packages/grafana-runtime/src/utils/logging.ts rename to packages/plutono-runtime/grafana-runtime/src/utils/logging.ts diff --git a/packages/grafana-runtime/src/utils/plugin.ts b/packages/plutono-runtime/grafana-runtime/src/utils/plugin.ts similarity index 91% rename from packages/grafana-runtime/src/utils/plugin.ts rename to packages/plutono-runtime/grafana-runtime/src/utils/plugin.ts index 5791dd0051..3dd54fdea9 100644 --- a/packages/grafana-runtime/src/utils/plugin.ts +++ b/packages/plutono-runtime/grafana-runtime/src/utils/plugin.ts @@ -20,7 +20,7 @@ export interface PluginCssOptions { export const SystemJS = System; /** - * Use this to load css for a Grafana plugin by specifying a {@link PluginCssOptions} + * Use this to load css for a Plutono plugin by specifying a {@link PluginCssOptions} * containing styling for the dark and the light theme. * * @param options - plugin styling for light and dark theme. diff --git a/packages/grafana-runtime/src/utils/queryResponse.test.ts b/packages/plutono-runtime/grafana-runtime/src/utils/queryResponse.test.ts similarity index 99% rename from packages/grafana-runtime/src/utils/queryResponse.test.ts rename to packages/plutono-runtime/grafana-runtime/src/utils/queryResponse.test.ts index 0adb915d2c..5785e452a2 100644 --- a/packages/grafana-runtime/src/utils/queryResponse.test.ts +++ b/packages/plutono-runtime/grafana-runtime/src/utils/queryResponse.test.ts @@ -1,4 +1,4 @@ -import { DataQuery, toDataFrameDTO, DataFrame } from '@grafana/data'; +import { DataQuery, toDataFrameDTO, DataFrame } from '@credativ/plutono-data'; import { toDataQueryResponse } from './queryResponse'; /* eslint-disable */ diff --git a/packages/grafana-runtime/src/utils/queryResponse.ts b/packages/plutono-runtime/grafana-runtime/src/utils/queryResponse.ts similarity index 99% rename from packages/grafana-runtime/src/utils/queryResponse.ts rename to packages/plutono-runtime/grafana-runtime/src/utils/queryResponse.ts index 83f21d872c..390ac4b3ef 100644 --- a/packages/grafana-runtime/src/utils/queryResponse.ts +++ b/packages/plutono-runtime/grafana-runtime/src/utils/queryResponse.ts @@ -12,7 +12,7 @@ import { MetricFindValue, FieldType, DataQuery, -} from '@grafana/data'; +} from '@credativ/plutono-data'; interface DataResponse { error?: string; diff --git a/packages/grafana-runtime/tsconfig.build.json b/packages/plutono-runtime/grafana-runtime/tsconfig.build.json similarity index 100% rename from packages/grafana-runtime/tsconfig.build.json rename to packages/plutono-runtime/grafana-runtime/tsconfig.build.json diff --git a/packages/grafana-runtime/tsconfig.json b/packages/plutono-runtime/grafana-runtime/tsconfig.json similarity index 100% rename from packages/grafana-runtime/tsconfig.json rename to packages/plutono-runtime/grafana-runtime/tsconfig.json diff --git a/packages/grafana-toolkit/.eslintrc b/packages/plutono-toolkit/grafana-toolkit/.eslintrc similarity index 70% rename from packages/grafana-toolkit/.eslintrc rename to packages/plutono-toolkit/grafana-toolkit/.eslintrc index a465b644a3..9f2d51f304 100644 --- a/packages/grafana-toolkit/.eslintrc +++ b/packages/plutono-toolkit/grafana-toolkit/.eslintrc @@ -1,6 +1,6 @@ { "rules": { - "no-restricted-imports": ["error", { "patterns": ["@grafana/runtime"] }] + "no-restricted-imports": ["error", { "patterns": ["@credativ/plutono-runtime"] }] }, "overrides": [ { diff --git a/packages/grafana-toolkit/CHANGELOG.md b/packages/plutono-toolkit/grafana-toolkit/CHANGELOG.md similarity index 58% rename from packages/grafana-toolkit/CHANGELOG.md rename to packages/plutono-toolkit/grafana-toolkit/CHANGELOG.md index 35cb7751af..cc0905ad91 100644 --- a/packages/grafana-toolkit/CHANGELOG.md +++ b/packages/plutono-toolkit/grafana-toolkit/CHANGELOG.md @@ -1,40 +1,40 @@ # 7.3.0-beta1 (2020-10-15) ### Features / Enhancements -* **grafana/toolkit**: expose Jest maxWorkers arg for plugin test & build tasks. [#27724](https://github.com/grafana/grafana/pull/27724), [@domasx2](https://github.com/domasx2) +* **plutono/toolkit**: expose Jest maxWorkers arg for plugin test & build tasks. [#27724](https://github.com/grafana/grafana/pull/27724), [@domasx2](https://github.com/domasx2) # 7.2.1 (2020-10-08) ### Features / Enhancements -* **grafana/toolkit**: Add --coverage flag to plugin build command. [#27743](https://github.com/grafana/grafana/pull/27743), [@gassiss](https://github.com/gassiss) +* **plutono/toolkit**: Add --coverage flag to plugin build command. [#27743](https://github.com/grafana/grafana/pull/27743), [@gassiss](https://github.com/gassiss) # 7.2.0 (2020-09-23) ### Bug Fixes -- **grafana/toolkit**: avoid path.resolve with globby in moveStaticFiles. [#27670](https://github.com/grafana/grafana/pull/27670), [@kennytm](https://github.com/kennytm) +- **plutono/toolkit**: avoid path.resolve with globby in moveStaticFiles. [#27670](https://github.com/grafana/grafana/pull/27670), [@kennytm](https://github.com/kennytm) # 7.0.0 (2020-05-18) ### Bug Fixes -- **@grafana/toolkit**: Use process.cwd() instead of PWD to get directory. [#24677](https://github.com/grafana/grafana/pull/24677), [@zoltanbedi](https://github.com/zoltanbedi) +- **@credativ/plutono-toolkit**: Use process.cwd() instead of PWD to get directory. [#24677](https://github.com/grafana/grafana/pull/24677), [@zoltanbedi](https://github.com/zoltanbedi) # 7.0.0-beta.1 (2020-04-28) ### Features / Enhancements -- **Grafana Toolkit**: Adds template for backend data source. [#23864](https://github.com/grafana/grafana/pull/23864), [@bergquist](https://github.com/bergquist) +- **Plutono Toolkit**: Adds template for backend data source. [#23864](https://github.com/grafana/grafana/pull/23864), [@bergquist](https://github.com/bergquist) # 6.6.0-beta1 (2020-01-20) ### Features / Enhancements -- **grafana/toolkit**: Add option to override webpack config. [#20872](https://github.com/grafana/grafana/pull/20872), [@sebimarkgraf](https://github.com/sebimarkgraf) +- **plutono/toolkit**: Add option to override webpack config. [#20872](https://github.com/grafana/grafana/pull/20872), [@sebimarkgraf](https://github.com/sebimarkgraf) # 6.4.0 (2019-10-01) # 6.4.0-beta2 (2019-09-25) ### Features / Enhancements -- **grafana/toolkit**: Add plugin creation task. [#19207](https://github.com/grafana/grafana/pull/19207), [@dprokop](https://github.com/dprokop) +- **plutono/toolkit**: Add plugin creation task. [#19207](https://github.com/grafana/grafana/pull/19207), [@dprokop](https://github.com/dprokop) # 6.4.0-beta1 (2019-09-17) -First release, see [Readme](https://github.com/grafana/grafana/blob/v6.4.0-beta1/packages/grafana-toolkit/README.md) for details. +First release, see [Readme](https://github.com/credativ/plutono/blob/v6.4.0-beta1/packages/plutono-toolkit/README.md) for details. diff --git a/packages/grafana-toolkit/README.md b/packages/plutono-toolkit/grafana-toolkit/README.md similarity index 59% rename from packages/grafana-toolkit/README.md rename to packages/plutono-toolkit/grafana-toolkit/README.md index d2b85c0f95..bb2e666814 100644 --- a/packages/grafana-toolkit/README.md +++ b/packages/plutono-toolkit/grafana-toolkit/README.md @@ -1,30 +1,30 @@ -> **WARNING: @grafana/toolkit is currently in BETA**. +> **WARNING: @credativ/plutono-toolkit is currently in BETA**. -# grafana-toolkit +# plutono-toolkit -grafana-toolkit is a CLI that enables efficient development of Grafana plugins. We want to help our community focus on the core value of their plugins rather than all the setup required to develop them. +plutono-toolkit is a CLI that enables efficient development of Plutono plugins. We want to help our community focus on the core value of their plugins rather than all the setup required to develop them. ## Getting started -Set up a new plugin with `grafana-toolkit plugin:create` command: +Set up a new plugin with `plutono-toolkit plugin:create` command: ```sh -npx @grafana/toolkit plugin:create my-grafana-plugin -cd my-grafana-plugin +npx @credativ/plutono-toolkit plugin:create my-plutono-plugin +cd my-plutono-plugin yarn install yarn dev ``` -## Update your plugin to use grafana-toolkit +## Update your plugin to use plutono-toolkit -Follow the steps below to start using grafana-toolkit in your existing plugin. +Follow the steps below to start using plutono-toolkit in your existing plugin. -1. Add `@grafana/toolkit` package to your project by running `yarn add @grafana/toolkit` or `npm install @grafana/toolkit`. +1. Add `@credativ/plutono-toolkit` package to your project by running `yarn add @credativ/plutono-toolkit` or `npm install @credativ/plutono-toolkit`. 2. Create `tsconfig.json` file in the root dir of your plugin and paste the code below: ```json { - "extends": "./node_modules/@grafana/toolkit/src/config/tsconfig.plugin.json", + "extends": "./node_modules/@credativ/plutono-toolkit/src/config/tsconfig.plugin.json", "include": ["src", "types"], "compilerOptions": { "rootDir": "./src", @@ -38,7 +38,7 @@ Follow the steps below to start using grafana-toolkit in your existing plugin. ```js module.exports = { - ...require('./node_modules/@grafana/toolkit/src/config/prettier.plugin.config.json'), + ...require('./node_modules/@credativ/plutono-toolkit/src/config/prettier.plugin.config.json'), }; ``` @@ -46,34 +46,34 @@ module.exports = { ```json "scripts": { - "build": "grafana-toolkit plugin:build", - "test": "grafana-toolkit plugin:test", - "dev": "grafana-toolkit plugin:dev", - "watch": "grafana-toolkit plugin:dev --watch" + "build": "plutono-toolkit plugin:build", + "test": "plutono-toolkit plugin:test", + "dev": "plutono-toolkit plugin:dev", + "watch": "plutono-toolkit plugin:dev --watch" }, ``` ## Usage -With grafana-toolkit, we give you a CLI that addresses common tasks performed when working on Grafana plugin: +With plutono-toolkit, we give you a CLI that addresses common tasks performed when working on Plutono plugin: -- `grafana-toolkit plugin:create` -- `grafana-toolkit plugin:dev` -- `grafana-toolkit plugin:test` -- `grafana-toolkit plugin:build` -- `grafana-toolkit plugin:sign` +- `plutono-toolkit plugin:create` +- `plutono-toolkit plugin:dev` +- `plutono-toolkit plugin:test` +- `plutono-toolkit plugin:build` +- `plutono-toolkit plugin:sign` ### Create your plugin -`grafana-toolkit plugin:create plugin-name` +`plutono-toolkit plugin:create plugin-name` -This command creates a new Grafana plugin from template. +This command creates a new Plutono plugin from template. If `plugin-name` is provided, then the template is downloaded to `./plugin-name` directory. Otherwise, it will be downloaded to the current directory. ### Develop your plugin -`grafana-toolkit plugin:dev` +`plutono-toolkit plugin:dev` This command creates a development build that's easy to play with and debug using common browser tooling. @@ -83,7 +83,7 @@ Available options: ### Test your plugin -`grafana-toolkit plugin:test` +`plutono-toolkit plugin:test` This command runs Jest against your codebase. @@ -98,7 +98,7 @@ Available options: ### Build your plugin -`grafana-toolkit plugin:build` +`plutono-toolkit plugin:build` This command creates a production-ready build of your plugin. @@ -109,40 +109,40 @@ Available options: ### Sign your plugin -`grafana-toolkit plugin:sign` +`plutono-toolkit plugin:sign` -This command creates a signed MANIFEST.txt file which Grafana uses to validate the integrity of the plugin. +This command creates a signed MANIFEST.txt file which Plutono uses to validate the integrity of the plugin. Available options: - `--signatureType` - The [type of Signature](https://grafana.com/legal/plugins/) you are generating: `private`, `community` or `commercial` -- `--rootUrls` - For private signatures, a list of the Grafana instance URLs that the plugin will be used on +- `--rootUrls` - For private signatures, a list of the Plutono instance URLs that the plugin will be used on -To generate a signature, you will need to sign up for a free account on https://grafana.com, create an API key with the Plugin Publisher role, and pass that in the `GRAFANA_API_KEY` environment variable. +To generate a signature, you will need to sign up for a free account on https://grafana.com, create an API key with the Plugin Publisher role, and pass that in the `PLUTONO_API_KEY` environment variable. ## FAQ -### Which version of grafana-toolkit should I use? +### Which version of plutono-toolkit should I use? -See [Grafana packages versioning guide](https://github.com/grafana/grafana/blob/master/packages/README.md#versioning). +See [Plutono packages versioning guide](https://github.com/credativ/plutono/blob/master/packages/README.md#versioning). -### What tools does grafana-toolkit use? +### What tools does plutono-toolkit use? -grafana-toolkit comes with TypeScript, ESLint, Prettier, Jest, CSS and SASS support. +plutono-toolkit comes with TypeScript, ESLint, Prettier, Jest, CSS and SASS support. -### How to start using grafana-toolkit in my plugin? +### How to start using plutono-toolkit in my plugin? -See [Updating your plugin to use grafana-toolkit](#updating-your-plugin-to-use-grafana-toolkit). +See [Updating your plugin to use plutono-toolkit](#updating-your-plugin-to-use-plutono-toolkit). -### Can I use TypeScript to develop Grafana plugins? +### Can I use TypeScript to develop Plutono plugins? -Yes! grafana-toolkit supports TypeScript by default. +Yes! plutono-toolkit supports TypeScript by default. ### How can I test my plugin? -grafana-toolkit comes with Jest as a test runner. +plutono-toolkit comes with Jest as a test runner. -Internally at Grafana we use Enzyme. If you are developing React plugin and you want to configure Enzyme as a testing utility, then you need to configure `enzyme-adapter-react`. To do so, create `/config/jest-setup.ts` file that will provide necessary setup. Copy the following code into that file to get Enzyme working with React: +Internally at Plutono we use Enzyme. If you are developing React plugin and you want to configure Enzyme as a testing utility, then you need to configure `enzyme-adapter-react`. To do so, create `/config/jest-setup.ts` file that will provide necessary setup. Copy the following code into that file to get Enzyme working with React: ```ts import { configure } from 'enzyme'; @@ -193,12 +193,12 @@ The styles will be injected via `style` tag during runtime. #### Theme-specific stylesheets -If you want to provide different stylesheets for dark/light theme, then create `dark.[css|scss]` and `light.[css|scss]` files in the `src/styles` directory of your plugin. grafana-toolkit generates theme-specific stylesheets that are stored in `dist/styles` directory. +If you want to provide different stylesheets for dark/light theme, then create `dark.[css|scss]` and `light.[css|scss]` files in the `src/styles` directory of your plugin. plutono-toolkit generates theme-specific stylesheets that are stored in `dist/styles` directory. -In order for Grafana to pick up your theme stylesheets, you need to use `loadPluginCss` from `@grafana/runtime` package. Typically you would do that in the entry point of your plugin: +In order for Plutono to pick up your theme stylesheets, you need to use `loadPluginCss` from `@credativ/plutono-runtime` package. Typically you would do that in the entry point of your plugin: ```ts -import { loadPluginCss } from '@grafana/runtime'; +import { loadPluginCss } from '@credativ/plutono-runtime'; loadPluginCss({ dark: 'plugins//styles/dark.css', @@ -206,13 +206,13 @@ loadPluginCss({ }); ``` -You must add `@grafana/runtime` to your plugin dependencies by running `yarn add @grafana/runtime` or `npm install @grafana/runtime`. +You must add `@credativ/plutono-runtime` to your plugin dependencies by running `yarn add @credativ/plutono-runtime` or `npm install @credativ/plutono-runtime`. > **Note:** that in this case static files (png, svg, json, html) are all copied to dist directory when the plugin is bundled. Relative paths to those files does not change! #### Emotion -Starting from Grafana 6.2 _our suggested way_ for styling plugins is by using [Emotion](https://emotion.sh). It's a CSS-in-JS library that we use internally at Grafana. The biggest advantage of using Emotion is that you can access Grafana Theme variables. +Starting from Plutono 6.2 _our suggested way_ for styling plugins is by using [Emotion](https://emotion.sh). It's a CSS-in-JS library that we use internally at Plutono. The biggest advantage of using Emotion is that you can access Plutono Theme variables. To start using Emotion, you first must add it to your plugin dependencies: @@ -240,7 +240,7 @@ const MyComponent = () => { }; ``` -To learn more about using Grafana theme please refer to [Theme usage guide](https://github.com/grafana/grafana/blob/master/style_guides/themes.md#react) +To learn more about using Plutono theme please refer to [Theme usage guide](https://github.com/credativ/plutono/blob/master/style_guides/themes.md#react) > We do not support Emotion's `css` prop. Use className instead! @@ -250,7 +250,7 @@ Yes! However, it's important that your `tsconfig.json` file contains the followi ```json { - "extends": "./node_modules/@grafana/toolkit/src/config/tsconfig.plugin.json", + "extends": "./node_modules/@credativ/plutono-toolkit/src/config/tsconfig.plugin.json", "include": ["src"], "compilerOptions": { "rootDir": "./src", @@ -261,11 +261,11 @@ Yes! However, it's important that your `tsconfig.json` file contains the followi ### Can I adjust ESLint configuration to suit my needs? -grafana-toolkit comes with [default config for ESLint](https://github.com/grafana/grafana/blob/master/packages/grafana-toolkit/src/config/eslint.plugin.json). For now, there is no way to customise ESLint config. +plutono-toolkit comes with [default config for ESLint](https://github.com/credativ/plutono/blob/master/packages/plutono-toolkit/src/config/eslint.plugin.json). For now, there is no way to customise ESLint config. -### How is Prettier integrated into grafana-toolkit workflow? +### How is Prettier integrated into plutono-toolkit workflow? -When building plugin with [`grafana-toolkit plugin:build`](#building-plugin) task, grafana-toolkit performs Prettier check. If the check detects any Prettier issues, the build will not pass. To avoid such situation we suggest developing plugin with [`grafana-toolkit plugin:dev --watch`](#developing-plugin) task running. This task tries to fix Prettier issues automatically. +When building plugin with [`plutono-toolkit plugin:build`](#building-plugin) task, plutono-toolkit performs Prettier check. If the check detects any Prettier issues, the build will not pass. To avoid such situation we suggest developing plugin with [`plutono-toolkit plugin:dev --watch`](#developing-plugin) task running. This task tries to fix Prettier issues automatically. ### My editor does not respect Prettier config, what should I do? @@ -273,7 +273,7 @@ In order for your editor to pick up our Prettier config you need to create `.pre ```js module.exports = { - ...require('./node_modules/@grafana/toolkit/src/config/prettier.plugin.config.json'), + ...require('./node_modules/@credativ/plutono-toolkit/src/config/prettier.plugin.config.json'), }; ``` @@ -287,38 +287,38 @@ If you are using version `canary`, this error occurs because a `canary` release ### I am getting this message when I run my plugin: `Unable to dynamically transpile ES module A loader plugin needs to be configured via SystemJS.config({ transpiler: 'transpiler-module' }).` -This error occurs when you bundle your plugin using the `grafana-toolkit plugin:dev` task and your code comments include ES2016 code. +This error occurs when you bundle your plugin using the `plutono-toolkit plugin:dev` task and your code comments include ES2016 code. There are two issues at play: -- The `grafana-toolkit plugin:dev` task does not remove comments from your bundled package. -- Grafana does not support [ES modules](https://hacks.mozilla.org/2018/03/es-modules-a-cartoon-deep-dive/). +- The `plutono-toolkit plugin:dev` task does not remove comments from your bundled package. +- Plutono does not support [ES modules](https://hacks.mozilla.org/2018/03/es-modules-a-cartoon-deep-dive/). -If your comments include ES2016 code, then SystemJS v0.20.19, which Grafana uses internally to load plugins, interprets your code as an ESM and fails. +If your comments include ES2016 code, then SystemJS v0.20.19, which Plutono uses internally to load plugins, interprets your code as an ESM and fails. To fix this error, remove the ES2016 code from your comments. -## Contribute to grafana-toolkit +## Contribute to plutono-toolkit -You can contribute to grafana-toolkit by helping develop it or by debugging it. +You can contribute to plutono-toolkit by helping develop it or by debugging it. -### Develop grafana-toolkit +### Develop plutono-toolkit -Typically plugins should be developed using the `@grafana/toolkit` installed from npm. However, when working on the toolkit, you might want to use the local version. Follow the steps below to develop with a local version: +Typically plugins should be developed using the `@credativ/plutono-toolkit` installed from npm. However, when working on the toolkit, you might want to use the local version. Follow the steps below to develop with a local version: -1. Clone [Grafana repository](https://github.com/grafana/grafana). -2. Navigate to the directory you have cloned Grafana repo to and then run `yarn install --pure-lockfile`. -3. Navigate to `/packages/grafana-toolkit` and then run `yarn link`. -4. Navigate to the directory where your plugin code is and then run `npx grafana-toolkit plugin:dev --yarnlink`. This adds all dependencies required by grafana-toolkit to your project, as well as link your local grafana-toolkit version to be used by the plugin. +1. Clone [Plutono repository](https://github.com/grafana/grafana). +2. Navigate to the directory you have cloned Plutono repo to and then run `yarn install --pure-lockfile`. +3. Navigate to `/packages/plutono-toolkit` and then run `yarn link`. +4. Navigate to the directory where your plugin code is and then run `npx plutono-toolkit plugin:dev --yarnlink`. This adds all dependencies required by plutono-toolkit to your project, as well as link your local plutono-toolkit version to be used by the plugin. -### Debug grafana-toolkit +### Debug plutono-toolkit -To debug grafana-toolkit you can use standard [NodeJS debugging methods](https://nodejs.org/de/docs/guides/debugging-getting-started/#enable-inspector) (`node --inspect`, `node --inspect-brk`). +To debug plutono-toolkit you can use standard [NodeJS debugging methods](https://nodejs.org/de/docs/guides/debugging-getting-started/#enable-inspector) (`node --inspect`, `node --inspect-brk`). -To run grafana-toolkit in a debugging session use the following command in the toolkit's directory: +To run plutono-toolkit in a debugging session use the following command in the toolkit's directory: -`node --inspect-brk ./bin/grafana-toolkit.js [task]` +`node --inspect-brk ./bin/plutono-toolkit.js [task]` -To run [linked](#develop-grafana-toolkit) grafana-toolkit in a debugging session use the following command in the plugin's directory: +To run [linked](#develop-plutono-toolkit) plutono-toolkit in a debugging session use the following command in the plugin's directory: -`node --inspect-brk ./node_modules/@grafana/toolkit/bin/grafana-toolkit.js [task]` +`node --inspect-brk ./node_modules/@credativ/plutono-toolkit/bin/plutono-toolkit.js [task]` diff --git a/packages/grafana-toolkit/bin/grafana-toolkit.js b/packages/plutono-toolkit/grafana-toolkit/bin/plutono-toolkit.js similarity index 89% rename from packages/grafana-toolkit/bin/grafana-toolkit.js rename to packages/plutono-toolkit/grafana-toolkit/bin/plutono-toolkit.js index 8776081ccd..6743a7e93f 100755 --- a/packages/grafana-toolkit/bin/grafana-toolkit.js +++ b/packages/plutono-toolkit/grafana-toolkit/bin/plutono-toolkit.js @@ -10,12 +10,12 @@ const isLinkedMode = () => { // rather than the present working directory. const pwd = process.env.CIRCLE_WORKING_DIRECTORY || process.env.PWD || process.cwd(); - if (path.basename(pwd) === 'grafana-toolkit') { + if (path.basename(pwd) === 'plutono-toolkit') { return true; } try { - const resolvedPath = path.resolve(`${__dirname}/../../../node_modules/@grafana/toolkit`); + const resolvedPath = path.resolve(`${__dirname}/../../../node_modules/@credativ/plutono-toolkit`); return fs.lstatSync(resolvedPath).isSymbolicLink(); } catch { return false; @@ -27,7 +27,7 @@ const entrypoint = () => { const resolvedJsDir = path.resolve(`${entrypointBase}.js`); const resolvedTsDir = path.resolve(`${entrypointBase}.ts`); - // IF we have a toolkit directory AND linked grafana toolkit AND the toolkit dir is a symbolic lik + // IF we have a toolkit directory AND linked plutono toolkit AND the toolkit dir is a symbolic lik // THEN run everything in linked mode if (isLinkedMode() || !fs.existsSync(resolvedJsDir)) { console.log('Running in local/linked mode'); diff --git a/packages/grafana-toolkit/config/circleci/config.yml b/packages/plutono-toolkit/grafana-toolkit/config/circleci/config.yml similarity index 86% rename from packages/grafana-toolkit/config/circleci/config.yml rename to packages/plutono-toolkit/grafana-toolkit/config/circleci/config.yml index 09c1f3a067..218b2fe34d 100644 --- a/packages/grafana-toolkit/config/circleci/config.yml +++ b/packages/plutono-toolkit/grafana-toolkit/config/circleci/config.yml @@ -58,10 +58,10 @@ workflows: executors: default_exec: # declares a reusable executor docker: - - image: srclosson/grafana-plugin-ci-alpine:latest + - image: srclosson/plutono-plugin-ci-alpine:latest e2e_exec: docker: - - image: srclosson/grafana-plugin-ci-e2e:latest + - image: srclosson/plutono-plugin-ci-e2e:latest jobs: yarn_install: @@ -76,7 +76,7 @@ jobs: name: Install dependencies command: | mkdir ci - [ -f ~/project/node_modules/.bin/grafana-toolkit ] || yarn install --frozen-lockfile + [ -f ~/project/node_modules/.bin/plutono-toolkit ] || yarn install --frozen-lockfile - save_cache: name: save node_modules paths: @@ -99,7 +99,7 @@ jobs: - run: name: Build docs command: | - ./node_modules/.bin/grafana-toolkit plugin:ci-docs + ./node_modules/.bin/plutono-toolkit plugin:ci-docs [ -d "dist" ] || circleci-agent step halt - persist_to_workspace: root: . @@ -116,7 +116,7 @@ jobs: - build-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }} - run: name: Build and test frontend - command: ./node_modules/.bin/grafana-toolkit plugin:ci-build + command: ./node_modules/.bin/plutono-toolkit plugin:ci-build - persist_to_workspace: root: . paths: @@ -159,18 +159,18 @@ jobs: at: . - run: name: Move results to ci folder - command: ./node_modules/.bin/grafana-toolkit plugin:ci-build --finish + command: ./node_modules/.bin/plutono-toolkit plugin:ci-build --finish - run: name: Package distribution command: | - ./node_modules/.bin/grafana-toolkit plugin:ci-package + ./node_modules/.bin/plutono-toolkit plugin:ci-package - persist_to_workspace: root: . paths: - ci/jobs/package - ci/packages - ci/dist - - ci/grafana-test-env + - ci/plutono-test-env - store_artifacts: path: ci @@ -187,7 +187,7 @@ jobs: - << pipeline.parameters.ssh-fingerprint >> - run: name: Checkout provisioning files - command: git clone --depth 1 git@github.com:grafana/plugin-provisioning.git + command: git clone --depth 1 git@github.com:plutono/plugin-provisioning.git - run: name: Prepare task output dir command: | @@ -223,29 +223,29 @@ jobs: command: | [ -d cypress ] || circleci-agent step halt - run: - name: Setup Grafana (local install) + name: Setup Plutono (local install) command: | ginstall canary - /opt/grafana/bin/grafana-server -config ci/grafana-test-env/custom.ini -homepath /opt/grafana & - ## To make sure grafana has started up + /opt/plutono/bin/plutono-server -config ci/plutono-test-env/custom.ini -homepath /opt/plutono & + ## To make sure plutono has started up while ! $(netstat -tulpn | grep 3000 >/dev/null 2>&1); do sleep 1; done - /opt/grafana/bin/grafana-cli --version + /opt/plutono/bin/plutono-cli --version - run: name: Copy provisioning files command: cp -r ci/jobs/provisioning provisioning/ - run: name: Run e2e tests command: | - # If the tests fail, but GRAFANACI_STRICT_E2E=0, don't worry about it - ./node_modules/.bin/grafana-e2e run \ + # If the tests fail, but PLUTONOCI_STRICT_E2E=0, don't worry about it + ./node_modules/.bin/plutono-e2e run \ || ( - [ "$GRAFANACI_STRICT_E2E" -eq 0 ] && echo "Bypassing fail. ci-nostrict enabled" + [ "$PLUTONOCI_STRICT_E2E" -eq 0 ] && echo "Bypassing fail. ci-nostrict enabled" ) - run: when: always name: Prepare task output dir command: | - # TODO: probably move all of this to `@grafana/toolkit plugin:ci-test` + # TODO: probably move all of this to `@credativ/plutono-toolkit plugin:ci-test` mkdir ci/jobs/e2e_canary # only copy if they exist cp cypress/screenshots/*.* ci/jobs/e2e_canary 2>/dev/null || : @@ -272,7 +272,7 @@ jobs: - run: name: Toolkit report command: | - ./node_modules/.bin/grafana-toolkit plugin:ci-report + ./node_modules/.bin/plutono-toolkit plugin:ci-report - store_artifacts: path: ci @@ -292,4 +292,4 @@ jobs: - run: name: "Publish Release on GitHub" command: | - ./node_modules/.bin/grafana-toolkit plugin:github-publish + ./node_modules/.bin/plutono-toolkit plugin:github-publish diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/Dockerfile similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/Dockerfile diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/README.md b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/README.md similarity index 62% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/README.md rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/README.md index bb852b616d..c7600734d6 100644 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/README.md +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/README.md @@ -1,6 +1,6 @@ # Using this docker image -Uploaded to dockerhub as grafana/grafana-plugin-ci:latest-alpine +Uploaded to dockerhub as plutono/plutono-plugin-ci:latest-alpine Based off of `circleci/node:12-browsers` @@ -20,12 +20,12 @@ The home directory will be `/home/circleci` All of the above directories are in the path, so there is no need to specify fully qualified paths. -## Grafana -- Installed in `/home/circleci/src/grafana` +## Plutono +- Installed in `/home/circleci/src/plutono` - `yarn install` has been run ## Integration/Release Testing -There are 4 previous versions pre-downloaded to /usr/local/grafana. These versions are: +There are 4 previous versions pre-downloaded to /usr/local/plutono. These versions are: 1. 6.6.2 2. 6.5.3 3. 6.4.5 @@ -34,18 +34,18 @@ There are 4 previous versions pre-downloaded to /usr/local/grafana. These versio To test, your CircleCI config will need a run section with something similar to the following ``` - run: - name: Setup Grafana (local install) + name: Setup Plutono (local install) command: | - sudo dpkg -i /usr/local/grafana/deb/grafana_6.6.2_amd64.deb - sudo cp ci/grafana-test-env/custom.ini /usr/share/grafana/conf/custom.ini - sudo cp ci/grafana-test-env/custom.ini /etc/grafana/grafana.ini - sudo service grafana-server start - grafana-cli --version + sudo dpkg -i /usr/local/plutono/deb/plutono_6.6.2_amd64.deb + sudo cp ci/plutono-test-env/custom.ini /usr/share/plutono/conf/custom.ini + sudo cp ci/plutono-test-env/custom.ini /etc/plutono/plutono.ini + sudo service plutono-server start + plutono-cli --version ``` # Building -To build, cd to `/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine` +To build, cd to `/packages/plutono-toolkit/docker/plutono-plugin-ci-alpine` ``` ./build.sh ``` diff --git a/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/build.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/build.sh new file mode 100755 index 0000000000..eef6ce86a5 --- /dev/null +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/build.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -eo pipefail + +source ./common.sh + +# +# No longer required, but useful to keep just in case we want to deploy +# changes in toolkit directly to the docker image +# +if [ -n "$INCLUDE_TOOLKIT" ]; then + /bin/rm -rfv install/plutono-toolkit + mkdir -pv install/plutono-toolkit + cp -rv ../../bin install/plutono-toolkit + cp -rv ../../src install/plutono-toolkit + cp -v ../../package.json install/plutono-toolkit + cp -v ../../tsconfig.json install/plutono-toolkit +fi + +docker build -t ${DOCKER_IMAGE_NAME} . +docker push $DOCKER_IMAGE_NAME + +[ -n "$INCLUDE_TOOLKIT" ] && /bin/rm -rfv install/plutono-toolkit diff --git a/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/common.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/common.sh new file mode 100755 index 0000000000..af76747b03 --- /dev/null +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/common.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +## +## Common variable declarations +## + +DOCKER_IMAGE_NAME="plutono/plutono-plugin-ci:1.2.0-alpine" diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/install/bin/cp b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/install/bin/cp similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/install/bin/cp rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/install/bin/cp diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/install/bin/ginstall b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/install/bin/ginstall similarity index 64% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/install/bin/ginstall rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/install/bin/ginstall index b82fd3e54a..d7ba92bcfe 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/install/bin/ginstall +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/install/bin/ginstall @@ -1,12 +1,12 @@ #!/bin/sh ## # gget -# A script to get and install grafana versions +# A script to get and install plutono versions # for usage information see "show_help" below. # -latest=$(wget -O - 'https://raw.githubusercontent.com/grafana/grafana/master/latest.json' | jq -r '.stable') -canary=$(wget -O - "https://grafana.com/api/grafana/versions" | jq ".items[0].version" | tr -d '"') +latest=$(wget -O - 'https://raw.githubusercontent.com/plutono/plutono/master/latest.json' | jq -r '.stable') +canary=$(wget -O - "https://grafana.com/api/plutono/versions" | jq ".items[0].version" | tr -d '"') show_help() { echo "Usage: gget " @@ -59,15 +59,15 @@ fi version=$1 if [ "$version" == "latest" ]; then version="$latest" - wget -O - "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz" | tar -C /opt -zxf - + wget -O - "https://dl.grafana.com/oss/release/plutono-${version}.linux-amd64.tar.gz" | tar -C /opt -zxf - elif [ "$version" == "canary" ]; then version="$canary" - wget -O - "https://dl.grafana.com/oss/master/grafana-${version}.linux-amd64.tar.gz" | tar -C /opt -zxf - + wget -O - "https://dl.grafana.com/oss/master/plutono-${version}.linux-amd64.tar.gz" | tar -C /opt -zxf - else - wget -O - "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz" | tar -C /opt -zxf - + wget -O - "https://dl.grafana.com/oss/release/plutono-${version}.linux-amd64.tar.gz" | tar -C /opt -zxf - fi -/bin/rm -rf /opt/grafana > /dev/null 2>&1 || true -ln -s /opt/grafana-${version} /opt/grafana +/bin/rm -rf /opt/plutono > /dev/null 2>&1 || true +ln -s /opt/plutono-${version} /opt/plutono -# nohup /opt/grafana/bin/grafana-server -config /opt/grafana/conf/defaults.ini -homepath /opt/grafana >/dev/null 2>&1 & +# nohup /opt/plutono/bin/plutono-server -config /opt/plutono/conf/defaults.ini -homepath /opt/plutono >/dev/null 2>&1 & diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/install/bin/githubRelease.js b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/install/bin/githubRelease.js similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/install/bin/githubRelease.js rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/install/bin/githubRelease.js diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy-common.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/scripts/deploy-common.sh similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy-common.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/scripts/deploy-common.sh diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy-user.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/scripts/deploy-user.sh similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy-user.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/scripts/deploy-user.sh diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/scripts/deploy.sh similarity index 90% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/scripts/deploy.sh index b924b38a64..3f90f4d8a7 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/scripts/deploy.sh @@ -43,7 +43,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l "e1be1930379bd169d3a8e82135cf57216ad52ecfaf520b5804f269721e4dcc3d" chmod 755 /usr/local/bin/cc-test-reporter -curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.38/grabpl" +curl -fL -o /usr/local/bin/grabpl "https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.38/grabpl" apk add --no-cache git # Install Mage @@ -60,10 +60,10 @@ for file in $(ls $HOME/go/bin); do mv -v $HOME/go/bin/$file /usr/local/bin/$file done -# Install grafana-toolkit deps +# Install plutono-toolkit deps current_dir=$PWD -cd /usr/local/grafana-toolkit && yarn install && cd $current_dir -ln -s /usr/local/grafana-toolkit/bin/grafana-toolkit.js /usr/local/bin/grafana-toolkit +cd /usr/local/plutono-toolkit && yarn install && cd $current_dir +ln -s /usr/local/plutono-toolkit/bin/plutono-toolkit.js /usr/local/bin/plutono-toolkit GOOGLE_SDK_VERSION=316.0.0 GOOGLE_SDK_CHECKSUM=96a0b75474dbfa9f3d46dcdec7a4d68a664cb7d57fade5710fe88b1fdf6babb3 diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/test/docker-compose.yml b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/test/docker-compose.yml similarity index 70% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/test/docker-compose.yml rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/test/docker-compose.yml index 9a3e53f2cc..e822e48450 100644 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/test/docker-compose.yml +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/test/docker-compose.yml @@ -7,12 +7,12 @@ services: - ../scripts:/home/circleci/scripts - ../install:/home/circleci/install - ${HOME}/.ssh:/root/.ssh - - ../../..:/home/circleci/grafana-toolkit + - ../../..:/home/circleci/plutono-toolkit cibuilt: - image: "grafana/grafana-plugin-ci:latest-alpine" + image: "plutono/plutono-plugin-ci:latest-alpine" user: root volumes: - ../scripts:/home/circleci/scripts - ../install:/home/circleci/install - ${HOME}/.ssh:/root/.ssh - - ../../..:/home/circleci/grafana-toolkit + - ../../..:/home/circleci/plutono-toolkit diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/test/start.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/test/start.sh similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/test/start.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-alpine/test/start.sh diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/Dockerfile b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/Dockerfile similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/Dockerfile rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/Dockerfile diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/README.md b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/README.md similarity index 66% rename from packages/grafana-toolkit/docker/grafana-plugin-ci/README.md rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/README.md index 51f67cf406..887847f449 100644 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci/README.md +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/README.md @@ -20,12 +20,12 @@ The home directory will be `/home/circleci` All of the above directories are in the path, so there is no need to specify fully qualified paths. -## Grafana -- Installed in `/home/circleci/src/grafana` +## Plutono +- Installed in `/home/circleci/src/plutono` - `yarn install` has been run ## Integration/Release Testing -There are 4 previous versions pre-downloaded to /usr/local/grafana. These versions are: +There are 4 previous versions pre-downloaded to /usr/local/plutono. These versions are: 1. 6.6.2 2. 6.5.3 3. 6.4.5 @@ -34,18 +34,18 @@ There are 4 previous versions pre-downloaded to /usr/local/grafana. These versio To test, your CircleCI config will need a run section with something similar to the following ``` - run: - name: Setup Grafana (local install) + name: Setup Plutono (local install) command: | - sudo dpkg -i /usr/local/grafana/deb/grafana_6.6.2_amd64.deb - sudo cp ci/grafana-test-env/custom.ini /usr/share/grafana/conf/custom.ini - sudo cp ci/grafana-test-env/custom.ini /etc/grafana/grafana.ini - sudo service grafana-server start - grafana-cli --version + sudo dpkg -i /usr/local/plutono/deb/plutono_6.6.2_amd64.deb + sudo cp ci/plutono-test-env/custom.ini /usr/share/plutono/conf/custom.ini + sudo cp ci/plutono-test-env/custom.ini /etc/plutono/plutono.ini + sudo service plutono-server start + plutono-cli --version ``` # Building -To build, cd to `/packages/grafana-toolkit/docker/grafana-plugin-ci` +To build, cd to `/packages/plutono-toolkit/docker/plutono-plugin-ci` ``` ./build.sh ``` diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/build.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/build.sh similarity index 55% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/build.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/build.sh index 14ca02a1dc..5645836d38 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/build.sh +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/build.sh @@ -8,12 +8,12 @@ source ./common.sh # changes in toolkit directly to the docker image # if [ -n "$INCLUDE_TOOLKIT" ]; then - /bin/rm -rfv install/grafana-toolkit - mkdir -pv install/grafana-toolkit - cp -rv ../../bin install/grafana-toolkit - cp -rv ../../src install/grafana-toolkit - cp -v ../../package.json install/grafana-toolkit - cp -v ../../tsconfig.json install/grafana-toolkit + /bin/rm -rfv install/plutono-toolkit + mkdir -pv install/plutono-toolkit + cp -rv ../../bin install/plutono-toolkit + cp -rv ../../src install/plutono-toolkit + cp -v ../../package.json install/plutono-toolkit + cp -v ../../tsconfig.json install/plutono-toolkit fi docker build -t ${DOCKER_IMAGE_NAME} . @@ -21,4 +21,4 @@ docker push $DOCKER_IMAGE_NAME docker tag ${DOCKER_IMAGE_NAME} ${DOCKER_IMAGE_BASE_NAME}:latest docker push ${DOCKER_IMAGE_BASE_NAME}:latest -[ -n "$INCLUDE_TOOLKIT" ] && /bin/rm -rfv install/grafana-toolkit +[ -n "$INCLUDE_TOOLKIT" ] && /bin/rm -rfv install/plutono-toolkit diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/common.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/common.sh similarity index 73% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/common.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/common.sh index 98d0f02ee2..851cf5db33 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/common.sh +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/common.sh @@ -4,6 +4,6 @@ ## Common variable declarations ## -DOCKER_IMAGE_BASE_NAME="grafana/grafana-plugin-ci-e2e" +DOCKER_IMAGE_BASE_NAME="plutono/plutono-plugin-ci-e2e" DOCKER_IMAGE_VERSION="1.2.0" DOCKER_IMAGE_NAME="${DOCKER_IMAGE_BASE_NAME}:${DOCKER_IMAGE_VERSION}" diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/install/ginstall b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/install/ginstall similarity index 64% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/install/ginstall rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/install/ginstall index 13a30ffbd0..da2530d48c 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/install/ginstall +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/install/ginstall @@ -1,12 +1,12 @@ #!/bin/bash ## # gget -# A script to get and install grafana versions +# A script to get and install plutono versions # for usage information see "show_help" below. # -latest=$(wget -O - 'https://raw.githubusercontent.com/grafana/grafana/master/latest.json' | jq -r '.stable') -canary=$(wget -O - "https://grafana.com/api/grafana/versions" | jq ".items[0].version" | tr -d '"') +latest=$(wget -O - 'https://raw.githubusercontent.com/plutono/plutono/master/latest.json' | jq -r '.stable') +canary=$(wget -O - "https://grafana.com/api/plutono/versions" | jq ".items[0].version" | tr -d '"') show_help() { echo "Usage: gget " @@ -59,15 +59,15 @@ fi version=$1 if [ "$version" == "latest" ]; then version="$latest" - wget -O - "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz" | tar -C /opt -zxf - + wget -O - "https://dl.grafana.com/oss/release/plutono-${version}.linux-amd64.tar.gz" | tar -C /opt -zxf - elif [ "$version" == "canary" ]; then version="$canary" - wget -O - "https://dl.grafana.com/oss/master/grafana-${version}.linux-amd64.tar.gz" | tar -C /opt -zxf - + wget -O - "https://dl.grafana.com/oss/master/plutono-${version}.linux-amd64.tar.gz" | tar -C /opt -zxf - else - wget -O - "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz" | tar -C /opt -zxf - + wget -O - "https://dl.grafana.com/oss/release/plutono-${version}.linux-amd64.tar.gz" | tar -C /opt -zxf - fi -/bin/rm -rf /opt/grafana > /dev/null 2>&1 || true -ln -s /opt/grafana-${version} /opt/grafana +/bin/rm -rf /opt/plutono > /dev/null 2>&1 || true +ln -s /opt/plutono-${version} /opt/plutono -# nohup /opt/grafana/bin/grafana-server -config /opt/grafana/conf/defaults.ini -homepath /opt/grafana >/dev/null 2>&1 & +# nohup /opt/plutono/bin/plutono-server -config /opt/plutono/conf/defaults.ini -homepath /opt/plutono >/dev/null 2>&1 & diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-common.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/scripts/deploy-common.sh similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-common.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/scripts/deploy-common.sh diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-slim.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/scripts/deploy-slim.sh similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-slim.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/scripts/deploy-slim.sh diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-user.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/scripts/deploy-user.sh similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-user.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/scripts/deploy-user.sh diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/scripts/deploy.sh similarity index 94% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/scripts/deploy.sh index aaa628aea0..4a3b3968a5 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/scripts/deploy.sh @@ -44,7 +44,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l "e1be1930379bd169d3a8e82135cf57216ad52ecfaf520b5804f269721e4dcc3d" chmod 755 /usr/local/bin/cc-test-reporter -wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.38/grabpl" +wget -O /usr/local/bin/grabpl "https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.38/grabpl" chmod +x /usr/local/bin/grabpl # Install Mage diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/test/docker-compose.yml b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/test/docker-compose.yml similarity index 73% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/test/docker-compose.yml rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/test/docker-compose.yml index 5d6297c483..1a74dcc353 100644 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/test/docker-compose.yml +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/test/docker-compose.yml @@ -7,12 +7,12 @@ services: - ../scripts:/root/scripts - ../install:/root/install - ${HOME}/.ssh:/root/.ssh - - ../../..:/root/grafana-toolkit + - ../../..:/root/plutono-toolkit cibuilt: - image: "grafana/grafana-plugin-ci-e2e" + image: "plutono/plutono-plugin-ci-e2e" user: root volumes: - ../scripts:/root/scripts - ../install:/root/install - ${HOME}/.ssh:/root/.ssh - - ../../..:/root/grafana-toolkit + - ../../..:/root/plutono-toolkit diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/test/start.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/test/start.sh similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/test/start.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci-e2e/test/start.sh diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/Dockerfile b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/Dockerfile similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci/Dockerfile rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/Dockerfile diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/README.md b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/README.md similarity index 66% rename from packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/README.md rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/README.md index 51f67cf406..887847f449 100644 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/README.md +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/README.md @@ -20,12 +20,12 @@ The home directory will be `/home/circleci` All of the above directories are in the path, so there is no need to specify fully qualified paths. -## Grafana -- Installed in `/home/circleci/src/grafana` +## Plutono +- Installed in `/home/circleci/src/plutono` - `yarn install` has been run ## Integration/Release Testing -There are 4 previous versions pre-downloaded to /usr/local/grafana. These versions are: +There are 4 previous versions pre-downloaded to /usr/local/plutono. These versions are: 1. 6.6.2 2. 6.5.3 3. 6.4.5 @@ -34,18 +34,18 @@ There are 4 previous versions pre-downloaded to /usr/local/grafana. These versio To test, your CircleCI config will need a run section with something similar to the following ``` - run: - name: Setup Grafana (local install) + name: Setup Plutono (local install) command: | - sudo dpkg -i /usr/local/grafana/deb/grafana_6.6.2_amd64.deb - sudo cp ci/grafana-test-env/custom.ini /usr/share/grafana/conf/custom.ini - sudo cp ci/grafana-test-env/custom.ini /etc/grafana/grafana.ini - sudo service grafana-server start - grafana-cli --version + sudo dpkg -i /usr/local/plutono/deb/plutono_6.6.2_amd64.deb + sudo cp ci/plutono-test-env/custom.ini /usr/share/plutono/conf/custom.ini + sudo cp ci/plutono-test-env/custom.ini /etc/plutono/plutono.ini + sudo service plutono-server start + plutono-cli --version ``` # Building -To build, cd to `/packages/grafana-toolkit/docker/grafana-plugin-ci` +To build, cd to `/packages/plutono-toolkit/docker/plutono-plugin-ci` ``` ./build.sh ``` diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/build.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/build.sh similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci/build.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/build.sh diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/common.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/common.sh similarity index 50% rename from packages/grafana-toolkit/docker/grafana-plugin-ci/common.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/common.sh index ebd1e7ad9e..d04dba5173 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci/common.sh +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/common.sh @@ -4,4 +4,4 @@ ## Common variable declarations ## -DOCKER_IMAGE_NAME="grafana/grafana-plugin-ci:1.2.0" +DOCKER_IMAGE_NAME="plutono/plutono-plugin-ci:1.2.0" diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/install/gget b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/install/gget similarity index 70% rename from packages/grafana-toolkit/docker/grafana-plugin-ci/install/gget rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/install/gget index 955eb47f9d..f0aeef1a2e 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci/install/gget +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/install/gget @@ -1,12 +1,12 @@ #!/bin/bash ## # gget -# A script to get and install grafana versions +# A script to get and install plutono versions # for usage information see "show_help" below. # -latest=$(curl -s 'https://raw.githubusercontent.com/grafana/grafana/master/latest.json' | jq -r '.stable') -canary=$(curl -s "https://grafana.com/api/grafana/versions" | jq ".items[0].version" | tr -d '"') +latest=$(curl -s 'https://raw.githubusercontent.com/plutono/plutono/master/latest.json' | jq -r '.stable') +canary=$(curl -s "https://grafana.com/api/plutono/versions" | jq ".items[0].version" | tr -d '"') show_help() { echo "Usage: gget " @@ -59,5 +59,5 @@ fi version=$1 [ "$version" == "latest" ] && version="$latest" [ "$version" == "canary" ] && version="$canary" -wget "https://dl.grafana.com/oss/release/grafana_${version}_amd64.deb" -O "/tmp/grafana_${version}_amd64.deb" -dpkg -i "/tmp/grafana_${version}_amd64.deb" && /bin/rm -rfv "/tmp/grafana_${version}_amd64.deb" +wget "https://dl.grafana.com/oss/release/plutono_${version}_amd64.deb" -O "/tmp/plutono_${version}_amd64.deb" +dpkg -i "/tmp/plutono_${version}_amd64.deb" && /bin/rm -rfv "/tmp/plutono_${version}_amd64.deb" diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy-common.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/scripts/deploy-common.sh similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy-common.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/scripts/deploy-common.sh diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy-user.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/scripts/deploy-user.sh similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy-user.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/scripts/deploy-user.sh diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/scripts/deploy.sh similarity index 94% rename from packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/scripts/deploy.sh index 25fc988341..dd1eaff8d1 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/scripts/deploy.sh @@ -27,7 +27,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l "e1be1930379bd169d3a8e82135cf57216ad52ecfaf520b5804f269721e4dcc3d" chmod 755 /usr/local/bin/cc-test-reporter -wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.38/grabpl" +wget -O /usr/local/bin/grabpl "https://plutono-downloads.storage.googleapis.com/plutono-build-pipeline/v0.5.38/grabpl" chmod +x /usr/local/bin/grabpl # Install Mage diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/test/docker-compose.yml b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/test/docker-compose.yml similarity index 81% rename from packages/grafana-toolkit/docker/grafana-plugin-ci/test/docker-compose.yml rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/test/docker-compose.yml index d734b3a38e..1ba5a9b77f 100644 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci/test/docker-compose.yml +++ b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/test/docker-compose.yml @@ -7,4 +7,4 @@ services: - ../scripts:/home/circleci/scripts - ../install:/home/circleci/install - ${HOME}/.ssh:/root/.ssh - - ../../..:/home/circleci/grafana-toolkit + - ../../..:/home/circleci/plutono-toolkit diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/test/start.sh b/packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/test/start.sh similarity index 100% rename from packages/grafana-toolkit/docker/grafana-plugin-ci/test/start.sh rename to packages/plutono-toolkit/grafana-toolkit/docker/plutono-plugin-ci/test/start.sh diff --git a/packages/grafana-toolkit/package.json b/packages/plutono-toolkit/grafana-toolkit/package.json similarity index 89% rename from packages/grafana-toolkit/package.json rename to packages/plutono-toolkit/grafana-toolkit/package.json index 0109c281bf..a69d3be6ec 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/plutono-toolkit/grafana-toolkit/package.json @@ -1,25 +1,25 @@ { "author": "Grafana Labs", "license": "Apache-2.0", - "name": "@grafana/toolkit", + "name": "@credativ/plutono-toolkit", "version": "7.5.17", - "description": "Grafana Toolkit", + "description": "Plutono Toolkit", "keywords": [ - "grafana", + "plutono", "cli", "plugins", "typescript" ], "repository": { "type": "git", - "url": "http://github.com/grafana/grafana.git", - "directory": "packages/grafana-toolkit" + "url": "http://github.com/credativ/plutono.git", + "directory": "packages/plutono-toolkit" }, "bin": { - "grafana-toolkit": "./bin/grafana-toolkit.js" + "plutono-toolkit": "./bin/plutono-toolkit.js" }, "scripts": { - "build": "grafana-toolkit toolkit:build", + "build": "plutono-toolkit toolkit:build", "clean": "rimraf ./dist ./compiled", "precommit": "npm run lint & npm run typecheck", "typecheck": "tsc --noEmit" @@ -28,10 +28,10 @@ "dependencies": { "@babel/core": "7.9.0", "@babel/preset-env": "7.9.0", - "@grafana/data": "7.5.17", + "@credativ/plutono-data": "7.5.17", "@grafana/eslint-config": "2.3.0", "@grafana/tsconfig": "^1.0.0-rc1", - "@grafana/ui": "7.5.17", + "@credativ/plutono-ui": "7.5.17", "@types/command-exists": "^1.2.0", "@types/expect-puppeteer": "3.3.1", "@types/fs-extra": "^8.1.0", diff --git a/packages/grafana-toolkit/src/cli/index.d.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/index.d.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/index.d.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/index.d.ts diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/index.ts similarity index 96% rename from packages/grafana-toolkit/src/cli/index.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/index.ts index 65d6979be8..865e877ca6 100644 --- a/packages/grafana-toolkit/src/cli/index.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/index.ts @@ -31,7 +31,7 @@ export const run = (includeInternalScripts = false) => { .option('-h, --hot', 'Run front-end with HRM enabled') .option('-T, --noTsCheck', 'Run bundler without TS type checking') .option('-t, --watchTheme', 'Watch for theme changes and regenerate variables.scss files') - .description('Starts Grafana front-end in development mode with watch enabled') + .description('Starts Plutono front-end in development mode with watch enabled') .action(async (cmd) => { await execTask(startTask)({ watchThemes: cmd.watchTheme, @@ -43,7 +43,7 @@ export const run = (includeInternalScripts = false) => { program .command('package:build') .option('-s, --scope ', 'packages=[data|runtime|ui|toolkit|e2e|e2e-selectors]') - .description('Builds @grafana/* package to packages/grafana-*/dist') + .description('Builds @grafana/* package to packages/plutono-*/dist') .action(async (cmd) => { await execTask(buildPackageTask)({ scope: cmd.scope, @@ -68,7 +68,7 @@ export const run = (includeInternalScripts = false) => { program .command('cherrypick') - .option('-e, --enterprise', 'Run task for grafana-enterprise') + .option('-e, --enterprise', 'Run task for plutono-enterprise') .description('Helps find commits to cherry pick') .action(async (cmd) => { await execTask(cherryPickTask)({ enterprise: !!cmd.enterprise }); @@ -90,7 +90,7 @@ export const run = (includeInternalScripts = false) => { program .command('toolkit:build') - .description('Prepares grafana/toolkit dist package') + .description('Prepares plutono/toolkit dist package') .action(async (cmd) => { await execTask(toolkitBuildTask)({}); }); @@ -162,7 +162,7 @@ export const run = (includeInternalScripts = false) => { program .command('plugin:dev') .option('-w, --watch', 'Run plugin development mode with watch enabled') - .option('--yarnlink', 'symlink this project to the local grafana/toolkit') + .option('--yarnlink', 'symlink this project to the local plutono/toolkit') .description('Starts plugin dev mode') .action(async (cmd) => { await execTask(pluginDevTask)({ diff --git a/packages/grafana-toolkit/src/cli/tasks/changelog.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/changelog.ts similarity index 85% rename from packages/grafana-toolkit/src/cli/tasks/changelog.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/changelog.ts index 7afd435370..fa054d39ac 100644 --- a/packages/grafana-toolkit/src/cli/tasks/changelog.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/changelog.ts @@ -92,23 +92,23 @@ const changelogTaskRunner = ({ milestone }: ChangelogOptions) => const issues = _.sortBy(mergedIssues, 'title'); const toolkitIssues = issues.filter((item: any) => - item.labels.find((label: any) => label.name === 'area/grafana/toolkit') + item.labels.find((label: any) => label.name === 'area/plutono/toolkit') ); - const grafanaUiIssues = issues.filter((item: any) => - item.labels.find((label: any) => label.name === 'area/grafana/ui') + const plutonoUiIssues = issues.filter((item: any) => + item.labels.find((label: any) => label.name === 'area/plutono/ui') ); let markdown = ''; - markdown += getPackageChangelog('Grafana', issues); - markdown += getPackageChangelog('grafana-toolkit', toolkitIssues); - markdown += getPackageChangelog('grafana-ui', grafanaUiIssues); + markdown += getPackageChangelog('Plutono', issues); + markdown += getPackageChangelog('plutono-toolkit', toolkitIssues); + markdown += getPackageChangelog('plutono-ui', plutonoUiIssues); console.log(markdown); }); function getMarkdownLineForIssue(item: any) { - const githubGrafanaUrl = 'https://github.com/grafana/grafana'; + const githubPlutonoUrl = 'https://github.com/grafana/grafana'; let markdown = ''; let title: string = item.title.replace(/^([^:]*)/, (_match: any, g1: any) => { return `**${g1}**`; @@ -120,10 +120,10 @@ function getMarkdownLineForIssue(item: any) { if (!item.pull_request) { markdown += '* ' + title + '.'; - markdown += ` [#${item.number}](${githubGrafanaUrl}/issues/${item.number})`; + markdown += ` [#${item.number}](${githubPlutonoUrl}/issues/${item.number})`; } else { markdown += '* ' + title + '.'; - markdown += ` [#${item.number}](${githubGrafanaUrl}/pull/${item.number})`; + markdown += ` [#${item.number}](${githubPlutonoUrl}/pull/${item.number})`; markdown += `, [@${item.user.login}](${item.user.html_url})`; } diff --git a/packages/grafana-toolkit/src/cli/tasks/cherrypick.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/cherrypick.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/cherrypick.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/cherrypick.ts diff --git a/packages/grafana-toolkit/src/cli/tasks/closeMilestone.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/closeMilestone.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/closeMilestone.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/closeMilestone.ts diff --git a/packages/grafana-toolkit/src/cli/tasks/component.create.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/component.create.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/component.create.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/component.create.ts diff --git a/packages/grafana-toolkit/src/cli/tasks/core.start.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/core.start.ts similarity index 94% rename from packages/grafana-toolkit/src/cli/tasks/core.start.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/core.start.ts index b9ca83cae5..342045a029 100644 --- a/packages/grafana-toolkit/src/cli/tasks/core.start.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/core.start.ts @@ -12,7 +12,7 @@ const startTaskRunner: TaskRunner = async ({ watchThemes, noTs const noTsCheckArg = noTsCheck ? 1 : 0; const jobs = [ watchThemes && { - command: 'nodemon -e ts -w ./packages/grafana-ui/src/themes -x yarn run themes:generate', + command: 'nodemon -e ts -w ./packages/plutono-ui/src/themes -x yarn run themes:generate', name: 'SASS variables generator', }, hot diff --git a/packages/grafana-toolkit/src/cli/tasks/nodeVersionChecker.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/nodeVersionChecker.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/nodeVersionChecker.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/nodeVersionChecker.ts diff --git a/packages/grafana-toolkit/src/cli/tasks/package.build.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/package.build.ts similarity index 87% rename from packages/grafana-toolkit/src/cli/tasks/package.build.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/package.build.ts index 0d72e4c2b2..fcc60b8bd2 100644 --- a/packages/grafana-toolkit/src/cli/tasks/package.build.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/package.build.ts @@ -25,16 +25,16 @@ const preparePackage = async (packageDist: string, pkg: any) => { const name: string = pkg.name; const deps: any = pkg.dependencies; - // Below we are adding cross-dependencies to Grafana's packages + // Below we are adding cross-dependencies to Plutono's packages // with the version being published if (name.endsWith('/ui')) { - deps['@grafana/data'] = version; + deps['@credativ/plutono-data'] = version; } else if (name.endsWith('/runtime')) { - deps['@grafana/data'] = version; - deps['@grafana/ui'] = version; + deps['@credativ/plutono-data'] = version; + deps['@credativ/plutono-ui'] = version; } else if (name.endsWith('/toolkit')) { - deps['@grafana/data'] = version; - deps['@grafana/ui'] = version; + deps['@credativ/plutono-data'] = version; + deps['@credativ/plutono-ui'] = version; } await useSpinner('Updating package.json', () => @@ -52,7 +52,7 @@ const moveFiles = (fromPath: string, toPath: string) => { }; const moveStaticFiles = async (packageRoot: string, pkg: any) => { - if (pkg.name.endsWith('/ui')) { + if (pkg.name.endsWith('/plutono-ui')) { return useSpinner('Moving static files', async () => { const staticFiles = await globby(`${packageRoot}/src/**/*.{png,svg,gif,jpg}`); const pathSearch = new RegExp(`^${packageRoot}/src`); @@ -73,7 +73,7 @@ const buildTaskRunner: TaskRunner = async ({ scope }) => { } const scopes = scope.split(',').map(async (s) => { - const packageRoot = path.resolve(__dirname, `../../../../grafana-${s}`); + const packageRoot = path.resolve(__dirname, `../../../../plutono-${s}`); const packageDist = `${packageRoot}/dist`; const pkg = require(`${packageRoot}/package.json`); console.log(chalk.yellow(`Building ${pkg.name} (package.json version: ${pkg.version})`)); diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.build.ts similarity index 92% rename from packages/grafana-toolkit/src/cli/tasks/plugin.build.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.build.ts index 992a9b057b..541bdd3ca3 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.build.ts @@ -41,9 +41,9 @@ const copyIfNonExistent = (srcPath: string, destPath: string) => export const prepare = () => useSpinner('Preparing', () => Promise.all([ - // Remove local dependencies for @grafana/data/node_modules + // Remove local dependencies for @credativ/plutono-data/node_modules // See: https://github.com/grafana/grafana/issues/26748 - rimraf(resolvePath(__dirname, 'node_modules/@grafana/data/node_modules')), + rimraf(resolvePath(__dirname, 'node_modules/@credativ/plutono-data/node_modules')), // Copy only if local tsconfig does not exist. Otherwise this will work, but have odd behavior copyIfNonExistent( @@ -62,8 +62,8 @@ export const versions = async () => { const nodeVersion = await execa('node', ['--version']); console.log(`Using Node.js ${nodeVersion}`); - const toolkitVersion = await execa('grafana-toolkit', ['--version']); - console.log(`Using @grafana/toolkit ${toolkitVersion}`); + const toolkitVersion = await execa('plutono-toolkit', ['--version']); + console.log(`Using @credativ/plutono-toolkit ${toolkitVersion}`); }; // @ts-ignore @@ -81,7 +81,7 @@ export const lintPlugin = ({ fix }: Fixable = {}) => await access(resolvePath(process.cwd(), 'tslint.json')); console.log('\n'); console.log('--------------------------------------------------------------'); - console.log('NOTE: @grafana/toolkit has migrated to use eslint'); + console.log('NOTE: @credativ/plutono-toolkit has migrated to use eslint'); console.log('Update your configs to use .eslintrc rather than tslint.json'); console.log('--------------------------------------------------------------'); } catch { diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.ci.ts similarity index 91% rename from packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.ci.ts index 77c9623349..37a645c3de 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.ci.ts @@ -7,7 +7,7 @@ import { getPluginId } from '../../config/utils/getPluginId'; import execa = require('execa'); import path = require('path'); import fs from 'fs-extra'; -import { getPackageDetails, getGrafanaVersions, readGitLog } from '../../plugins/utils'; +import { getPackageDetails, getPlutonoVersions, readGitLog } from '../../plugins/utils'; import { buildManifest, signManifest, saveManifest } from '../../plugins/manifest'; import { getJobFolder, @@ -103,7 +103,7 @@ export const ciBuildPluginDocsTask = new Task('Build Plugin Doc * Take everything from `~/ci/job/{any}/dist` and * 1. merge it into: `~/ci/dist` * 2. zip it into packages in `~/ci/packages` - * 3. prepare grafana environment in: `~/ci/grafana-test-env` + * 3. prepare plutono environment in: `~/ci/plutono-test-env` */ const packagePluginRunner: TaskRunner = async ({ signatureType, rootUrls }) => { const start = Date.now(); @@ -119,15 +119,15 @@ const packagePluginRunner: TaskRunner = async ({ signatureType, } }); - const grafanaEnvDir = path.resolve(ciDir, 'grafana-test-env'); - await execa('rimraf', [packagesDir, distDir, grafanaEnvDir]); + const plutonoEnvDir = path.resolve(ciDir, 'plutono-test-env'); + await execa('rimraf', [packagesDir, distDir, plutonoEnvDir]); fs.mkdirSync(packagesDir); fs.mkdirSync(distDir); // Updating the dist dir to have a pluginId named directory in it // The zip needs to contain the plugin code wrapped in directory with a pluginId name const distContentDir = path.resolve(distDir, getPluginId()); - fs.mkdirSync(grafanaEnvDir); + fs.mkdirSync(plutonoEnvDir); console.log('Build Dist Folder'); @@ -188,8 +188,8 @@ const packagePluginRunner: TaskRunner = async ({ signatureType, plugin: await getPackageDetails(zipFile, distDir), }; - console.log('Setup Grafana Environment'); - let p = path.resolve(grafanaEnvDir, 'plugins', pluginInfo.id); + console.log('Setup Plutono Environment'); + let p = path.resolve(plutonoEnvDir, 'plugins', pluginInfo.id); fs.mkdirSync(p, { recursive: true }); await execa('unzip', [zipFile, '-d', p]); @@ -207,11 +207,11 @@ const packagePluginRunner: TaskRunner = async ({ signatureType, fs.writeFileSync(p, JSON.stringify(info, null, 2), { encoding: 'utf-8' }); // Write the custom settings - p = path.resolve(grafanaEnvDir, 'custom.ini'); + p = path.resolve(plutonoEnvDir, 'custom.ini'); const customIniBody = - `# Autogenerated by @grafana/toolkit \n` + + `# Autogenerated by @credativ/plutono-toolkit \n` + `[paths] \n` + - `plugins = ${path.resolve(grafanaEnvDir, 'plugins')}\n` + + `plugins = ${path.resolve(plutonoEnvDir, 'plugins')}\n` + `\n`; // empty line fs.writeFileSync(p, customIniBody, { encoding: 'utf-8' }); @@ -241,7 +241,7 @@ const pluginReportRunner: TaskRunner = async ({ upload }) => { coverage: agregateCoverageInfo(), tests: agregateTestInfo(), artifactsBaseURL: await getCircleDownloadBaseURL(), - grafanaVersion: getGrafanaVersions(), + plutonoVersion: getPlutonoVersions(), git: await readGitLog(), }; const pr = getPullRequestNumber(); @@ -253,9 +253,9 @@ const pluginReportRunner: TaskRunner = async ({ upload }) => { const file = path.resolve(ciDir, 'report.json'); fs.writeFileSync(file, JSON.stringify(report, null, 2), { encoding: 'utf-8' }); - const GRAFANA_API_KEY = process.env.GRAFANA_API_KEY; - if (!GRAFANA_API_KEY) { - console.log('Enter a GRAFANA_API_KEY to upload the plugin report'); + const PLUTONO_API_KEY = process.env.PLUTONO_API_KEY; + if (!PLUTONO_API_KEY) { + console.log('Enter a PLUTONO_API_KEY to upload the plugin report'); return; } const url = `https://grafana.com/api/plugins/${report.plugin.id}/ci`; @@ -263,7 +263,7 @@ const pluginReportRunner: TaskRunner = async ({ upload }) => { console.log('Sending report to:', url); const axios = require('axios'); const info = await axios.post(url, report, { - headers: { Authorization: 'Bearer ' + GRAFANA_API_KEY }, + headers: { Authorization: 'Bearer ' + PLUTONO_API_KEY }, }); if (info.status === 200) { console.log('OK: ', info.data); diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.create.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.create.ts similarity index 93% rename from packages/grafana-toolkit/src/cli/tasks/plugin.create.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.create.ts index 0eb2647686..4cce264efa 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin.create.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.create.ts @@ -6,7 +6,7 @@ import { formatPluginDetails, getPluginIdFromName, prepareJsonFiles, - printGrafanaTutorialsDetails, + printPlutonoTutorialsDetails, promptPluginDetails, promptPluginType, removeGitFiles, @@ -43,8 +43,8 @@ const pluginCreateRunner: TaskRunner = async ({ name }) => // 6. Remove cloned repository .git dir await removeGitFiles(destPath); - // 7. Promote Grafana Tutorials :) - printGrafanaTutorialsDetails(type); + // 7. Promote Plutono Tutorials :) + printPlutonoTutorialsDetails(type); }; export const pluginCreateTask = new Task('plugin:create task', pluginCreateRunner); diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.dev.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.dev.ts similarity index 84% rename from packages/grafana-toolkit/src/cli/tasks/plugin.dev.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.dev.ts index 34eeb0b93f..93b3669a82 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin.dev.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.dev.ts @@ -14,11 +14,11 @@ const yarnlink = () => useSpinner('Linking local toolkit', async () => { try { // Make sure we are not using package.json defined toolkit - await execa('yarn', ['remove', '@grafana/toolkit']); + await execa('yarn', ['remove', '@credativ/plutono-toolkit']); } catch (e) { console.log('\n', e.message, '\n'); } - await execa('yarn', ['link', '@grafana/toolkit']); + await execa('yarn', ['link', '@credativ/plutono-toolkit']); // Add all the same dependencies as toolkit const args: string[] = ['add']; @@ -28,7 +28,7 @@ const yarnlink = () => } await execa('yarn', args); - console.log('Added dependencies required by local @grafana/toolkit. Do not checkin this package.json!'); + console.log('Added dependencies required by local @credativ/plutono-toolkit. Do not checkin this package.json!'); }); const pluginDevRunner: TaskRunner = async (options) => { diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.sign.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.sign.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/plugin.sign.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.sign.ts diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.tests.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.tests.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/plugin.tests.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.tests.ts diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.update.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.update.ts similarity index 86% rename from packages/grafana-toolkit/src/cli/tasks/plugin.update.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.update.ts index bf998a31a7..2d10b89dfe 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin.update.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.update.ts @@ -12,7 +12,7 @@ const updateCiConfig = () => fs.mkdirSync(ciConfigPath); } - const sourceFile = path.join('node_modules/@grafana/toolkit/config/circleci', 'config.yml'); + const sourceFile = path.join('node_modules/@credativ/plutono-toolkit/config/circleci', 'config.yml'); const destFile = path.join(ciConfigPath, 'config.yml'); fs.copyFileSync(sourceFile, destFile); }); diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.utils.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin.utils.ts diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin/bundle.ts similarity index 97% rename from packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin/bundle.ts index 7fca11963d..4a1fedb71d 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin/bundle.ts @@ -32,7 +32,7 @@ export const bundlePlugin = async ({ watch, production, preserveConsole }: Plugi compiler.hooks.done.tap('done', (stats: webpack.Stats) => { clearConsole(); - const json: any = stats.toJson(); // different @types/webpack between react-dev-utils and grafana-toolkit + const json: any = stats.toJson(); // different @types/webpack between react-dev-utils and plutono-toolkit const output = formatWebpackMessages(json); if (!output.errors.length && !output.warnings.length) { diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/create.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin/create.ts similarity index 95% rename from packages/grafana-toolkit/src/cli/tasks/plugin/create.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin/create.ts index 9a93b7a3e4..3a80433734 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin/create.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin/create.ts @@ -23,9 +23,9 @@ interface PluginDetails { type PluginType = 'panel-plugin' | 'datasource-plugin' | 'backend-datasource-plugin'; const PluginNames: Record = { - 'panel-plugin': 'Grafana Panel Plugin', - 'datasource-plugin': 'Grafana Data Source Plugin', - 'backend-datasource-plugin': 'Grafana Backend Datasource Plugin', + 'panel-plugin': 'Plutono Panel Plugin', + 'datasource-plugin': 'Plutono Data Source Plugin', + 'backend-datasource-plugin': 'Plutono Backend Datasource Plugin', }; const RepositoriesPaths: Record = { 'panel-plugin': 'https://github.com/grafana/simple-react-panel.git', @@ -173,7 +173,7 @@ export const formatPluginDetails = (details: PluginDetails) => { console.groupEnd(); }; -export const printGrafanaTutorialsDetails = (type: PluginType) => { +export const printPlutonoTutorialsDetails = (type: PluginType) => { console.group(); console.log(); console.log(chalk.bold.yellow(`Congrats! You have just created ${PluginNames[type]}.`)); @@ -182,7 +182,7 @@ export const printGrafanaTutorialsDetails = (type: PluginType) => { console.log(`${PluginNames[type]} tutorial: ${TutorialPaths[type]}`); } console.log( - 'Learn more about Grafana Plugins at https://grafana.com/docs/grafana/latest/plugins/developing/development/' + 'Learn more about Plutono Plugins at https://grafana.com/docs/grafana/latest/plugins/developing/development/' ); console.log(); console.groupEnd(); diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/test_exclude_image_suffix_in_manifest.png b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin/test_exclude_image_suffix_in_manifest.png similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/plugin/test_exclude_image_suffix_in_manifest.png rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin/test_exclude_image_suffix_in_manifest.png diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/tests.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin/tests.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/plugin/tests.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/plugin/tests.ts diff --git a/packages/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts diff --git a/packages/grafana-toolkit/src/cli/tasks/task.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/task.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/task.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/task.ts diff --git a/packages/grafana-toolkit/src/cli/tasks/template.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/template.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/tasks/template.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/template.ts diff --git a/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/toolkit.build.ts similarity index 95% rename from packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/toolkit.build.ts index 194f23ba04..38092cd094 100644 --- a/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/tasks/toolkit.build.ts @@ -35,7 +35,7 @@ const savePackage = ({ path, pkg }: { path: string; pkg: {} }) => const preparePackage = async (pkg: any) => { pkg.bin = { - 'grafana-toolkit': './bin/grafana-toolkit.js', + 'plutono-toolkit': './bin/plutono-toolkit.js', }; await savePackage({ @@ -49,7 +49,7 @@ const copyFiles = () => { 'README.md', 'CHANGELOG.md', 'config/circleci/config.yml', - 'bin/grafana-toolkit.js', + 'bin/plutono-toolkit.js', 'src/config/prettier.plugin.config.json', 'src/config/prettier.plugin.rc.js', 'src/config/tsconfig.plugin.json', @@ -118,4 +118,4 @@ const toolkitBuildTaskRunner: TaskRunner = async () => { await copySassFiles(); }; -export const toolkitBuildTask = new Task('@grafana/toolkit build', toolkitBuildTaskRunner); +export const toolkitBuildTask = new Task('@credativ/plutono-toolkit build', toolkitBuildTaskRunner); diff --git a/packages/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts diff --git a/packages/grafana-toolkit/src/cli/templates/component.tsx.template.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/templates/component.tsx.template.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/templates/component.tsx.template.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/templates/component.tsx.template.ts diff --git a/packages/grafana-toolkit/src/cli/templates/docs.mdx.template.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/templates/docs.mdx.template.ts similarity index 81% rename from packages/grafana-toolkit/src/cli/templates/docs.mdx.template.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/templates/docs.mdx.template.ts index b605f755c6..ae7d11efcb 100644 --- a/packages/grafana-toolkit/src/cli/templates/docs.mdx.template.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/templates/docs.mdx.template.ts @@ -6,7 +6,7 @@ import { <%= name %> } from './<%= name %>'; ### Usage \`\`\`jsx -import { <%= name %> } from '@grafana/ui'; +import { <%= name %> } from '@credativ/plutono-ui'; <<%= name %> /> \`\`\` diff --git a/packages/grafana-toolkit/src/cli/templates/index.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/templates/index.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/templates/index.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/templates/index.ts diff --git a/packages/grafana-toolkit/src/cli/templates/story.tsx.template.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/templates/story.tsx.template.ts similarity index 79% rename from packages/grafana-toolkit/src/cli/templates/story.tsx.template.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/templates/story.tsx.template.ts index 21c87a1f20..24b7c9bf51 100644 --- a/packages/grafana-toolkit/src/cli/templates/story.tsx.template.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/templates/story.tsx.template.ts @@ -1,7 +1,7 @@ export const storyTpl = ` import React from 'react'; import { <%= name %> } from './<%= name %>'; -import { withCenteredStory } from '@grafana/ui/src/utils/storybook/withCenteredStory'; +import { withCenteredStory } from '@credativ/plutono-ui/src/utils/storybook/withCenteredStory'; import mdx from './<%= name %>.mdx'; diff --git a/packages/grafana-toolkit/src/cli/tsconfig.json b/packages/plutono-toolkit/grafana-toolkit/src/cli/tsconfig.json similarity index 100% rename from packages/grafana-toolkit/src/cli/tsconfig.json rename to packages/plutono-toolkit/grafana-toolkit/src/cli/tsconfig.json diff --git a/packages/grafana-toolkit/src/cli/utils/execTask.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/utils/execTask.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/utils/execTask.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/utils/execTask.ts diff --git a/packages/grafana-toolkit/src/cli/utils/githubClient.test.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/utils/githubClient.test.ts similarity index 87% rename from packages/grafana-toolkit/src/cli/utils/githubClient.test.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/utils/githubClient.test.ts index ff6cfb0b13..c1bec18160 100644 --- a/packages/grafana-toolkit/src/cli/utils/githubClient.test.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/utils/githubClient.test.ts @@ -21,7 +21,7 @@ describe('GithubClient', () => { }); describe('#client', () => { - it('it should contain a grafana client', () => { + it('it should contain a plutono client', () => { // @ts-ignore const spy = jest.spyOn(GithubClient.prototype, 'createClient').mockImplementation(() => fakeClient); @@ -29,13 +29,13 @@ describe('GithubClient', () => { const client = github.client; expect(spy).toHaveBeenCalledWith({ - baseURL: 'https://api.github.com/repos/grafana/grafana', + baseURL: 'https://api.github.com/repos/plutono/plutono', timeout: 10000, }); expect(client).toEqual(fakeClient); }); - it('it should contain a grafana enterprise client', () => { + it('it should contain a plutono enterprise client', () => { // @ts-ignore const spy = jest.spyOn(GithubClient.prototype, 'createClient').mockImplementation(() => fakeClient); @@ -43,7 +43,7 @@ describe('GithubClient', () => { const client = github.client; expect(spy).toHaveBeenCalledWith({ - baseURL: 'https://api.github.com/repos/grafana/grafana-enterprise', + baseURL: 'https://api.github.com/repos/plutono/plutono-enterprise', timeout: 10000, }); expect(client).toEqual(fakeClient); @@ -51,7 +51,7 @@ describe('GithubClient', () => { describe('when the credentials are required', () => { it('should create the client when the credentials are defined', () => { - const username = 'grafana'; + const username = 'plutono'; const token = 'averysecureaccesstoken'; process.env.GITHUB_USERNAME = username; @@ -64,7 +64,7 @@ describe('GithubClient', () => { const client = github.client; expect(spy).toHaveBeenCalledWith({ - baseURL: 'https://api.github.com/repos/grafana/grafana', + baseURL: 'https://api.github.com/repos/plutono/plutono', timeout: 10000, auth: { username, password: token }, }); @@ -73,7 +73,7 @@ describe('GithubClient', () => { }); it('should create the enterprise client when the credentials are defined', () => { - const username = 'grafana'; + const username = 'plutono'; const token = 'averysecureaccesstoken'; process.env.GITHUB_USERNAME = username; @@ -86,7 +86,7 @@ describe('GithubClient', () => { const client = github.client; expect(spy).toHaveBeenCalledWith({ - baseURL: 'https://api.github.com/repos/grafana/grafana-enterprise', + baseURL: 'https://api.github.com/repos/plutono/plutono-enterprise', timeout: 10000, auth: { username, password: token }, }); diff --git a/packages/grafana-toolkit/src/cli/utils/githubClient.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/utils/githubClient.ts similarity index 79% rename from packages/grafana-toolkit/src/cli/utils/githubClient.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/utils/githubClient.ts index 9643c16687..10e52b468f 100644 --- a/packages/grafana-toolkit/src/cli/utils/githubClient.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/cli/utils/githubClient.ts @@ -1,7 +1,7 @@ import axios, { AxiosInstance, AxiosRequestConfig } from 'axios'; -const grafanaURL = (owner: string, repo: string) => `https://api.github.com/repos/${owner}/${repo}`; -const enterpriseURL = 'https://api.github.com/repos/grafana/grafana-enterprise'; +const plutonoURL = (owner: string, repo: string) => `https://api.github.com/repos/${owner}/${repo}`; +const enterpriseURL = 'https://api.github.com/repos/plutono/plutono-enterprise'; // Encapsulates the creation of a client for the GitHub API // @@ -21,12 +21,12 @@ interface GithubClientProps { class GithubClient { client: AxiosInstance; - constructor({ required = false, enterprise = false, owner = 'grafana', repo = 'grafana' }: GithubClientProps = {}) { + constructor({ required = false, enterprise = false, owner = 'plutono', repo = 'plutono' }: GithubClientProps = {}) { const username = process.env.GITHUB_USERNAME; const token = process.env.GITHUB_ACCESS_TOKEN; const clientConfig: AxiosRequestConfig = { - baseURL: enterprise ? enterpriseURL : grafanaURL(owner, repo), + baseURL: enterprise ? enterpriseURL : plutonoURL(owner, repo), timeout: 10000, }; diff --git a/packages/grafana-toolkit/src/cli/utils/githubRelease.test.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/utils/githubRelease.test.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/utils/githubRelease.test.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/utils/githubRelease.test.ts diff --git a/packages/grafana-toolkit/src/cli/utils/githubRelease.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/utils/githubRelease.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/utils/githubRelease.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/utils/githubRelease.ts diff --git a/packages/grafana-toolkit/src/cli/utils/pascalCase.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/utils/pascalCase.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/utils/pascalCase.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/utils/pascalCase.ts diff --git a/packages/grafana-toolkit/src/cli/utils/prompt.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/utils/prompt.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/utils/prompt.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/utils/prompt.ts diff --git a/packages/grafana-toolkit/src/cli/utils/rmdir.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/utils/rmdir.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/utils/rmdir.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/utils/rmdir.ts diff --git a/packages/grafana-toolkit/src/cli/utils/useSpinner.ts b/packages/plutono-toolkit/grafana-toolkit/src/cli/utils/useSpinner.ts similarity index 100% rename from packages/grafana-toolkit/src/cli/utils/useSpinner.ts rename to packages/plutono-toolkit/grafana-toolkit/src/cli/utils/useSpinner.ts diff --git a/packages/grafana-toolkit/src/config/eslint.plugin.json b/packages/plutono-toolkit/grafana-toolkit/src/config/eslint.plugin.json similarity index 100% rename from packages/grafana-toolkit/src/config/eslint.plugin.json rename to packages/plutono-toolkit/grafana-toolkit/src/config/eslint.plugin.json diff --git a/packages/grafana-toolkit/src/config/index.ts b/packages/plutono-toolkit/grafana-toolkit/src/config/index.ts similarity index 100% rename from packages/grafana-toolkit/src/config/index.ts rename to packages/plutono-toolkit/grafana-toolkit/src/config/index.ts diff --git a/packages/grafana-toolkit/src/config/jest.plugin.config.local.js b/packages/plutono-toolkit/grafana-toolkit/src/config/jest.plugin.config.local.js similarity index 76% rename from packages/grafana-toolkit/src/config/jest.plugin.config.local.js rename to packages/plutono-toolkit/grafana-toolkit/src/config/jest.plugin.config.local.js index bcf17c9087..56aa6bc1ec 100644 --- a/packages/grafana-toolkit/src/config/jest.plugin.config.local.js +++ b/packages/plutono-toolkit/grafana-toolkit/src/config/jest.plugin.config.local.js @@ -2,7 +2,7 @@ // call `jest` directly. However, unless you are doing anything special // do not edit this file -const standard = require('@grafana/toolkit/src/config/jest.plugin.config'); +const standard = require('@credativ/plutono-toolkit/src/config/jest.plugin.config'); // This process will use the same config that `yarn test` is using module.exports = standard.jestConfig(); diff --git a/packages/grafana-toolkit/src/config/jest.plugin.config.test.ts b/packages/plutono-toolkit/grafana-toolkit/src/config/jest.plugin.config.test.ts similarity index 100% rename from packages/grafana-toolkit/src/config/jest.plugin.config.test.ts rename to packages/plutono-toolkit/grafana-toolkit/src/config/jest.plugin.config.test.ts diff --git a/packages/grafana-toolkit/src/config/jest.plugin.config.ts b/packages/plutono-toolkit/grafana-toolkit/src/config/jest.plugin.config.ts similarity index 94% rename from packages/grafana-toolkit/src/config/jest.plugin.config.ts rename to packages/plutono-toolkit/grafana-toolkit/src/config/jest.plugin.config.ts index 313770a276..0718ec13c9 100644 --- a/packages/grafana-toolkit/src/config/jest.plugin.config.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/config/jest.plugin.config.ts @@ -32,7 +32,7 @@ export const jestConfig = (baseDir: string = process.cwd()) => { : []; if (deniedOverrides.length > 0) { - console.error("\ngrafana-toolkit doesn't support following Jest options: ", deniedOverrides); + console.error("\nplutono-toolkit doesn't support following Jest options: ", deniedOverrides); console.log('Supported Jest options are: ', JSON.stringify(allowedJestConfigOverrides)); throw new Error('Provided Jest config is not supported'); } @@ -102,7 +102,7 @@ export const jestConfig = (baseDir: string = process.cwd()) => { export const loadJestPluginConfig = (baseDir: string = process.cwd()) => { const cfgpath = path.resolve(baseDir, 'jest.config.js'); if (!fs.existsSync(cfgpath)) { - const src = path.resolve(baseDir, 'node_modules/@grafana/toolkit/src/config/jest.plugin.config.local.js'); + const src = path.resolve(baseDir, 'node_modules/@credativ/plutono-toolkit/src/config/jest.plugin.config.local.js'); fs.copyFileSync(src, cfgpath); console.log('Using standard jest plugin config', src); } diff --git a/packages/grafana-toolkit/src/config/mocks/jestSetup/noOverrides/package.json b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/jestSetup/noOverrides/package.json similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/jestSetup/noOverrides/package.json rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/jestSetup/noOverrides/package.json diff --git a/packages/grafana-toolkit/src/config/mocks/jestSetup/overrides/package.json b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/jestSetup/overrides/package.json similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/jestSetup/overrides/package.json rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/jestSetup/overrides/package.json diff --git a/packages/grafana-toolkit/src/config/mocks/jestSetup/unsupportedOverrides/package.json b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/jestSetup/unsupportedOverrides/package.json similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/jestSetup/unsupportedOverrides/package.json rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/jestSetup/unsupportedOverrides/package.json diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.css b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.css similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.css rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.css diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.scss b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.scss similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.scss rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/dark.scss diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/light.css b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/light.css similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/light.css rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/duplicates/src/styles/light.css diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/missing-theme-file/src/styles/light.css b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/missing-theme-file/src/styles/light.css similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/missing-theme-file/src/styles/light.css rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/missing-theme-file/src/styles/light.css diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/no-theme-files/src/styles/whatever.css b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/no-theme-files/src/styles/whatever.css similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/no-theme-files/src/styles/whatever.css rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/no-theme-files/src/styles/whatever.css diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/dark.css b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/dark.css similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/dark.css rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/dark.css diff --git a/packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/light.css b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/light.css similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/light.css rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/stylesheetsSupport/ok/src/styles/light.css diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/noOverride/package.json b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/noOverride/package.json similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/webpack/noOverride/package.json rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/noOverride/package.json diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/overrides/package.json b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/overrides/package.json similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/webpack/overrides/package.json rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/overrides/package.json diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/overrides/webpack.config.js b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/overrides/webpack.config.js similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/webpack/overrides/webpack.config.js rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/overrides/webpack.config.js diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/package.json b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/package.json similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/package.json rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/package.json diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/webpack.config.js b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/webpack.config.js similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/webpack.config.js rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/overridesNamedExport/webpack.config.js diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/package.json b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/package.json similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/package.json rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/package.json diff --git a/packages/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/webpack.config.js b/packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/webpack.config.js similarity index 100% rename from packages/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/webpack.config.js rename to packages/plutono-toolkit/grafana-toolkit/src/config/mocks/webpack/unsupportedOverride/webpack.config.js diff --git a/packages/grafana-toolkit/src/config/prettier.plugin.config.json b/packages/plutono-toolkit/grafana-toolkit/src/config/prettier.plugin.config.json similarity index 100% rename from packages/grafana-toolkit/src/config/prettier.plugin.config.json rename to packages/plutono-toolkit/grafana-toolkit/src/config/prettier.plugin.config.json diff --git a/packages/plutono-toolkit/grafana-toolkit/src/config/prettier.plugin.rc.js b/packages/plutono-toolkit/grafana-toolkit/src/config/prettier.plugin.rc.js new file mode 100644 index 0000000000..9afb51bfdc --- /dev/null +++ b/packages/plutono-toolkit/grafana-toolkit/src/config/prettier.plugin.rc.js @@ -0,0 +1,3 @@ +module.exports = { + ...require('@credativ/plutono-toolkit/src/config/prettier.plugin.config.json'), +}; diff --git a/packages/grafana-toolkit/src/config/styles.mock.js b/packages/plutono-toolkit/grafana-toolkit/src/config/styles.mock.js similarity index 100% rename from packages/grafana-toolkit/src/config/styles.mock.js rename to packages/plutono-toolkit/grafana-toolkit/src/config/styles.mock.js diff --git a/packages/grafana-toolkit/src/config/tsconfig.plugin.json b/packages/plutono-toolkit/grafana-toolkit/src/config/tsconfig.plugin.json similarity index 100% rename from packages/grafana-toolkit/src/config/tsconfig.plugin.json rename to packages/plutono-toolkit/grafana-toolkit/src/config/tsconfig.plugin.json diff --git a/packages/grafana-toolkit/src/config/tsconfig.plugin.local.json b/packages/plutono-toolkit/grafana-toolkit/src/config/tsconfig.plugin.local.json similarity index 70% rename from packages/grafana-toolkit/src/config/tsconfig.plugin.local.json rename to packages/plutono-toolkit/grafana-toolkit/src/config/tsconfig.plugin.local.json index 52ac9088fa..d52f5a1d19 100644 --- a/packages/grafana-toolkit/src/config/tsconfig.plugin.local.json +++ b/packages/plutono-toolkit/grafana-toolkit/src/config/tsconfig.plugin.local.json @@ -5,6 +5,6 @@ "typeRoots": ["./node_modules/@types"], "jsx": "react" }, - "extends": "@grafana/toolkit/src/config/tsconfig.plugin.json", + "extends": "@credativ/plutono-toolkit/src/config/tsconfig.plugin.json", "include": ["src", "types"] } diff --git a/packages/grafana-toolkit/src/config/utils/getPluginId.ts b/packages/plutono-toolkit/grafana-toolkit/src/config/utils/getPluginId.ts similarity index 100% rename from packages/grafana-toolkit/src/config/utils/getPluginId.ts rename to packages/plutono-toolkit/grafana-toolkit/src/config/utils/getPluginId.ts diff --git a/packages/grafana-toolkit/src/config/utils/pluginValidation.test.ts b/packages/plutono-toolkit/grafana-toolkit/src/config/utils/pluginValidation.test.ts similarity index 100% rename from packages/grafana-toolkit/src/config/utils/pluginValidation.test.ts rename to packages/plutono-toolkit/grafana-toolkit/src/config/utils/pluginValidation.test.ts diff --git a/packages/grafana-toolkit/src/config/utils/pluginValidation.ts b/packages/plutono-toolkit/grafana-toolkit/src/config/utils/pluginValidation.ts similarity index 94% rename from packages/grafana-toolkit/src/config/utils/pluginValidation.ts rename to packages/plutono-toolkit/grafana-toolkit/src/config/utils/pluginValidation.ts index f2ff2cdf7d..1db875a5f8 100644 --- a/packages/grafana-toolkit/src/config/utils/pluginValidation.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/config/utils/pluginValidation.ts @@ -1,4 +1,4 @@ -import { PluginMeta } from '@grafana/data'; +import { PluginMeta } from '@credativ/plutono-data'; export const validatePluginJson = (pluginJson: any) => { if (!pluginJson.id) { diff --git a/packages/grafana-toolkit/src/config/webpack.plugin.config.test.ts b/packages/plutono-toolkit/grafana-toolkit/src/config/webpack.plugin.config.test.ts similarity index 100% rename from packages/grafana-toolkit/src/config/webpack.plugin.config.test.ts rename to packages/plutono-toolkit/grafana-toolkit/src/config/webpack.plugin.config.test.ts diff --git a/packages/grafana-toolkit/src/config/webpack.plugin.config.ts b/packages/plutono-toolkit/grafana-toolkit/src/config/webpack.plugin.config.ts similarity index 98% rename from packages/grafana-toolkit/src/config/webpack.plugin.config.ts rename to packages/plutono-toolkit/grafana-toolkit/src/config/webpack.plugin.config.ts index 294689c9ce..0ab88654f8 100644 --- a/packages/grafana-toolkit/src/config/webpack.plugin.config.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/config/webpack.plugin.config.ts @@ -185,14 +185,14 @@ const getBaseWebpackConfig: WebpackConfigurationGetter = async (options) => { 'rxjs', 'd3', 'angular', - '@grafana/ui', - '@grafana/runtime', - '@grafana/data', + '@credativ/plutono-ui', + '@credativ/plutono-runtime', + '@credativ/plutono-data', 'monaco-editor', 'react-monaco-editor', // @ts-ignore (context, request, callback) => { - const prefix = 'grafana/'; + const prefix = 'plutono/'; if (request.indexOf(prefix) === 0) { return callback(null, request.substr(prefix.length)); } diff --git a/packages/grafana-toolkit/src/config/webpack/loaders.test.ts b/packages/plutono-toolkit/grafana-toolkit/src/config/webpack/loaders.test.ts similarity index 100% rename from packages/grafana-toolkit/src/config/webpack/loaders.test.ts rename to packages/plutono-toolkit/grafana-toolkit/src/config/webpack/loaders.test.ts diff --git a/packages/grafana-toolkit/src/config/webpack/loaders.ts b/packages/plutono-toolkit/grafana-toolkit/src/config/webpack/loaders.ts similarity index 100% rename from packages/grafana-toolkit/src/config/webpack/loaders.ts rename to packages/plutono-toolkit/grafana-toolkit/src/config/webpack/loaders.ts diff --git a/packages/grafana-toolkit/src/plugins/env.ts b/packages/plutono-toolkit/grafana-toolkit/src/plugins/env.ts similarity index 96% rename from packages/grafana-toolkit/src/plugins/env.ts rename to packages/plutono-toolkit/grafana-toolkit/src/plugins/env.ts index 06b659c1c3..7cca8bf3fc 100644 --- a/packages/grafana-toolkit/src/plugins/env.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/plugins/env.ts @@ -1,7 +1,7 @@ import execa from 'execa'; import path from 'path'; import fs from 'fs'; -import { PluginBuildInfo } from '@grafana/data'; +import { PluginBuildInfo } from '@credativ/plutono-data'; import { JobInfo } from './types'; const getJobFromProcessArgv = () => { @@ -124,7 +124,7 @@ export const writeJobStats = (startTime: number, workDir: string) => { }); }; -// https://circleci.com/api/v1.1/project/github/NatelEnergy/grafana-discrete-panel/latest/artifacts +// https://circleci.com/api/v1.1/project/github/NatelEnergy/plutono-discrete-panel/latest/artifacts export async function getCircleDownloadBaseURL(): Promise { try { const axios = require('axios'); diff --git a/packages/grafana-toolkit/src/plugins/index.ts b/packages/plutono-toolkit/grafana-toolkit/src/plugins/index.ts similarity index 100% rename from packages/grafana-toolkit/src/plugins/index.ts rename to packages/plutono-toolkit/grafana-toolkit/src/plugins/index.ts diff --git a/packages/grafana-toolkit/src/plugins/manifest.ts b/packages/plutono-toolkit/grafana-toolkit/src/plugins/manifest.ts similarity index 88% rename from packages/grafana-toolkit/src/plugins/manifest.ts rename to packages/plutono-toolkit/grafana-toolkit/src/plugins/manifest.ts index 66c5bff94f..782895a455 100644 --- a/packages/grafana-toolkit/src/plugins/manifest.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/plugins/manifest.ts @@ -55,19 +55,19 @@ export async function buildManifest(dir: string): Promise { } export async function signManifest(manifest: ManifestInfo): Promise { - const GRAFANA_API_KEY = process.env.GRAFANA_API_KEY; - if (!GRAFANA_API_KEY) { - throw new Error('You must enter a GRAFANA_API_KEY to sign the plugin manifest'); + const PLUTONO_API_KEY = process.env.PLUTONO_API_KEY; + if (!PLUTONO_API_KEY) { + throw new Error('You must enter a PLUTONO_API_KEY to sign the plugin manifest'); } - const GRAFANA_COM_URL = process.env.GRAFANA_COM_URL || 'https://grafana.com/api'; - const url = GRAFANA_COM_URL + '/plugins/ci/sign'; + const PLUTONO_COM_URL = process.env.PLUTONO_COM_URL || 'https://grafana.com/api'; + const url = PLUTONO_COM_URL + '/plugins/ci/sign'; const axios = require('axios'); try { const info = await axios.post(url, manifest, { - headers: { Authorization: 'Bearer ' + GRAFANA_API_KEY }, + headers: { Authorization: 'Bearer ' + PLUTONO_API_KEY }, }); if (info.status !== 200) { console.warn('Error: ', info); diff --git a/packages/grafana-toolkit/src/plugins/types.ts b/packages/plutono-toolkit/grafana-toolkit/src/plugins/types.ts similarity index 94% rename from packages/grafana-toolkit/src/plugins/types.ts rename to packages/plutono-toolkit/grafana-toolkit/src/plugins/types.ts index 792fd09e4f..ef851c099c 100644 --- a/packages/grafana-toolkit/src/plugins/types.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/plugins/types.ts @@ -1,4 +1,4 @@ -import { PluginMeta, KeyValue } from '@grafana/data'; +import { PluginMeta, KeyValue } from '@credativ/plutono-data'; export interface PluginPackageDetails { plugin: ZipFileInfo; @@ -14,7 +14,7 @@ export interface PluginBuildReport { git?: GitLogInfo; pullRequest?: number; artifactsBaseURL?: string; - grafanaVersion?: KeyValue; + plutonoVersion?: KeyValue; } export interface JobInfo { @@ -48,7 +48,7 @@ export interface CoverageInfo { export interface TestResultsInfo { job: string; - grafana?: any; + plutono?: any; error?: string; passed: number; failed: number; diff --git a/packages/grafana-toolkit/src/plugins/utils.ts b/packages/plutono-toolkit/grafana-toolkit/src/plugins/utils.ts similarity index 97% rename from packages/grafana-toolkit/src/plugins/utils.ts rename to packages/plutono-toolkit/grafana-toolkit/src/plugins/utils.ts index 739c837b1e..15cba77fa3 100644 --- a/packages/grafana-toolkit/src/plugins/utils.ts +++ b/packages/plutono-toolkit/grafana-toolkit/src/plugins/utils.ts @@ -1,12 +1,12 @@ import execa from 'execa'; import path from 'path'; import fs from 'fs'; -import { KeyValue } from '@grafana/data'; +import { KeyValue } from '@credativ/plutono-data'; import { ExtensionSize, ZipFileInfo, GitLogInfo } from './types'; const md5File = require('md5-file'); -export function getGrafanaVersions(): KeyValue { +export function getPlutonoVersions(): KeyValue { const dir = path.resolve(process.cwd(), 'node_modules', '@grafana'); const versions: KeyValue = {}; try { diff --git a/packages/grafana-toolkit/src/plugins/workflow.ts b/packages/plutono-toolkit/grafana-toolkit/src/plugins/workflow.ts similarity index 100% rename from packages/grafana-toolkit/src/plugins/workflow.ts rename to packages/plutono-toolkit/grafana-toolkit/src/plugins/workflow.ts diff --git a/packages/grafana-toolkit/tsconfig.json b/packages/plutono-toolkit/grafana-toolkit/tsconfig.json similarity index 100% rename from packages/grafana-toolkit/tsconfig.json rename to packages/plutono-toolkit/grafana-toolkit/tsconfig.json diff --git a/packages/grafana-ui/.eslintrc b/packages/plutono-ui/grafana-ui/.eslintrc similarity index 55% rename from packages/grafana-ui/.eslintrc rename to packages/plutono-ui/grafana-ui/.eslintrc index fa09290c8f..c074d042c2 100644 --- a/packages/grafana-ui/.eslintrc +++ b/packages/plutono-ui/grafana-ui/.eslintrc @@ -1,6 +1,6 @@ { "rules": { - "no-restricted-imports": ["error", { "patterns": ["@grafana/runtime", "@grafana/data/*", "@grafana/ui", "@grafana/e2e"] }] + "no-restricted-imports": ["error", { "patterns": ["@credativ/plutono-runtime", "@credativ/plutono-data/*", "@credativ/plutono-ui", "@credativ/plutono-e2e"] }] }, "overrides": [ { diff --git a/packages/grafana-ui/.storybook/main.ts b/packages/plutono-ui/grafana-ui/.storybook/main.ts similarity index 97% rename from packages/grafana-ui/.storybook/main.ts rename to packages/plutono-ui/grafana-ui/.storybook/main.ts index a7b4217a1a..a88c7ca78e 100644 --- a/packages/grafana-ui/.storybook/main.ts +++ b/packages/plutono-ui/grafana-ui/.storybook/main.ts @@ -123,7 +123,7 @@ module.exports = { : [], }; - config.resolve.alias['@grafana/ui'] = path.resolve(__dirname, '..'); + config.resolve.alias['@credativ/plutono-ui'] = path.resolve(__dirname, '..'); // Silence "export not found" webpack warnings with transpileOnly // https://github.com/TypeStrong/ts-loader#transpileonly diff --git a/packages/grafana-ui/.storybook/manager-head.html b/packages/plutono-ui/grafana-ui/.storybook/manager-head.html similarity index 100% rename from packages/grafana-ui/.storybook/manager-head.html rename to packages/plutono-ui/grafana-ui/.storybook/manager-head.html diff --git a/packages/grafana-ui/.storybook/preview.ts b/packages/plutono-ui/grafana-ui/.storybook/preview.ts similarity index 83% rename from packages/grafana-ui/.storybook/preview.ts rename to packages/plutono-ui/grafana-ui/.storybook/preview.ts index 9e40a52a34..dbeeb0a6f1 100644 --- a/packages/grafana-ui/.storybook/preview.ts +++ b/packages/plutono-ui/grafana-ui/.storybook/preview.ts @@ -11,10 +11,10 @@ import '../../../public/vendor/flot/jquery.flot.gauge'; import { withTheme } from '../src/utils/storybook/withTheme'; import { withPaddedStory } from '../src/utils/storybook/withPaddedStory'; // @ts-ignore -import lightTheme from '../../../public/sass/grafana.light.scss'; +import lightTheme from '../../../public/sass/plutono.light.scss'; // @ts-ignore -import darkTheme from '../../../public/sass/grafana.dark.scss'; -import { GrafanaLight, GrafanaDark } from './storybookTheme'; +import darkTheme from '../../../public/sass/plutono.dark.scss'; +import { PlutonoLight, PlutonoDark } from './storybookTheme'; import addons from '@storybook/addons'; const handleThemeChange = (theme: any) => { @@ -29,7 +29,7 @@ const handleThemeChange = (theme: any) => { addons.setConfig({ showRoots: false, - theme: GrafanaDark, + theme: PlutonoDark, }); export const decorators = [withTheme(handleThemeChange), withPaddedStory]; @@ -37,11 +37,11 @@ export const decorators = [withTheme(handleThemeChange), withPaddedStory]; export const parameters = { info: {}, docs: { - theme: GrafanaDark, + theme: PlutonoDark, }, darkMode: { - dark: GrafanaDark, - light: GrafanaLight, + dark: PlutonoDark, + light: PlutonoLight, }, options: { showPanel: true, diff --git a/packages/grafana-ui/.storybook/static/fav32.png b/packages/plutono-ui/grafana-ui/.storybook/static/fav32.png similarity index 100% rename from packages/grafana-ui/.storybook/static/fav32.png rename to packages/plutono-ui/grafana-ui/.storybook/static/fav32.png diff --git a/packages/grafana-ui/.storybook/static/grafana_icon.svg b/packages/plutono-ui/grafana-ui/.storybook/static/plutono_icon.svg similarity index 100% rename from packages/grafana-ui/.storybook/static/grafana_icon.svg rename to packages/plutono-ui/grafana-ui/.storybook/static/plutono_icon.svg diff --git a/packages/grafana-ui/.storybook/storybookTheme.ts b/packages/plutono-ui/grafana-ui/.storybook/storybookTheme.ts similarity index 79% rename from packages/grafana-ui/.storybook/storybookTheme.ts rename to packages/plutono-ui/grafana-ui/.storybook/storybookTheme.ts index 2188e82352..dad77d8f0c 100644 --- a/packages/grafana-ui/.storybook/storybookTheme.ts +++ b/packages/plutono-ui/grafana-ui/.storybook/storybookTheme.ts @@ -3,9 +3,9 @@ import { create } from '@storybook/theming/create'; import lightTheme from '../src/themes/light'; import darkTheme from '../src/themes/dark'; import ThemeCommons from '../src/themes/default'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; -const createTheme = (theme: GrafanaTheme) => { +const createTheme = (theme: PlutonoTheme) => { return create({ base: theme.name.includes('Light') ? 'light' : 'dark', @@ -37,13 +37,13 @@ const createTheme = (theme: GrafanaTheme) => { inputTextColor: theme.colors.formInputText, inputBorderRadius: 4, - brandTitle: 'Grafana UI', + brandTitle: 'Plutono UI', brandUrl: './', - brandImage: './grafana_icon.svg', + brandImage: './plutono_icon.svg', }); }; -const GrafanaLight = createTheme(lightTheme); -const GrafanaDark = createTheme(darkTheme); +const PlutonoLight = createTheme(lightTheme); +const PlutonoDark = createTheme(darkTheme); -export { GrafanaLight, GrafanaDark }; +export { PlutonoLight, PlutonoDark }; diff --git a/packages/grafana-ui/.storybook/tsconfig.json b/packages/plutono-ui/grafana-ui/.storybook/tsconfig.json similarity index 100% rename from packages/grafana-ui/.storybook/tsconfig.json rename to packages/plutono-ui/grafana-ui/.storybook/tsconfig.json diff --git a/packages/grafana-ui/CHANGELOG.md b/packages/plutono-ui/grafana-ui/CHANGELOG.md similarity index 75% rename from packages/grafana-ui/CHANGELOG.md rename to packages/plutono-ui/grafana-ui/CHANGELOG.md index f894f1dd71..bd7a6a4743 100644 --- a/packages/grafana-ui/CHANGELOG.md +++ b/packages/plutono-ui/grafana-ui/CHANGELOG.md @@ -6,12 +6,12 @@ # 7.2.0 (2020-09-23) ### Features / Enhancements -- **grafana/ui**: Do not bundle jQuery. [#27667](https://github.com/grafana/grafana/pull/27667), [@kennytm](https://github.com/kennytm) +- **plutono/ui**: Do not bundle jQuery. [#27667](https://github.com/grafana/grafana/pull/27667), [@kennytm](https://github.com/kennytm) # 7.1.0-beta1 (2020-07-01) ### Features / Enhancements -- **Grafana-UI**: Add FileUpload. [#25835](https://github.com/grafana/grafana/pull/25835), [@Clarity-89](https://github.com/Clarity-89) +- **Plutono-UI**: Add FileUpload. [#25835](https://github.com/grafana/grafana/pull/25835), [@Clarity-89](https://github.com/Clarity-89) - **Switch**: Deprecate checked prop in favor of value. [#25862](https://github.com/grafana/grafana/pull/25862), [@tskarhed](https://github.com/tskarhed) @@ -43,9 +43,9 @@ ## Breaking changes -### @grafana/ui forms migration notice +### @credativ/plutono-ui forms migration notice -In Grafana 7 we have migrated from our old form components to `LegacyForms` namespace. The new components were previously available under the `Forms` namespace. +In Plutono 7 we have migrated from our old form components to `LegacyForms` namespace. The new components were previously available under the `Forms` namespace. All the following components were moved to the LegacyForms namespace, and some replaced with the new form components: @@ -64,7 +64,7 @@ One exception to this is `FormLabel`, which has been renamed to `InlineFormLabel If you were previously using the legacy form styles and your plugin is breaking, change from this: ```jsx -import { Switch } from '@grafana/ui'; +import { Switch } from '@credativ/plutono-ui'; … ``` @@ -72,7 +72,7 @@ import { Switch } from '@grafana/ui'; To this: ```jsx -import { LegacyForms } from '@grafana/ui'; +import { LegacyForms } from '@credativ/plutono-ui'; … ``` @@ -80,7 +80,7 @@ import { LegacyForms } from '@grafana/ui'; If you were previously using the new form styles under the `Forms` namespace, change from this: ```jsx -import { Forms } from '@grafana/ui'; +import { Forms } from '@credativ/plutono-ui'; … ``` @@ -88,7 +88,7 @@ import { Forms } from '@grafana/ui'; To this: ```jsx -import { Switch} from '@grafana/ui'; +import { Switch} from '@credativ/plutono-ui'; … ``` @@ -102,7 +102,7 @@ Previously the only thing you had to do to enable creating a custom value with S Before: ```jsx -import { Select } from '@grafana/ui'; +import { Select } from '@credativ/plutono-ui'; ... . You can also pass + * Default form field including label used in Plutono 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 = ({ @@ -48,7 +48,7 @@ export const FormField: FunctionComponent = ({ FormField.displayName = 'FormField'; FormField.defaultProps = defaultProps; -const getStyles = (theme: GrafanaTheme) => { +const getStyles = (theme: PlutonoTheme) => { return { formField: css` display: flex; diff --git a/packages/grafana-ui/src/components/FormField/__snapshots__/FormField.test.tsx.snap b/packages/plutono-ui/grafana-ui/src/components/FormField/__snapshots__/FormField.test.tsx.snap similarity index 100% rename from packages/grafana-ui/src/components/FormField/__snapshots__/FormField.test.tsx.snap rename to packages/plutono-ui/grafana-ui/src/components/FormField/__snapshots__/FormField.test.tsx.snap diff --git a/packages/grafana-ui/src/components/FormLabel/FormLabel.tsx b/packages/plutono-ui/grafana-ui/src/components/FormLabel/FormLabel.tsx similarity index 100% rename from packages/grafana-ui/src/components/FormLabel/FormLabel.tsx rename to packages/plutono-ui/grafana-ui/src/components/FormLabel/FormLabel.tsx diff --git a/packages/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.mdx b/packages/plutono-ui/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.mdx similarity index 100% rename from packages/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.mdx rename to packages/plutono-ui/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.mdx diff --git a/packages/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.story.tsx b/packages/plutono-ui/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.story.tsx similarity index 82% rename from packages/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.story.tsx index d81bceb6b8..2d7451e06a 100644 --- a/packages/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.story.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { FormattedValueDisplay } from './FormattedValueDisplay'; -import { withCenteredStory } from '@grafana/ui/src/utils/storybook/withCenteredStory'; +import { withCenteredStory } from '@credativ/plutono-ui/src/utils/storybook/withCenteredStory'; import mdx from './FormattedValueDisplay.mdx'; export default { diff --git a/packages/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.tsx b/packages/plutono-ui/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.tsx similarity index 95% rename from packages/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.tsx rename to packages/plutono-ui/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.tsx index decb8f2486..d46d4ce0b4 100644 --- a/packages/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.tsx @@ -1,5 +1,5 @@ import React, { FC, CSSProperties, HTMLProps } from 'react'; -import { FormattedValue } from '@grafana/data'; +import { FormattedValue } from '@credativ/plutono-data'; export interface Props extends Omit, 'className' | 'value' | 'style'> { value: FormattedValue; diff --git a/packages/grafana-ui/src/components/Forms/Checkbox.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/Checkbox.mdx similarity index 96% rename from packages/grafana-ui/src/components/Forms/Checkbox.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Checkbox.mdx index 98fdf91961..8cbdcd71fb 100644 --- a/packages/grafana-ui/src/components/Forms/Checkbox.mdx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Checkbox.mdx @@ -29,7 +29,7 @@ Show only ### Usage ```jsx -import { Forms } from '@grafana/ui'; +import { Forms } from '@credativ/plutono-ui'; ``` diff --git a/packages/grafana-ui/src/components/Forms/Checkbox.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Checkbox.story.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Checkbox.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Checkbox.story.tsx diff --git a/packages/grafana-ui/src/components/Forms/Checkbox.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Checkbox.tsx similarity index 96% rename from packages/grafana-ui/src/components/Forms/Checkbox.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Checkbox.tsx index b446b46e19..91fbfd0038 100644 --- a/packages/grafana-ui/src/components/Forms/Checkbox.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Checkbox.tsx @@ -1,5 +1,5 @@ import React, { HTMLProps, useCallback } from 'react'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { getLabelStyles } from './Label'; import { useTheme, stylesFactory } from '../../themes'; import { css, cx } from 'emotion'; @@ -11,7 +11,7 @@ export interface CheckboxProps extends Omit, 'value' value?: boolean; } -export const getCheckboxStyles = stylesFactory((theme: GrafanaTheme) => { +export const getCheckboxStyles = stylesFactory((theme: PlutonoTheme) => { const labelStyles = getLabelStyles(theme); const checkboxSize = '16px'; return { diff --git a/packages/grafana-ui/src/components/Forms/Field.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/Field.mdx similarity index 89% rename from packages/grafana-ui/src/components/Forms/Field.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Field.mdx index 844ac0f039..6a65975cd5 100644 --- a/packages/grafana-ui/src/components/Forms/Field.mdx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Field.mdx @@ -10,7 +10,7 @@ import { Field } from "./Field"; ### Usage ```jsx -import { Forms } from '@grafana/ui'; +import { Forms } from '@credativ/plutono-ui'; diff --git a/packages/grafana-ui/src/components/Forms/Field.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Field.story.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Field.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Field.story.tsx diff --git a/packages/grafana-ui/src/components/Forms/Field.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Field.test.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Field.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Field.test.tsx diff --git a/packages/grafana-ui/src/components/Forms/Field.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Field.tsx similarity index 95% rename from packages/grafana-ui/src/components/Forms/Field.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Field.tsx index 6602f07f09..6809dba056 100644 --- a/packages/grafana-ui/src/components/Forms/Field.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Field.tsx @@ -2,7 +2,7 @@ import React, { HTMLAttributes } from 'react'; import { Label } from './Label'; import { stylesFactory, useTheme } from '../../themes'; import { css, cx } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { FieldValidationMessage } from './FieldValidationMessage'; import { getChildId } from '../../utils/children'; @@ -28,7 +28,7 @@ export interface FieldProps extends HTMLAttributes { className?: string; } -export const getFieldStyles = stylesFactory((theme: GrafanaTheme) => { +export const getFieldStyles = stylesFactory((theme: PlutonoTheme) => { return { field: css` display: flex; diff --git a/packages/grafana-ui/src/components/Forms/FieldArray.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldArray.mdx similarity index 95% rename from packages/grafana-ui/src/components/Forms/FieldArray.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/FieldArray.mdx index 465b68acc4..d7879a7aef 100644 --- a/packages/grafana-ui/src/components/Forms/FieldArray.mdx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldArray.mdx @@ -10,7 +10,7 @@ import { FieldArray } from './FieldArray'; ### Usage ```jsx -import { Form, FieldArray } from '@grafana/ui'; +import { Form, FieldArray } from '@credativ/plutono-ui';
({control, register}) => ( diff --git a/packages/grafana-ui/src/components/Forms/FieldArray.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldArray.story.tsx similarity index 95% rename from packages/grafana-ui/src/components/Forms/FieldArray.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/FieldArray.story.tsx index 0b4a473c59..c5049803f2 100644 --- a/packages/grafana-ui/src/components/Forms/FieldArray.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldArray.story.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import { withStoryContainer } from '../../utils/storybook/withStoryContainer'; -import { Form, Input, Button, HorizontalGroup } from '@grafana/ui'; +import { Form, Input, Button, HorizontalGroup } from '@credativ/plutono-ui'; import { FieldArray } from './FieldArray'; import mdx from './FieldArray.mdx'; diff --git a/packages/grafana-ui/src/components/Forms/FieldArray.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldArray.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/FieldArray.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/FieldArray.tsx diff --git a/packages/grafana-ui/src/components/Forms/FieldSet.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldSet.mdx similarity index 95% rename from packages/grafana-ui/src/components/Forms/FieldSet.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/FieldSet.mdx index a89f52a86d..b51cf1bff4 100644 --- a/packages/grafana-ui/src/components/Forms/FieldSet.mdx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldSet.mdx @@ -10,7 +10,7 @@ Accepts optional label, which, if provided, is used as a text for the set's lege ### Usage ```jsx -import { FieldSet } from '@grafana/ui'; +import { FieldSet } from '@credativ/plutono-ui'; console.log('Submit')}> {() => ( diff --git a/packages/grafana-ui/src/components/Forms/FieldSet.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldSet.story.tsx similarity index 93% rename from packages/grafana-ui/src/components/Forms/FieldSet.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/FieldSet.story.tsx index 38420169f6..8b82d08a77 100644 --- a/packages/grafana-ui/src/components/Forms/FieldSet.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldSet.story.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; -import { Input, Form, FieldSet, Field } from '@grafana/ui'; +import { Input, Form, FieldSet, Field } from '@credativ/plutono-ui'; import mdx from './FieldSet.mdx'; import { Button } from '../Button'; diff --git a/packages/grafana-ui/src/components/Forms/FieldSet.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldSet.tsx similarity index 86% rename from packages/grafana-ui/src/components/Forms/FieldSet.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/FieldSet.tsx index b71b416605..b2ffb67ea9 100644 --- a/packages/grafana-ui/src/components/Forms/FieldSet.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldSet.tsx @@ -1,6 +1,6 @@ import React, { FC, HTMLProps } from 'react'; import { css, cx } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { stylesFactory, useTheme } from '../../themes'; import { Legend } from './Legend'; @@ -22,7 +22,7 @@ export const FieldSet: FC = ({ label, children, className, ...rest }) => ); }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { wrapper: css` margin-bottom: ${theme.spacing.formSpacingBase * 4}px; diff --git a/packages/grafana-ui/src/components/Forms/FieldValidationMessage.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldValidationMessage.mdx similarity index 100% rename from packages/grafana-ui/src/components/Forms/FieldValidationMessage.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/FieldValidationMessage.mdx diff --git a/packages/grafana-ui/src/components/Forms/FieldValidationMessage.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldValidationMessage.story.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/FieldValidationMessage.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/FieldValidationMessage.story.tsx diff --git a/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldValidationMessage.tsx similarity index 96% rename from packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/FieldValidationMessage.tsx index c7ccbf7413..ea7ac96465 100644 --- a/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/FieldValidationMessage.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { css, cx } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { Icon } from '../Icon/Icon'; import { useTheme, stylesFactory } from '../../themes'; @@ -11,7 +11,7 @@ export interface FieldValidationMessageProps { horizontal?: boolean; } -export const getFieldValidationMessageStyles = stylesFactory((theme: GrafanaTheme) => { +export const getFieldValidationMessageStyles = stylesFactory((theme: PlutonoTheme) => { const baseStyle = ` font-size: ${theme.typography.size.sm}; font-weight: ${theme.typography.weight.semibold}; diff --git a/packages/grafana-ui/src/components/Forms/Form.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/Form.mdx similarity index 97% rename from packages/grafana-ui/src/components/Forms/Form.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Form.mdx index fdfcb66dec..7e1c4b12c6 100644 --- a/packages/grafana-ui/src/components/Forms/Form.mdx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Form.mdx @@ -5,12 +5,12 @@ import { Form } from "./Form"; # Form -Form component provides a way to build simple forms at Grafana. It is built on top of [react-hook-form](https://react-hook-form.com/) library and incorporates the same concepts while adjusting the API slightly. +Form component provides a way to build simple forms at Plutono. It is built on top of [react-hook-form](https://react-hook-form.com/) library and incorporates the same concepts while adjusting the API slightly. ## Usage ```jsx -import { Forms } from '@grafana/ui'; +import { Forms } from '@credativ/plutono-ui'; interface UserDTO { name: string; @@ -81,7 +81,7 @@ There are some components like `RadioButton` or `Select` that are controlled-onl them work with the form, you need to render those using `InputControl` component: ```jsx -import { Form, Field, InputControl } from '@grafana/ui'; +import { Form, Field, InputControl } from '@credativ/plutono-ui'; // render function {({register, errors, control}) => ( diff --git a/packages/grafana-ui/src/components/Forms/Form.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Form.story.tsx similarity index 99% rename from packages/grafana-ui/src/components/Forms/Form.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Form.story.tsx index 5989e70468..69e5fc96ec 100644 --- a/packages/grafana-ui/src/components/Forms/Form.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Form.story.tsx @@ -17,7 +17,7 @@ import { InputControl, TextArea, RadioButtonGroup, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; export default { title: 'Forms/Example forms', diff --git a/packages/grafana-ui/src/components/Forms/Form.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Form.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Form.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Form.tsx diff --git a/packages/grafana-ui/src/components/Forms/InlineField.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineField.mdx similarity index 100% rename from packages/grafana-ui/src/components/Forms/InlineField.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/InlineField.mdx diff --git a/packages/grafana-ui/src/components/Forms/InlineField.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineField.story.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/InlineField.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/InlineField.story.tsx diff --git a/packages/grafana-ui/src/components/Forms/InlineField.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineField.test.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/InlineField.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/InlineField.test.tsx diff --git a/packages/grafana-ui/src/components/Forms/InlineField.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineField.tsx similarity index 93% rename from packages/grafana-ui/src/components/Forms/InlineField.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/InlineField.tsx index 3156c69a8e..b456c4ba0a 100644 --- a/packages/grafana-ui/src/components/Forms/InlineField.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineField.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import { cx, css } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { useTheme } from '../../themes'; import { InlineLabel } from './InlineLabel'; import { PopoverContent } from '../Tooltip/Tooltip'; @@ -54,7 +54,7 @@ export const InlineField: FC = ({ InlineField.displayName = 'InlineField'; -const getStyles = (theme: GrafanaTheme, grow?: boolean) => { +const getStyles = (theme: PlutonoTheme, grow?: boolean) => { return { container: css` display: flex; diff --git a/packages/grafana-ui/src/components/Forms/InlineFieldRow.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineFieldRow.mdx similarity index 100% rename from packages/grafana-ui/src/components/Forms/InlineFieldRow.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/InlineFieldRow.mdx diff --git a/packages/grafana-ui/src/components/Forms/InlineFieldRow.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineFieldRow.story.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/InlineFieldRow.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/InlineFieldRow.story.tsx diff --git a/packages/grafana-ui/src/components/Forms/InlineFieldRow.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineFieldRow.tsx similarity index 86% rename from packages/grafana-ui/src/components/Forms/InlineFieldRow.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/InlineFieldRow.tsx index be01e43735..bb65377539 100644 --- a/packages/grafana-ui/src/components/Forms/InlineFieldRow.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineFieldRow.tsx @@ -1,7 +1,7 @@ import React, { FC, HTMLProps, ReactNode } from 'react'; import { css, cx } from 'emotion'; import { useStyles } from '../../themes'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; export interface Props extends Omit, 'css'> { children: ReactNode | ReactNode[]; @@ -16,7 +16,7 @@ export const InlineFieldRow: FC = ({ children, className, ...htmlProps }) ); }; -const getStyles = (theme: GrafanaTheme) => { +const getStyles = (theme: PlutonoTheme) => { return { container: css` label: InlineFieldRow; diff --git a/packages/grafana-ui/src/components/Forms/InlineLabel.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineLabel.mdx similarity index 100% rename from packages/grafana-ui/src/components/Forms/InlineLabel.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/InlineLabel.mdx diff --git a/packages/grafana-ui/src/components/Forms/InlineLabel.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineLabel.story.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/InlineLabel.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/InlineLabel.story.tsx diff --git a/packages/grafana-ui/src/components/Forms/InlineLabel.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineLabel.tsx similarity index 95% rename from packages/grafana-ui/src/components/Forms/InlineLabel.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/InlineLabel.tsx index 714b416173..98c3505307 100644 --- a/packages/grafana-ui/src/components/Forms/InlineLabel.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineLabel.tsx @@ -1,5 +1,5 @@ import React, { FunctionComponent } from 'react'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { css, cx } from 'emotion'; import { Tooltip, PopoverContent } from '../Tooltip/Tooltip'; import { Icon } from '../Icon/Icon'; @@ -48,7 +48,7 @@ export const InlineLabel: FunctionComponent = ({ ); }; -export const getInlineLabelStyles = (theme: GrafanaTheme, transparent = false, width?: number | 'auto') => { +export const getInlineLabelStyles = (theme: PlutonoTheme, transparent = false, width?: number | 'auto') => { return { label: css` display: flex; diff --git a/packages/grafana-ui/src/components/Forms/InlineSegmentGroup.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineSegmentGroup.tsx similarity index 87% rename from packages/grafana-ui/src/components/Forms/InlineSegmentGroup.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/InlineSegmentGroup.tsx index e733a47e38..9a206c2697 100644 --- a/packages/grafana-ui/src/components/Forms/InlineSegmentGroup.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/InlineSegmentGroup.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import { cx, css } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { useTheme } from '../../themes'; export interface Props { @@ -22,7 +22,7 @@ export const InlineSegmentGroup: FC = ({ children, className, grow, ...ht InlineSegmentGroup.displayName = 'InlineSegmentGroup'; -const getStyles = (theme: GrafanaTheme, grow?: boolean) => { +const getStyles = (theme: PlutonoTheme, grow?: boolean) => { return { container: css` display: flex; diff --git a/packages/grafana-ui/src/components/Forms/Label.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/Label.mdx similarity index 82% rename from packages/grafana-ui/src/components/Forms/Label.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Label.mdx index f97fb3d112..17113bc4e1 100644 --- a/packages/grafana-ui/src/components/Forms/Label.mdx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Label.mdx @@ -7,7 +7,7 @@ import { Label } from "./Label"; The label component can be used to label form inputs with a heading/"Option name" and a description. To automatically have the right arrangement of this component with a form input, use the `Field` component. There is also a categorised variant of the label, where the heading shows nested categories before the actual option name. -This label component is used in full-page forms in Grafana, for example in the datasource settings. In some parts of Grafana, there are inline forms which do not use this type of label. +This label component is used in full-page forms in Plutono, for example in the datasource settings. In some parts of Plutono, there are inline forms which do not use this type of label. ### Props diff --git a/packages/grafana-ui/src/components/Forms/Label.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Label.story.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Label.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Label.story.tsx diff --git a/packages/grafana-ui/src/components/Forms/Label.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Label.tsx similarity index 94% rename from packages/grafana-ui/src/components/Forms/Label.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Label.tsx index 688cc9d830..ef704a8c2a 100644 --- a/packages/grafana-ui/src/components/Forms/Label.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Label.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { useTheme, stylesFactory } from '../../themes'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { css, cx } from 'emotion'; import { Icon } from '../Icon/Icon'; import tinycolor from 'tinycolor2'; @@ -11,7 +11,7 @@ export interface LabelProps extends React.LabelHTMLAttributes category?: string[]; } -export const getLabelStyles = stylesFactory((theme: GrafanaTheme) => { +export const getLabelStyles = stylesFactory((theme: PlutonoTheme) => { return { label: css` label: Label; diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Input/Input.story.internal.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Input/Input.story.internal.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Input/Input.story.internal.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Input/Input.story.internal.tsx diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Input/Input.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Input/Input.test.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Input/Input.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Input/Input.test.tsx diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Input/Input.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Input/Input.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Input/Input.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Input/Input.tsx diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Input/__snapshots__/Input.test.tsx.snap b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Input/__snapshots__/Input.test.tsx.snap similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Input/__snapshots__/Input.test.tsx.snap rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Input/__snapshots__/Input.test.tsx.snap diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Select/IndicatorsContainer.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/IndicatorsContainer.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Select/IndicatorsContainer.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/IndicatorsContainer.tsx diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Select/NoOptionsMessage.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/NoOptionsMessage.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Select/NoOptionsMessage.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/NoOptionsMessage.tsx diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.story.internal.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/Select.story.internal.tsx similarity index 97% rename from packages/grafana-ui/src/components/Forms/Legacy/Select/Select.story.internal.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/Select.story.internal.tsx index d801ae0e7f..475cd337e9 100644 --- a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.story.internal.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/Select.story.internal.tsx @@ -3,7 +3,7 @@ import { action } from '@storybook/addon-actions'; import { withKnobs, object } from '@storybook/addon-knobs'; import { withCenteredStory } from '../../../../utils/storybook/withCenteredStory'; import { UseState } from '../../../../utils/storybook/UseState'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { Select, AsyncSelect as AsyncSelectComponent } from './Select'; export default { diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx similarity index 99% rename from packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx index 186188a897..7de1980a5a 100644 --- a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx @@ -22,7 +22,7 @@ import NoOptionsMessage from './NoOptionsMessage'; import resetSelectStyles from '../../../Select/resetSelectStyles'; import { CustomScrollbar } from '../../../CustomScrollbar/CustomScrollbar'; import { PopoverContent, Tooltip } from '../../../Tooltip/Tooltip'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; /** * Changes in new selects: diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.test.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.test.tsx diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/SelectOption.tsx diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Select/_Select.scss b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/_Select.scss similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Select/_Select.scss rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/_Select.scss diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Select/__snapshots__/SelectOption.test.tsx.snap b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/__snapshots__/SelectOption.test.tsx.snap similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Select/__snapshots__/SelectOption.test.tsx.snap rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Select/__snapshots__/SelectOption.test.tsx.snap diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Switch/Switch.mdx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Switch/Switch.mdx diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.story.internal.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Switch/Switch.story.internal.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.story.internal.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Switch/Switch.story.internal.tsx diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Switch/Switch.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legacy/Switch/Switch.tsx diff --git a/packages/grafana-ui/src/components/Forms/Legend.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legend.mdx similarity index 89% rename from packages/grafana-ui/src/components/Forms/Legend.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legend.mdx index 43715552f3..f03c457e32 100644 --- a/packages/grafana-ui/src/components/Forms/Legend.mdx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Legend.mdx @@ -14,7 +14,7 @@ Legend should be used to add a caption to a group of related form elements that ### Usage ```jsx -import { Forms } from '@grafana/ui'; +import { Forms } from '@credativ/plutono-ui'; {label} ``` diff --git a/packages/grafana-ui/src/components/Forms/Legend.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legend.story.tsx similarity index 89% rename from packages/grafana-ui/src/components/Forms/Legend.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legend.story.tsx index 9f6b8c3035..1e86b83884 100644 --- a/packages/grafana-ui/src/components/Forms/Legend.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Legend.story.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { text } from '@storybook/addon-knobs'; -import { Legend } from '@grafana/ui'; +import { Legend } from '@credativ/plutono-ui'; import mdx from './Legend.mdx'; const getKnobs = () => { diff --git a/packages/grafana-ui/src/components/Forms/Legend.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/Legend.tsx similarity index 86% rename from packages/grafana-ui/src/components/Forms/Legend.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/Legend.tsx index 774af2c4a4..5d32e90841 100644 --- a/packages/grafana-ui/src/components/Forms/Legend.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/Legend.tsx @@ -1,6 +1,6 @@ import React, { ReactNode } from 'react'; import { useTheme, stylesFactory } from '../../themes'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { css, cx } from 'emotion'; export interface LabelProps extends React.HTMLAttributes { @@ -8,7 +8,7 @@ export interface LabelProps extends React.HTMLAttributes { description?: string; } -export const getLegendStyles = stylesFactory((theme: GrafanaTheme) => { +export const getLegendStyles = stylesFactory((theme: PlutonoTheme) => { return { legend: css` font-size: ${theme.typography.heading.h3}; diff --git a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.tsx similarity index 96% rename from packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.tsx index 6588b6260c..9878ebe683 100644 --- a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButton.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { useTheme, stylesFactory } from '../../../themes'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { css, cx } from 'emotion'; import { getPropertiesForButtonSize } from '../commonStyles'; import { focusCss } from '../../../themes/mixins'; @@ -18,7 +18,7 @@ export interface RadioButtonProps { fullWidth?: boolean; } -const getRadioButtonStyles = stylesFactory((theme: GrafanaTheme, size: RadioButtonSize, fullWidth?: boolean) => { +const getRadioButtonStyles = stylesFactory((theme: PlutonoTheme, size: RadioButtonSize, fullWidth?: boolean) => { const { fontSize, height, padding } = getPropertiesForButtonSize(size, theme); const c = theme.palette; diff --git a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.mdx b/packages/plutono-ui/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.mdx similarity index 96% rename from packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.mdx rename to packages/plutono-ui/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.mdx index 021ca405a7..17f081cd39 100644 --- a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.mdx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.mdx @@ -16,7 +16,7 @@ Radio buttons can only exist in this type of group. If you want one single optio ### Usage ```jsx -import { RadioButtonGroup } from '@grafana/ui'; +import { RadioButtonGroup } from '@credativ/plutono-ui'; ``` diff --git a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx similarity index 100% rename from packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx diff --git a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx b/packages/plutono-ui/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx similarity index 97% rename from packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx rename to packages/plutono-ui/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx index 3e8b3020f4..f265ee3ab1 100644 --- a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx @@ -1,7 +1,7 @@ import React, { useCallback, useRef } from 'react'; import { css, cx } from 'emotion'; import uniqueId from 'lodash/uniqueId'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { RadioButtonSize, RadioButton } from './RadioButton'; import { Icon } from '../../Icon/Icon'; import { IconName } from '../../../types/icon'; diff --git a/packages/grafana-ui/src/components/Forms/commonStyles.ts b/packages/plutono-ui/grafana-ui/src/components/Forms/commonStyles.ts similarity index 93% rename from packages/grafana-ui/src/components/Forms/commonStyles.ts rename to packages/plutono-ui/grafana-ui/src/components/Forms/commonStyles.ts index c2c33814f7..20979d001c 100644 --- a/packages/grafana-ui/src/components/Forms/commonStyles.ts +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/commonStyles.ts @@ -1,15 +1,15 @@ import { css } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { focusCss } from '../../themes/mixins'; import { ComponentSize } from '../../types/size'; -export const getFocusStyle = (theme: GrafanaTheme) => css` +export const getFocusStyle = (theme: PlutonoTheme) => css` &:focus { ${focusCss(theme)} } `; -export const sharedInputStyle = (theme: GrafanaTheme, invalid = false) => { +export const sharedInputStyle = (theme: PlutonoTheme, invalid = false) => { const colors = theme.colors; const borderColor = invalid ? theme.palette.redBase : colors.formInputBorder; @@ -86,7 +86,7 @@ export const inputSizesPixels = (size: string) => { } }; -export function getPropertiesForButtonSize(size: ComponentSize, theme: GrafanaTheme) { +export function getPropertiesForButtonSize(size: ComponentSize, theme: PlutonoTheme) { const { typography, height, spacing } = theme; switch (size) { diff --git a/packages/grafana-ui/src/components/Forms/getFormStyles.ts b/packages/plutono-ui/grafana-ui/src/components/Forms/getFormStyles.ts similarity index 88% rename from packages/grafana-ui/src/components/Forms/getFormStyles.ts rename to packages/plutono-ui/grafana-ui/src/components/Forms/getFormStyles.ts index 7036373907..ef246c92b9 100644 --- a/packages/grafana-ui/src/components/Forms/getFormStyles.ts +++ b/packages/plutono-ui/grafana-ui/src/components/Forms/getFormStyles.ts @@ -1,5 +1,5 @@ import { stylesFactory } from '../../themes'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { getLabelStyles } from './Label'; import { getLegendStyles } from './Legend'; import { getFieldValidationMessageStyles } from './FieldValidationMessage'; @@ -9,7 +9,7 @@ import { getInputStyles } from '../Input/Input'; import { getCheckboxStyles } from './Checkbox'; export const getFormStyles = stylesFactory( - (theme: GrafanaTheme, options: { variant: ButtonVariant; size: ComponentSize; invalid: boolean }) => { + (theme: PlutonoTheme, options: { variant: ButtonVariant; size: ComponentSize; invalid: boolean }) => { return { label: getLabelStyles(theme), legend: getLegendStyles(theme), diff --git a/packages/grafana-ui/src/components/Forms/types.ts b/packages/plutono-ui/grafana-ui/src/components/Forms/types.ts similarity index 100% rename from packages/grafana-ui/src/components/Forms/types.ts rename to packages/plutono-ui/grafana-ui/src/components/Forms/types.ts diff --git a/packages/grafana-ui/src/components/Gauge/Gauge.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Gauge/Gauge.test.tsx similarity index 98% rename from packages/grafana-ui/src/components/Gauge/Gauge.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Gauge/Gauge.test.tsx index 251e50e8d0..3a84ddd80e 100644 --- a/packages/grafana-ui/src/components/Gauge/Gauge.test.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Gauge/Gauge.test.tsx @@ -3,7 +3,7 @@ import { shallow } from 'enzyme'; import { Gauge, Props } from './Gauge'; import { getTheme } from '../../themes'; -import { ThresholdsMode, FieldConfig, FieldColorModeId } from '@grafana/data'; +import { ThresholdsMode, FieldConfig, FieldColorModeId } from '@credativ/plutono-data'; jest.mock('jquery', () => ({ plot: jest.fn(), diff --git a/packages/grafana-ui/src/components/Gauge/Gauge.tsx b/packages/plutono-ui/grafana-ui/src/components/Gauge/Gauge.tsx similarity index 99% rename from packages/grafana-ui/src/components/Gauge/Gauge.tsx rename to packages/plutono-ui/grafana-ui/src/components/Gauge/Gauge.tsx index 1087c91e6e..c6f338a2e3 100644 --- a/packages/grafana-ui/src/components/Gauge/Gauge.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Gauge/Gauge.tsx @@ -11,7 +11,7 @@ import { FieldColorModeId, FALLBACK_COLOR, TextDisplayOptions, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { Themeable } from '../../types'; import { calculateFontSize } from '../../utils/measureText'; diff --git a/packages/grafana-ui/src/components/Graph/Graph.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Graph/Graph.story.tsx similarity index 97% rename from packages/grafana-ui/src/components/Graph/Graph.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Graph/Graph.story.tsx index f16412265b..7994252344 100644 --- a/packages/grafana-ui/src/components/Graph/Graph.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/Graph.story.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { Graph } from '@grafana/ui'; +import { Graph } from '@credativ/plutono-ui'; import Chart from '../Chart'; -import { dateTime, ArrayVector, FieldType, GraphSeriesXY, FieldColorModeId } from '@grafana/data'; +import { dateTime, ArrayVector, FieldType, GraphSeriesXY, FieldColorModeId } from '@credativ/plutono-data'; import { select } from '@storybook/addon-knobs'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import { TooltipContentProps } from '../Chart/Tooltip'; diff --git a/packages/grafana-ui/src/components/Graph/Graph.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Graph/Graph.test.tsx similarity index 99% rename from packages/grafana-ui/src/components/Graph/Graph.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Graph/Graph.test.tsx index 08e0df1496..6acbd07f17 100644 --- a/packages/grafana-ui/src/components/Graph/Graph.test.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/Graph.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { mount } from 'enzyme'; import Graph from './Graph'; import Chart from '../Chart'; -import { GraphSeriesXY, FieldType, ArrayVector, dateTime, FieldColorModeId } from '@grafana/data'; +import { GraphSeriesXY, FieldType, ArrayVector, dateTime, FieldColorModeId } from '@credativ/plutono-data'; const series: GraphSeriesXY[] = [ { diff --git a/packages/grafana-ui/src/components/Graph/Graph.tsx b/packages/plutono-ui/grafana-ui/src/components/Graph/Graph.tsx similarity index 99% rename from packages/grafana-ui/src/components/Graph/Graph.tsx rename to packages/plutono-ui/grafana-ui/src/components/Graph/Graph.tsx index cd73659e98..a741b8b384 100644 --- a/packages/grafana-ui/src/components/Graph/Graph.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/Graph.tsx @@ -3,7 +3,7 @@ import $ from 'jquery'; import React, { PureComponent } from 'react'; import uniqBy from 'lodash/uniqBy'; // Types -import { TimeRange, GraphSeriesXY, TimeZone, createDimension } from '@grafana/data'; +import { TimeRange, GraphSeriesXY, TimeZone, createDimension } from '@credativ/plutono-data'; import _ from 'lodash'; import { FlotPosition, FlotItem } from './types'; import { TooltipProps, TooltipContentProps, ActiveDimensions, Tooltip } from '../Chart/Tooltip'; diff --git a/packages/grafana-ui/src/components/Graph/GraphContextMenu.tsx b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphContextMenu.tsx similarity index 99% rename from packages/grafana-ui/src/components/Graph/GraphContextMenu.tsx rename to packages/plutono-ui/grafana-ui/src/components/Graph/GraphContextMenu.tsx index 50fe948ac7..349fda1fb4 100644 --- a/packages/grafana-ui/src/components/Graph/GraphContextMenu.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphContextMenu.tsx @@ -9,7 +9,7 @@ import { dateTimeFormat, TimeZone, FormattedValue, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { useTheme } from '../../themes'; import { HorizontalGroup } from '../Layout/Layout'; import { FormattedValueDisplay } from '../FormattedValueDisplay/FormattedValueDisplay'; diff --git a/packages/grafana-ui/src/components/Graph/GraphSeriesToggler.tsx b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphSeriesToggler.tsx similarity index 97% rename from packages/grafana-ui/src/components/Graph/GraphSeriesToggler.tsx rename to packages/plutono-ui/grafana-ui/src/components/Graph/GraphSeriesToggler.tsx index 66c5115c33..168385cdbe 100644 --- a/packages/grafana-ui/src/components/Graph/GraphSeriesToggler.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphSeriesToggler.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { GraphSeriesXY } from '@grafana/data'; +import { GraphSeriesXY } from '@credativ/plutono-data'; import difference from 'lodash/difference'; import isEqual from 'lodash/isEqual'; diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/GraphTooltip.tsx b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/GraphTooltip.tsx similarity index 100% rename from packages/grafana-ui/src/components/Graph/GraphTooltip/GraphTooltip.tsx rename to packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/GraphTooltip.tsx diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx similarity index 97% rename from packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx index a1b9f971fb..8da0c09333 100644 --- a/packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { mount } from 'enzyme'; import { MultiModeGraphTooltip } from './MultiModeGraphTooltip'; -import { createDimension, ArrayVector, FieldType } from '@grafana/data'; +import { createDimension, ArrayVector, FieldType } from '@credativ/plutono-data'; import { GraphDimensions } from './types'; import { ActiveDimensions } from '../../Chart/Tooltip'; diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.tsx b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.tsx similarity index 95% rename from packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.tsx rename to packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.tsx index bf5dafa6f1..d5dac4c364 100644 --- a/packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.tsx @@ -3,7 +3,7 @@ import { SeriesTable } from './SeriesTable'; import { GraphTooltipContentProps } from './types'; import { getMultiSeriesGraphHoverInfo } from '../utils'; import { FlotPosition } from '../types'; -import { getValueFromDimension } from '@grafana/data'; +import { getValueFromDimension } from '@credativ/plutono-data'; export const MultiModeGraphTooltip: React.FC< GraphTooltipContentProps & { diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/SeriesTable.tsx b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/SeriesTable.tsx similarity index 94% rename from packages/grafana-ui/src/components/Graph/GraphTooltip/SeriesTable.tsx rename to packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/SeriesTable.tsx index 629bd24c55..5d61d9eba3 100644 --- a/packages/grafana-ui/src/components/Graph/GraphTooltip/SeriesTable.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/SeriesTable.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { stylesFactory } from '../../../themes/stylesFactory'; -import { GrafanaTheme, GraphSeriesValue } from '@grafana/data'; +import { PlutonoTheme, GraphSeriesValue } from '@credativ/plutono-data'; import { css, cx } from 'emotion'; import { SeriesIcon } from '../../VizLegend/SeriesIcon'; import { useTheme } from '../../../themes'; @@ -12,7 +12,7 @@ export interface SeriesTableRowProps { isActive?: boolean; } -const getSeriesTableRowStyles = stylesFactory((theme: GrafanaTheme) => { +const getSeriesTableRowStyles = stylesFactory((theme: PlutonoTheme) => { return { icon: css` margin-right: ${theme.spacing.xs}; diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx similarity index 97% rename from packages/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx rename to packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx index c20536e740..961f925267 100644 --- a/packages/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx @@ -5,7 +5,7 @@ import { formattedValueToString, getDisplayProcessor, getFieldDisplayName, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { SeriesTable } from './SeriesTable'; import { GraphTooltipContentProps } from './types'; diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/types.ts b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/types.ts similarity index 84% rename from packages/grafana-ui/src/components/Graph/GraphTooltip/types.ts rename to packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/types.ts index 7fea3fa729..45a69acdb7 100644 --- a/packages/grafana-ui/src/components/Graph/GraphTooltip/types.ts +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphTooltip/types.ts @@ -1,5 +1,5 @@ import { ActiveDimensions, TooltipMode } from '../../Chart/Tooltip'; -import { Dimension, Dimensions, TimeZone } from '@grafana/data'; +import { Dimension, Dimensions, TimeZone } from '@credativ/plutono-data'; export interface GraphTooltipOptions { mode: TooltipMode; diff --git a/packages/grafana-ui/src/components/Graph/GraphWithLegend.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphWithLegend.story.tsx similarity index 98% rename from packages/grafana-ui/src/components/Graph/GraphWithLegend.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Graph/GraphWithLegend.story.tsx index cb127592aa..0c75a10702 100644 --- a/packages/grafana-ui/src/components/Graph/GraphWithLegend.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphWithLegend.story.tsx @@ -4,7 +4,7 @@ import { select, text } from '@storybook/addon-knobs'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import { GraphWithLegend, GraphWithLegendProps } from './GraphWithLegend'; import { LegendPlacement, LegendDisplayMode } from '../VizLegend/types'; -import { GraphSeriesXY, FieldType, ArrayVector, dateTime, FieldColorModeId } from '@grafana/data'; +import { GraphSeriesXY, FieldType, ArrayVector, dateTime, FieldColorModeId } from '@credativ/plutono-data'; export default { title: 'Visualizations/Graph/GraphWithLegend', diff --git a/packages/grafana-ui/src/components/Graph/GraphWithLegend.tsx b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphWithLegend.tsx similarity index 98% rename from packages/grafana-ui/src/components/Graph/GraphWithLegend.tsx rename to packages/plutono-ui/grafana-ui/src/components/Graph/GraphWithLegend.tsx index 0845f47695..572bd58aaa 100644 --- a/packages/grafana-ui/src/components/Graph/GraphWithLegend.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/GraphWithLegend.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { css } from 'emotion'; -import { GraphSeriesValue } from '@grafana/data'; +import { GraphSeriesValue } from '@credativ/plutono-data'; import { Graph, GraphProps } from './Graph'; import { VizLegendItem, LegendDisplayMode, SeriesColorChangeHandler, LegendPlacement } from '../VizLegend/types'; diff --git a/packages/grafana-ui/src/components/Graph/types.ts b/packages/plutono-ui/grafana-ui/src/components/Graph/types.ts similarity index 100% rename from packages/grafana-ui/src/components/Graph/types.ts rename to packages/plutono-ui/grafana-ui/src/components/Graph/types.ts diff --git a/packages/grafana-ui/src/components/Graph/utils.test.ts b/packages/plutono-ui/grafana-ui/src/components/Graph/utils.test.ts similarity index 99% rename from packages/grafana-ui/src/components/Graph/utils.test.ts rename to packages/plutono-ui/grafana-ui/src/components/Graph/utils.test.ts index 4925ecac15..74724c21f4 100644 --- a/packages/grafana-ui/src/components/Graph/utils.test.ts +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/utils.test.ts @@ -6,7 +6,7 @@ import { FieldColorModeId, Field, getColorForTheme, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { getTheme } from '../../themes'; import { getMultiSeriesGraphHoverInfo, findHoverIndexFromData, graphTimeFormat } from './utils'; diff --git a/packages/grafana-ui/src/components/Graph/utils.ts b/packages/plutono-ui/grafana-ui/src/components/Graph/utils.ts similarity index 99% rename from packages/grafana-ui/src/components/Graph/utils.ts rename to packages/plutono-ui/grafana-ui/src/components/Graph/utils.ts index 1ce80c184c..02054ba471 100644 --- a/packages/grafana-ui/src/components/Graph/utils.ts +++ b/packages/plutono-ui/grafana-ui/src/components/Graph/utils.ts @@ -7,7 +7,7 @@ import { TimeZone, dateTimeFormat, systemDateFormats, -} from '@grafana/data'; +} from '@credativ/plutono-data'; /** * Returns index of the closest datapoint BEFORE hover position diff --git a/packages/grafana-ui/src/components/GraphNG/GraphNG.story.tsx b/packages/plutono-ui/grafana-ui/src/components/GraphNG/GraphNG.story.tsx similarity index 95% rename from packages/grafana-ui/src/components/GraphNG/GraphNG.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/GraphNG/GraphNG.story.tsx index 7a8ff24cf1..93b9f2df95 100644 --- a/packages/grafana-ui/src/components/GraphNG/GraphNG.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/GraphNG/GraphNG.story.tsx @@ -1,4 +1,4 @@ -import { FieldColorModeId, toDataFrame, dateTime } from '@grafana/data'; +import { FieldColorModeId, toDataFrame, dateTime } from '@credativ/plutono-data'; import React from 'react'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import { GraphNG } from './GraphNG'; diff --git a/packages/grafana-ui/src/components/GraphNG/GraphNG.tsx b/packages/plutono-ui/grafana-ui/src/components/GraphNG/GraphNG.tsx similarity index 99% rename from packages/grafana-ui/src/components/GraphNG/GraphNG.tsx rename to packages/plutono-ui/grafana-ui/src/components/GraphNG/GraphNG.tsx index 23f98a4ca3..65967a9fee 100755 --- a/packages/grafana-ui/src/components/GraphNG/GraphNG.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/GraphNG/GraphNG.tsx @@ -10,7 +10,7 @@ import { FieldType, TimeRange, TimeZone, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { withTheme } from '../../themes'; import { Themeable } from '../../types'; import { UPlotConfigBuilder } from '../uPlot/config/UPlotConfigBuilder'; diff --git a/packages/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap b/packages/plutono-ui/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap similarity index 100% rename from packages/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap rename to packages/plutono-ui/grafana-ui/src/components/GraphNG/__snapshots__/utils.test.ts.snap diff --git a/packages/grafana-ui/src/components/GraphNG/hooks.ts b/packages/plutono-ui/grafana-ui/src/components/GraphNG/hooks.ts similarity index 92% rename from packages/grafana-ui/src/components/GraphNG/hooks.ts rename to packages/plutono-ui/grafana-ui/src/components/GraphNG/hooks.ts index 3d35a95e79..efcee68b96 100644 --- a/packages/grafana-ui/src/components/GraphNG/hooks.ts +++ b/packages/plutono-ui/grafana-ui/src/components/GraphNG/hooks.ts @@ -1,4 +1,4 @@ -import { DataFrame, DataFrameFieldIndex, Field } from '@grafana/data'; +import { DataFrame, DataFrameFieldIndex, Field } from '@credativ/plutono-data'; import { XYFieldMatchers } from './types'; import React, { useCallback, useContext } from 'react'; diff --git a/packages/grafana-ui/src/components/GraphNG/types.ts b/packages/plutono-ui/grafana-ui/src/components/GraphNG/types.ts similarity index 87% rename from packages/grafana-ui/src/components/GraphNG/types.ts rename to packages/plutono-ui/grafana-ui/src/components/GraphNG/types.ts index 9ad1323a5e..7fc356b760 100644 --- a/packages/grafana-ui/src/components/GraphNG/types.ts +++ b/packages/plutono-ui/grafana-ui/src/components/GraphNG/types.ts @@ -1,4 +1,4 @@ -import { DataFrameFieldIndex, FieldMatcher } from '@grafana/data'; +import { DataFrameFieldIndex, FieldMatcher } from '@credativ/plutono-data'; /** * Mode to describe if a legend is isolated/selected or being appended to an existing diff --git a/packages/grafana-ui/src/components/GraphNG/utils.test.ts b/packages/plutono-ui/grafana-ui/src/components/GraphNG/utils.test.ts similarity index 95% rename from packages/grafana-ui/src/components/GraphNG/utils.test.ts rename to packages/plutono-ui/grafana-ui/src/components/GraphNG/utils.test.ts index 30b5a57d48..afa7944ff9 100644 --- a/packages/grafana-ui/src/components/GraphNG/utils.test.ts +++ b/packages/plutono-ui/grafana-ui/src/components/GraphNG/utils.test.ts @@ -6,9 +6,9 @@ import { fieldMatchers, FieldType, getDefaultTimeRange, - GrafanaTheme, + PlutonoTheme, MutableDataFrame, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { BarAlignment, DrawStyle, GraphFieldConfig, GraphGradientMode, LineInterpolation, PointVisibility } from '..'; function mockDataFrame() { @@ -85,7 +85,7 @@ describe('GraphNG utils', () => { expect( preparePlotConfigBuilder( frame!, - { colors: { panelBg: '#000000' } } as GrafanaTheme, + { colors: { panelBg: '#000000' } } as PlutonoTheme, getDefaultTimeRange, () => DefaultTimeZone ) diff --git a/packages/grafana-ui/src/components/GraphNG/utils.ts b/packages/plutono-ui/grafana-ui/src/components/GraphNG/utils.ts similarity index 98% rename from packages/grafana-ui/src/components/GraphNG/utils.ts rename to packages/plutono-ui/grafana-ui/src/components/GraphNG/utils.ts index e860003666..0ae11f95d0 100644 --- a/packages/grafana-ui/src/components/GraphNG/utils.ts +++ b/packages/plutono-ui/grafana-ui/src/components/GraphNG/utils.ts @@ -9,11 +9,11 @@ import { getFieldColorModeForField, getFieldDisplayName, getFieldSeriesColor, - GrafanaTheme, + PlutonoTheme, outerJoinDataFrames, TimeRange, TimeZone, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { UPlotConfigBuilder } from '../uPlot/config/UPlotConfigBuilder'; import { FIXED_UNIT } from './GraphNG'; import { @@ -51,7 +51,7 @@ export function preparePlotFrame(data: DataFrame[], dimFields: XYFieldMatchers) export function preparePlotConfigBuilder( frame: DataFrame, - theme: GrafanaTheme, + theme: PlutonoTheme, getTimeRange: () => TimeRange, getTimeZone: () => TimeZone ): UPlotConfigBuilder { diff --git a/packages/grafana-ui/src/components/Icon/Icon.mdx b/packages/plutono-ui/grafana-ui/src/components/Icon/Icon.mdx similarity index 86% rename from packages/grafana-ui/src/components/Icon/Icon.mdx rename to packages/plutono-ui/grafana-ui/src/components/Icon/Icon.mdx index 8f664d2e87..8ce6026894 100644 --- a/packages/grafana-ui/src/components/Icon/Icon.mdx +++ b/packages/plutono-ui/grafana-ui/src/components/Icon/Icon.mdx @@ -5,7 +5,7 @@ import { Icon } from './Icon'; # Icon -Grafana's wrapper component over [Font Awesome](https://fontawesome.com/) and Unicons icons +Plutono's wrapper component over [Font Awesome](https://fontawesome.com/) and Unicons icons ### Changing icon size diff --git a/packages/grafana-ui/src/components/Icon/Icon.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/Icon.story.tsx similarity index 97% rename from packages/grafana-ui/src/components/Icon/Icon.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/Icon.story.tsx index c9672473d9..9a5ccf7409 100644 --- a/packages/grafana-ui/src/components/Icon/Icon.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Icon/Icon.story.tsx @@ -1,7 +1,7 @@ import React, { ChangeEvent, useState } from 'react'; import { css } from 'emotion'; -import { Input, Field, Icon } from '@grafana/ui'; +import { Input, Field, Icon } from '@credativ/plutono-ui'; import { getAvailableIcons, IconName } from '../../types'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import { useTheme } from '../../themes'; diff --git a/packages/grafana-ui/src/components/Icon/Icon.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/Icon.tsx similarity index 93% rename from packages/grafana-ui/src/components/Icon/Icon.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/Icon.tsx index 7a354a9806..1d0c94781f 100644 --- a/packages/grafana-ui/src/components/Icon/Icon.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Icon/Icon.tsx @@ -1,6 +1,6 @@ import React, { ComponentType } from 'react'; import { css, cx } from 'emotion'; -import { GrafanaTheme, toPascalCase } from '@grafana/data'; +import { PlutonoTheme, toPascalCase } from '@credativ/plutono-data'; import { stylesFactory } from '../../themes/stylesFactory'; import { useTheme } from '../../themes/ThemeContext'; import { IconName, IconType, IconSize } from '../../types/icon'; @@ -10,7 +10,7 @@ import * as MonoIcon from './assets'; import { customIcons } from './custom'; import { SvgProps } from './assets/types'; -const alwaysMonoIcons: IconName[] = ['grafana', 'favorite', 'heart-break', 'heart', 'panel-add', 'reusable-panel']; +const alwaysMonoIcons: IconName[] = ['plutono', 'favorite', 'heart-break', 'heart', 'panel-add', 'reusable-panel']; export interface IconProps extends React.HTMLAttributes { name: IconName; @@ -18,7 +18,7 @@ export interface IconProps extends React.HTMLAttributes { type?: IconType; } -const getIconStyles = stylesFactory((theme: GrafanaTheme) => { +const getIconStyles = stylesFactory((theme: PlutonoTheme) => { return { container: css` label: Icon; diff --git a/packages/grafana-ui/src/components/Icon/assets/Apps.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/Apps.tsx similarity index 100% rename from packages/grafana-ui/src/components/Icon/assets/Apps.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/Apps.tsx diff --git a/packages/grafana-ui/src/components/Icon/assets/Bell.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/Bell.tsx similarity index 100% rename from packages/grafana-ui/src/components/Icon/assets/Bell.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/Bell.tsx diff --git a/packages/grafana-ui/src/components/Icon/assets/Circle.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/Circle.tsx similarity index 100% rename from packages/grafana-ui/src/components/Icon/assets/Circle.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/Circle.tsx diff --git a/packages/grafana-ui/src/components/Icon/assets/Cog.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/Cog.tsx similarity index 100% rename from packages/grafana-ui/src/components/Icon/assets/Cog.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/Cog.tsx diff --git a/packages/grafana-ui/src/components/Icon/assets/Favorite.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/Favorite.tsx similarity index 100% rename from packages/grafana-ui/src/components/Icon/assets/Favorite.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/Favorite.tsx diff --git a/packages/grafana-ui/src/components/Icon/assets/Folder.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/Folder.tsx similarity index 100% rename from packages/grafana-ui/src/components/Icon/assets/Folder.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/Folder.tsx diff --git a/packages/grafana-ui/src/components/Icon/assets/FolderPlus.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/FolderPlus.tsx similarity index 100% rename from packages/grafana-ui/src/components/Icon/assets/FolderPlus.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/FolderPlus.tsx diff --git a/packages/grafana-ui/src/components/Icon/assets/Heart.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/Heart.tsx similarity index 100% rename from packages/grafana-ui/src/components/Icon/assets/Heart.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/Heart.tsx diff --git a/packages/grafana-ui/src/components/Icon/assets/HeartBreak.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/HeartBreak.tsx similarity index 100% rename from packages/grafana-ui/src/components/Icon/assets/HeartBreak.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/HeartBreak.tsx diff --git a/packages/grafana-ui/src/components/Icon/assets/Import.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/Import.tsx similarity index 100% rename from packages/grafana-ui/src/components/Icon/assets/Import.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/Import.tsx diff --git a/packages/grafana-ui/src/components/Icon/assets/PanelAdd.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/PanelAdd.tsx similarity index 100% rename from packages/grafana-ui/src/components/Icon/assets/PanelAdd.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/PanelAdd.tsx diff --git a/packages/grafana-ui/src/components/Icon/assets/PlusSquare.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/PlusSquare.tsx similarity index 100% rename from packages/grafana-ui/src/components/Icon/assets/PlusSquare.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/PlusSquare.tsx diff --git a/packages/grafana-ui/src/components/Icon/assets/Grafana.tsx b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/Plutono.tsx similarity index 94% rename from packages/grafana-ui/src/components/Icon/assets/Grafana.tsx rename to packages/plutono-ui/grafana-ui/src/components/Icon/assets/Plutono.tsx index 3f3063d0e6..5337e19cfe 100644 --- a/packages/grafana-ui/src/components/Icon/assets/Grafana.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Icon/assets/Plutono.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from 'react'; import { SvgProps } from './types'; -export const Grafana: FunctionComponent = ({ size, ...rest }) => { +export const Plutono: FunctionComponent = ({ size, ...rest }) => { return ( diff --git a/packages/grafana-ui/src/components/IconButton/IconButton.story.tsx b/packages/plutono-ui/grafana-ui/src/components/IconButton/IconButton.story.tsx similarity index 91% rename from packages/grafana-ui/src/components/IconButton/IconButton.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/IconButton/IconButton.story.tsx index 33dd52581f..91381dc29c 100644 --- a/packages/grafana-ui/src/components/IconButton/IconButton.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/IconButton/IconButton.story.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { css } from 'emotion'; -import { IconButton } from '@grafana/ui'; +import { IconButton } from '@credativ/plutono-ui'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import { useTheme } from '../../themes/ThemeContext'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { IconSize, IconName } from '../../types'; import mdx from './IconButton.mdx'; @@ -35,7 +35,7 @@ export const Simple = () => { ); }; -function renderScenario(surface: string, theme: GrafanaTheme, sizes: IconSize[], icons: IconName[]) { +function renderScenario(surface: string, theme: PlutonoTheme, sizes: IconSize[], icons: IconName[]) { let bg = 'red'; switch (surface) { diff --git a/packages/grafana-ui/src/components/IconButton/IconButton.tsx b/packages/plutono-ui/grafana-ui/src/components/IconButton/IconButton.tsx similarity index 94% rename from packages/grafana-ui/src/components/IconButton/IconButton.tsx rename to packages/plutono-ui/grafana-ui/src/components/IconButton/IconButton.tsx index 64816944a5..434d168906 100644 --- a/packages/grafana-ui/src/components/IconButton/IconButton.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/IconButton/IconButton.tsx @@ -4,7 +4,7 @@ import { IconName, IconSize, IconType } from '../../types/icon'; import { stylesFactory } from '../../themes/stylesFactory'; import { css, cx } from 'emotion'; import { useTheme } from '../../themes/ThemeContext'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { Tooltip } from '../Tooltip/Tooltip'; import { TooltipPlacement } from '../Tooltip/PopoverController'; @@ -50,7 +50,7 @@ export const IconButton = React.forwardRef( IconButton.displayName = 'IconButton'; -function getHoverColor(theme: GrafanaTheme, surface: SurfaceType): string { +function getHoverColor(theme: PlutonoTheme, surface: SurfaceType): string { switch (surface) { case 'dashboard': return theme.isLight ? theme.palette.gray95 : theme.palette.gray15; @@ -61,7 +61,7 @@ function getHoverColor(theme: GrafanaTheme, surface: SurfaceType): string { } } -const getStyles = stylesFactory((theme: GrafanaTheme, surface: SurfaceType, size: IconSize) => { +const getStyles = stylesFactory((theme: PlutonoTheme, surface: SurfaceType, size: IconSize) => { const hoverColor = getHoverColor(theme, surface); const pixelSize = getSvgSize(size); diff --git a/packages/grafana-ui/src/components/InfoBox/FeatureInfoBox.tsx b/packages/plutono-ui/grafana-ui/src/components/InfoBox/FeatureInfoBox.tsx similarity index 92% rename from packages/grafana-ui/src/components/InfoBox/FeatureInfoBox.tsx rename to packages/plutono-ui/grafana-ui/src/components/InfoBox/FeatureInfoBox.tsx index 97b2e9410f..a537077d0f 100644 --- a/packages/grafana-ui/src/components/InfoBox/FeatureInfoBox.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/InfoBox/FeatureInfoBox.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { InfoBox, InfoBoxProps } from './InfoBox'; -import { FeatureState, GrafanaTheme } from '@grafana/data'; +import { FeatureState, PlutonoTheme } from '@credativ/plutono-data'; import { stylesFactory, useStyles } from '../../themes'; import { Badge, BadgeProps } from '../Badge/Badge'; import { css } from 'emotion'; @@ -29,7 +29,7 @@ export const FeatureInfoBox = React.memo( ); FeatureInfoBox.displayName = 'FeatureInfoBox'; -const getFeatureInfoBoxStyles = stylesFactory((theme: GrafanaTheme) => { +const getFeatureInfoBoxStyles = stylesFactory((theme: PlutonoTheme) => { return { badge: css` margin-bottom: ${theme.spacing.sm}; diff --git a/packages/grafana-ui/src/components/InfoBox/InfoBox.mdx b/packages/plutono-ui/grafana-ui/src/components/InfoBox/InfoBox.mdx similarity index 100% rename from packages/grafana-ui/src/components/InfoBox/InfoBox.mdx rename to packages/plutono-ui/grafana-ui/src/components/InfoBox/InfoBox.mdx diff --git a/packages/grafana-ui/src/components/InfoBox/InfoBox.story.tsx b/packages/plutono-ui/grafana-ui/src/components/InfoBox/InfoBox.story.tsx similarity index 89% rename from packages/grafana-ui/src/components/InfoBox/InfoBox.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/InfoBox/InfoBox.story.tsx index f4c00a93b1..0b08da2bc2 100644 --- a/packages/grafana-ui/src/components/InfoBox/InfoBox.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/InfoBox/InfoBox.story.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { FeatureState } from '@grafana/data'; -import { InfoBox, FeatureInfoBox } from '@grafana/ui'; +import { FeatureState } from '@credativ/plutono-data'; +import { InfoBox, FeatureInfoBox } from '@credativ/plutono-ui'; import mdx from './InfoBox.mdx'; import { Story } from '@storybook/react'; import { FeatureInfoBoxProps } from './FeatureInfoBox'; @@ -37,7 +37,7 @@ const defaultProps: FeatureInfoBoxProps = { children: (

The database user should only be granted SELECT permissions on the specified database & tables you want to - query. Grafana does not validate that queries are safe so queries can contain any SQL statement. For example, + query. Plutono does not validate that queries are safe so queries can contain any SQL statement. For example, statements like USE otherdb; and DROP TABLE user; would be executed. To protect against this we Highly recommend you create a specific MySQL user with restricted permissions.

diff --git a/packages/grafana-ui/src/components/InfoBox/InfoBox.tsx b/packages/plutono-ui/grafana-ui/src/components/InfoBox/InfoBox.tsx similarity index 94% rename from packages/grafana-ui/src/components/InfoBox/InfoBox.tsx rename to packages/plutono-ui/grafana-ui/src/components/InfoBox/InfoBox.tsx index 6fefdd70f9..1f1182dc79 100644 --- a/packages/grafana-ui/src/components/InfoBox/InfoBox.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/InfoBox/InfoBox.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { css, cx } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { Icon } from '../Icon/Icon'; import { IconButton } from '../IconButton/IconButton'; import { HorizontalGroup } from '../Layout/Layout'; @@ -18,7 +18,7 @@ export interface InfoBoxProps extends Omit, url?: string; /** Text of the read more link */ urlTitle?: string; - /** Indicates whether or not box should be rendered with Grafana branding background */ + /** Indicates whether or not box should be rendered with Plutono branding background */ branded?: boolean; /** Color variant of the box */ severity?: AlertVariant; @@ -57,7 +57,7 @@ export const InfoBox = React.memo( ); InfoBox.displayName = 'InfoBox'; -const getInfoBoxStyles = stylesFactory((theme: GrafanaTheme, severity: AlertVariant) => ({ +const getInfoBoxStyles = stylesFactory((theme: PlutonoTheme, severity: AlertVariant) => ({ wrapper: css` position: relative; padding: ${theme.spacing.md}; diff --git a/packages/grafana-ui/src/components/InfoBox/panelArt_dark.svg b/packages/plutono-ui/grafana-ui/src/components/InfoBox/panelArt_dark.svg similarity index 100% rename from packages/grafana-ui/src/components/InfoBox/panelArt_dark.svg rename to packages/plutono-ui/grafana-ui/src/components/InfoBox/panelArt_dark.svg diff --git a/packages/grafana-ui/src/components/InfoBox/panelArt_light.svg b/packages/plutono-ui/grafana-ui/src/components/InfoBox/panelArt_light.svg similarity index 100% rename from packages/grafana-ui/src/components/InfoBox/panelArt_light.svg rename to packages/plutono-ui/grafana-ui/src/components/InfoBox/panelArt_light.svg diff --git a/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.internal.tsx b/packages/plutono-ui/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.internal.tsx similarity index 100% rename from packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.internal.tsx rename to packages/plutono-ui/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.internal.tsx diff --git a/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.tsx b/packages/plutono-ui/grafana-ui/src/components/InfoTooltip/InfoTooltip.tsx similarity index 100% rename from packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.tsx rename to packages/plutono-ui/grafana-ui/src/components/InfoTooltip/InfoTooltip.tsx diff --git a/packages/grafana-ui/src/components/Input/Input.mdx b/packages/plutono-ui/grafana-ui/src/components/Input/Input.mdx similarity index 100% rename from packages/grafana-ui/src/components/Input/Input.mdx rename to packages/plutono-ui/grafana-ui/src/components/Input/Input.mdx diff --git a/packages/grafana-ui/src/components/Input/Input.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Input/Input.story.tsx similarity index 96% rename from packages/grafana-ui/src/components/Input/Input.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Input/Input.story.tsx index cf5f2a4071..d69b2e0eff 100644 --- a/packages/grafana-ui/src/components/Input/Input.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Input/Input.story.tsx @@ -3,8 +3,8 @@ import { boolean, text, select, number } from '@storybook/addon-knobs'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import mdx from './Input.mdx'; import { getAvailableIcons, IconName } from '../../types'; -import { KeyValue } from '@grafana/data'; -import { Field, Icon, Button, Input } from '@grafana/ui'; +import { KeyValue } from '@credativ/plutono-data'; +import { Field, Icon, Button, Input } from '@credativ/plutono-ui'; export default { title: 'Forms/Input', diff --git a/packages/grafana-ui/src/components/Input/Input.tsx b/packages/plutono-ui/grafana-ui/src/components/Input/Input.tsx similarity index 98% rename from packages/grafana-ui/src/components/Input/Input.tsx rename to packages/plutono-ui/grafana-ui/src/components/Input/Input.tsx index 3b01374215..6423e9ba29 100644 --- a/packages/grafana-ui/src/components/Input/Input.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Input/Input.tsx @@ -1,5 +1,5 @@ import React, { HTMLProps, ReactNode } from 'react'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { css, cx } from 'emotion'; import { getFocusStyle, sharedInputStyle } from '../Forms/commonStyles'; import { stylesFactory, useTheme } from '../../themes'; @@ -24,7 +24,7 @@ export interface Props extends Omit, 'prefix' | 'siz } interface StyleDeps { - theme: GrafanaTheme; + theme: PlutonoTheme; invalid: boolean; width?: number; } diff --git a/packages/grafana-ui/src/components/InputControl.tsx b/packages/plutono-ui/grafana-ui/src/components/InputControl.tsx similarity index 100% rename from packages/grafana-ui/src/components/InputControl.tsx rename to packages/plutono-ui/grafana-ui/src/components/InputControl.tsx diff --git a/packages/grafana-ui/src/components/JSONFormatter/JSONFormatter.tsx b/packages/plutono-ui/grafana-ui/src/components/JSONFormatter/JSONFormatter.tsx similarity index 100% rename from packages/grafana-ui/src/components/JSONFormatter/JSONFormatter.tsx rename to packages/plutono-ui/grafana-ui/src/components/JSONFormatter/JSONFormatter.tsx diff --git a/packages/grafana-ui/src/components/JSONFormatter/json_explorer/helpers.ts b/packages/plutono-ui/grafana-ui/src/components/JSONFormatter/json_explorer/helpers.ts similarity index 100% rename from packages/grafana-ui/src/components/JSONFormatter/json_explorer/helpers.ts rename to packages/plutono-ui/grafana-ui/src/components/JSONFormatter/json_explorer/helpers.ts diff --git a/packages/grafana-ui/src/components/JSONFormatter/json_explorer/json_explorer.ts b/packages/plutono-ui/grafana-ui/src/components/JSONFormatter/json_explorer/json_explorer.ts similarity index 100% rename from packages/grafana-ui/src/components/JSONFormatter/json_explorer/json_explorer.ts rename to packages/plutono-ui/grafana-ui/src/components/JSONFormatter/json_explorer/json_explorer.ts diff --git a/packages/grafana-ui/src/components/Layout/Layout.mdx b/packages/plutono-ui/grafana-ui/src/components/Layout/Layout.mdx similarity index 100% rename from packages/grafana-ui/src/components/Layout/Layout.mdx rename to packages/plutono-ui/grafana-ui/src/components/Layout/Layout.mdx diff --git a/packages/grafana-ui/src/components/Layout/Layout.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Layout/Layout.story.tsx similarity index 94% rename from packages/grafana-ui/src/components/Layout/Layout.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Layout/Layout.story.tsx index 41f9ac7742..c8bd94e3da 100644 --- a/packages/grafana-ui/src/components/Layout/Layout.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Layout/Layout.story.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { withCenteredStory, withHorizontallyCenteredStory } from '../../utils/storybook/withCenteredStory'; import { Layout } from './Layout'; -import { Button, VerticalGroup, HorizontalGroup } from '@grafana/ui'; +import { Button, VerticalGroup, HorizontalGroup } from '@credativ/plutono-ui'; import { withStoryContainer } from '../../utils/storybook/withStoryContainer'; import { select } from '@storybook/addon-knobs'; import mdx from './Layout.mdx'; diff --git a/packages/grafana-ui/src/components/Layout/Layout.tsx b/packages/plutono-ui/grafana-ui/src/components/Layout/Layout.tsx similarity index 95% rename from packages/grafana-ui/src/components/Layout/Layout.tsx rename to packages/plutono-ui/grafana-ui/src/components/Layout/Layout.tsx index daebb43473..a740b13892 100644 --- a/packages/grafana-ui/src/components/Layout/Layout.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Layout/Layout.tsx @@ -1,6 +1,6 @@ import React, { HTMLProps } from 'react'; import { css, cx } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { stylesFactory, useTheme } from '../../themes'; enum Orientation { @@ -109,7 +109,7 @@ export const Container: React.FC = ({ children, padding, margin, }; const getStyles = stylesFactory( - (theme: GrafanaTheme, orientation: Orientation, spacing: Spacing, justify: Justify, align, wrap) => { + (theme: PlutonoTheme, orientation: Orientation, spacing: Spacing, justify: Justify, align, wrap) => { const finalSpacing = spacing !== 'none' ? theme.spacing[spacing] : 0; // compensate for last row margin when wrapped, horizontal layout const marginCompensation = @@ -147,7 +147,7 @@ const getStyles = stylesFactory( } ); -const getContainerStyles = stylesFactory((theme: GrafanaTheme, padding?: Spacing, margin?: Spacing) => { +const getContainerStyles = stylesFactory((theme: PlutonoTheme, padding?: Spacing, margin?: Spacing) => { const paddingSize = (padding && padding !== 'none' && theme.spacing[padding]) || 0; const marginSize = (margin && margin !== 'none' && theme.spacing[margin]) || 0; return { diff --git a/packages/grafana-ui/src/components/List/AbstractList.test.tsx b/packages/plutono-ui/grafana-ui/src/components/List/AbstractList.test.tsx similarity index 100% rename from packages/grafana-ui/src/components/List/AbstractList.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/List/AbstractList.test.tsx diff --git a/packages/grafana-ui/src/components/List/AbstractList.tsx b/packages/plutono-ui/grafana-ui/src/components/List/AbstractList.tsx similarity index 100% rename from packages/grafana-ui/src/components/List/AbstractList.tsx rename to packages/plutono-ui/grafana-ui/src/components/List/AbstractList.tsx diff --git a/packages/grafana-ui/src/components/List/InlineList.tsx b/packages/plutono-ui/grafana-ui/src/components/List/InlineList.tsx similarity index 100% rename from packages/grafana-ui/src/components/List/InlineList.tsx rename to packages/plutono-ui/grafana-ui/src/components/List/InlineList.tsx diff --git a/packages/grafana-ui/src/components/List/List.story.internal.tsx b/packages/plutono-ui/grafana-ui/src/components/List/List.story.internal.tsx similarity index 100% rename from packages/grafana-ui/src/components/List/List.story.internal.tsx rename to packages/plutono-ui/grafana-ui/src/components/List/List.story.internal.tsx diff --git a/packages/grafana-ui/src/components/List/List.tsx b/packages/plutono-ui/grafana-ui/src/components/List/List.tsx similarity index 100% rename from packages/grafana-ui/src/components/List/List.tsx rename to packages/plutono-ui/grafana-ui/src/components/List/List.tsx diff --git a/packages/grafana-ui/src/components/List/__snapshots__/AbstractList.test.tsx.snap b/packages/plutono-ui/grafana-ui/src/components/List/__snapshots__/AbstractList.test.tsx.snap similarity index 100% rename from packages/grafana-ui/src/components/List/__snapshots__/AbstractList.test.tsx.snap rename to packages/plutono-ui/grafana-ui/src/components/List/__snapshots__/AbstractList.test.tsx.snap diff --git a/packages/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.mdx b/packages/plutono-ui/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.mdx similarity index 100% rename from packages/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.mdx rename to packages/plutono-ui/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.mdx diff --git a/packages/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.story.tsx b/packages/plutono-ui/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.story.tsx similarity index 100% rename from packages/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.story.tsx diff --git a/packages/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.tsx b/packages/plutono-ui/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.tsx similarity index 87% rename from packages/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.tsx rename to packages/plutono-ui/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.tsx index 52e9146d79..332c3d3004 100644 --- a/packages/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.tsx @@ -1,6 +1,6 @@ import React, { HTMLAttributes, SFC } from 'react'; import { css, cx } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { Spinner } from '../Spinner/Spinner'; import { useStyles } from '../../themes'; @@ -23,7 +23,7 @@ export const LoadingPlaceholder: SFC = ({ text, classNa ); }; -const getStyles = (theme: GrafanaTheme) => { +const getStyles = (theme: PlutonoTheme) => { return { container: css` margin-bottom: ${theme.spacing.xl}; diff --git a/packages/grafana-ui/src/components/Logs/LogDetails.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogDetails.test.tsx similarity index 97% rename from packages/grafana-ui/src/components/Logs/LogDetails.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogDetails.test.tsx index d40fe94226..f036581872 100644 --- a/packages/grafana-ui/src/components/Logs/LogDetails.test.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogDetails.test.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { LogDetails, Props } from './LogDetails'; -import { LogRowModel, LogLevel, GrafanaTheme, MutableDataFrame, Field } from '@grafana/data'; +import { LogRowModel, LogLevel, PlutonoTheme, MutableDataFrame, Field } from '@credativ/plutono-data'; import { mount } from 'enzyme'; import { LogDetailsRow } from './LogDetailsRow'; const setup = (propOverrides?: Partial, rowOverrides?: Partial) => { const props: Props = { - theme: {} as GrafanaTheme, + theme: {} as PlutonoTheme, showDuplicates: false, wrapLogMessage: false, row: { diff --git a/packages/grafana-ui/src/components/Logs/LogDetails.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogDetails.tsx similarity index 97% rename from packages/grafana-ui/src/components/Logs/LogDetails.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogDetails.tsx index 90d4b29420..c8e9f430a0 100644 --- a/packages/grafana-ui/src/components/Logs/LogDetails.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogDetails.tsx @@ -9,8 +9,8 @@ import { getParser, LinkModel, LogRowModel, - GrafanaTheme, -} from '@grafana/data'; + PlutonoTheme, +} from '@credativ/plutono-data'; import { Themeable } from '../../types/theme'; import { withTheme } from '../../themes/index'; @@ -39,7 +39,7 @@ export interface Props extends Themeable { onClickHideDetectedField?: (key: string) => void; } -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { logsRowLevelDetails: css` label: logs-row__level_details; @@ -127,7 +127,7 @@ class UnThemedLogDetails extends PureComponent {
Detected fields - + ) => { const props: Props = { - theme: {} as GrafanaTheme, + theme: {} as PlutonoTheme, parsedValue: '', parsedKey: '', isLabel: true, diff --git a/packages/grafana-ui/src/components/Logs/LogDetailsRow.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogDetailsRow.tsx similarity index 97% rename from packages/grafana-ui/src/components/Logs/LogDetailsRow.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogDetailsRow.tsx index 8c5fb6ea2f..fd26da7342 100644 --- a/packages/grafana-ui/src/components/Logs/LogDetailsRow.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogDetailsRow.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { css, cx } from 'emotion'; -import { Field, LinkModel, LogLabelStatsModel, GrafanaTheme } from '@grafana/data'; +import { Field, LinkModel, LogLabelStatsModel, PlutonoTheme } from '@credativ/plutono-data'; import { Themeable } from '../../types/theme'; import { withTheme } from '../../themes/index'; @@ -32,7 +32,7 @@ interface State { fieldStats: LogLabelStatsModel[] | null; } -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { noHoverBackground: css` label: noHoverBackground; diff --git a/packages/grafana-ui/src/components/Logs/LogLabelStats.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogLabelStats.tsx similarity index 95% rename from packages/grafana-ui/src/components/Logs/LogLabelStats.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogLabelStats.tsx index 5c9d56ae1d..bb06916ce5 100644 --- a/packages/grafana-ui/src/components/Logs/LogLabelStats.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogLabelStats.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { css } from 'emotion'; -import { LogLabelStatsModel, GrafanaTheme } from '@grafana/data'; +import { LogLabelStatsModel, PlutonoTheme } from '@credativ/plutono-data'; import { Themeable } from '../../types/theme'; import { stylesFactory } from '../../themes'; @@ -11,7 +11,7 @@ import { LogLabelStatsRow } from './LogLabelStatsRow'; const STATS_ROW_LIMIT = 5; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { logsStats: css` label: logs-stats; diff --git a/packages/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx similarity index 95% rename from packages/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx index fc90d52bb1..09119d3d7b 100644 --- a/packages/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx @@ -2,9 +2,9 @@ import React, { FunctionComponent, useContext } from 'react'; import { css, cx } from 'emotion'; import { ThemeContext } from '../../themes/ThemeContext'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; -const getStyles = (theme: GrafanaTheme) => ({ +const getStyles = (theme: PlutonoTheme) => ({ logsStatsRow: css` label: logs-stats-row; margin: ${parseInt(theme.spacing.d, 10) / 1.75}px 0; diff --git a/packages/grafana-ui/src/components/Logs/LogLabels.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogLabels.test.tsx similarity index 100% rename from packages/grafana-ui/src/components/Logs/LogLabels.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogLabels.test.tsx diff --git a/packages/grafana-ui/src/components/Logs/LogLabels.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogLabels.tsx similarity index 94% rename from packages/grafana-ui/src/components/Logs/LogLabels.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogLabels.tsx index 25d9900360..4dfad1b8d2 100644 --- a/packages/grafana-ui/src/components/Logs/LogLabels.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogLabels.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from 'react'; import { css, cx } from 'emotion'; -import { GrafanaTheme, Labels } from '@grafana/data'; +import { PlutonoTheme, Labels } from '@credativ/plutono-data'; import { stylesFactory } from '../../themes'; import { Themeable } from '../../types/theme'; @@ -9,7 +9,7 @@ import { withTheme } from '../../themes/ThemeContext'; // Levels are already encoded in color, filename is a Loki-ism const HIDDEN_LABELS = ['level', 'lvl', 'filename']; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { logsLabels: css` display: flex; diff --git a/packages/grafana-ui/src/components/Logs/LogMessageAnsi.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogMessageAnsi.test.tsx similarity index 100% rename from packages/grafana-ui/src/components/Logs/LogMessageAnsi.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogMessageAnsi.test.tsx diff --git a/packages/grafana-ui/src/components/Logs/LogMessageAnsi.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogMessageAnsi.tsx similarity index 100% rename from packages/grafana-ui/src/components/Logs/LogMessageAnsi.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogMessageAnsi.tsx diff --git a/packages/grafana-ui/src/components/Logs/LogRow.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRow.tsx similarity index 98% rename from packages/grafana-ui/src/components/Logs/LogRow.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogRow.tsx index ff03b13add..831757c094 100644 --- a/packages/grafana-ui/src/components/Logs/LogRow.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRow.tsx @@ -6,11 +6,11 @@ import { LogsSortOrder, TimeZone, DataQueryResponse, - GrafanaTheme, + PlutonoTheme, dateTimeFormat, checkLogsError, escapeUnescapedString, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { Icon } from '../Icon/Icon'; import { Tooltip } from '../Tooltip/Tooltip'; import { cx, css } from 'emotion'; @@ -61,7 +61,7 @@ interface State { showDetails: boolean; } -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { topVerticalAlign: css` label: topVerticalAlign; diff --git a/packages/grafana-ui/src/components/Logs/LogRowContext.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRowContext.test.tsx similarity index 92% rename from packages/grafana-ui/src/components/Logs/LogRowContext.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogRowContext.test.tsx index 759f34880c..c2761f406f 100644 --- a/packages/grafana-ui/src/components/Logs/LogRowContext.test.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRowContext.test.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { LogRowModel } from '@grafana/data'; +import { LogRowModel } from '@credativ/plutono-data'; import { render, screen } from '@testing-library/react'; import { LogRowContextGroup } from './LogRowContext'; diff --git a/packages/grafana-ui/src/components/Logs/LogRowContext.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRowContext.tsx similarity index 97% rename from packages/grafana-ui/src/components/Logs/LogRowContext.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogRowContext.tsx index 727d2cc475..a1e67f90ee 100644 --- a/packages/grafana-ui/src/components/Logs/LogRowContext.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRowContext.tsx @@ -1,5 +1,5 @@ import React, { useContext, useRef, useState, useLayoutEffect, useEffect } from 'react'; -import { GrafanaTheme, DataQueryError, LogRowModel, textUtil } from '@grafana/data'; +import { PlutonoTheme, DataQueryError, LogRowModel, textUtil } from '@credativ/plutono-data'; import { css, cx } from 'emotion'; import { Alert } from '../Alert/Alert'; @@ -19,7 +19,7 @@ interface LogRowContextProps { onLoadMoreContext: () => void; } -const getLogRowContextStyles = (theme: GrafanaTheme) => { +const getLogRowContextStyles = (theme: PlutonoTheme) => { return { commonStyles: css` position: absolute; diff --git a/packages/grafana-ui/src/components/Logs/LogRowContextProvider.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRowContextProvider.test.tsx similarity index 99% rename from packages/grafana-ui/src/components/Logs/LogRowContextProvider.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogRowContextProvider.test.tsx index a1f912d45d..ce76693eef 100644 --- a/packages/grafana-ui/src/components/Logs/LogRowContextProvider.test.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRowContextProvider.test.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { FieldType, LogRowModel, MutableDataFrame, Labels, LogLevel, DataQueryResponse } from '@grafana/data'; +import { FieldType, LogRowModel, MutableDataFrame, Labels, LogLevel, DataQueryResponse } from '@credativ/plutono-data'; import { getRowContexts, LogRowContextProvider } from './LogRowContextProvider'; import { mount } from 'enzyme'; import { act } from 'react-dom/test-utils'; diff --git a/packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRowContextProvider.tsx similarity index 99% rename from packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogRowContextProvider.tsx index c1ab7ed42f..9ab0254c29 100644 --- a/packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRowContextProvider.tsx @@ -6,7 +6,7 @@ import { LogsSortOrder, DataQueryResponse, DataQueryError, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import React, { useState, useEffect } from 'react'; import useAsync from 'react-use/lib/useAsync'; diff --git a/packages/grafana-ui/src/components/Logs/LogRowMessage.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRowMessage.tsx similarity index 96% rename from packages/grafana-ui/src/components/Logs/LogRowMessage.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogRowMessage.tsx index 217eb08d5a..c544abb32a 100644 --- a/packages/grafana-ui/src/components/Logs/LogRowMessage.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRowMessage.tsx @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; import _ from 'lodash'; import tinycolor from 'tinycolor2'; import { css, cx } from 'emotion'; -import { LogRowModel, findHighlightChunksInText, GrafanaTheme } from '@grafana/data'; +import { LogRowModel, findHighlightChunksInText, PlutonoTheme } from '@credativ/plutono-data'; // @ts-ignore import Highlighter from 'react-highlight-words'; @@ -32,7 +32,7 @@ interface Props extends Themeable { updateLimit?: () => void; } -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { const outlineColor = tinycolor(theme.colors.dashboardBg).setAlpha(0.7).toRgbString(); return { diff --git a/packages/grafana-ui/src/components/Logs/LogRowMessageDetectedFields.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRowMessageDetectedFields.tsx similarity index 94% rename from packages/grafana-ui/src/components/Logs/LogRowMessageDetectedFields.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogRowMessageDetectedFields.tsx index 22bd9f00f3..ad5ed73f94 100644 --- a/packages/grafana-ui/src/components/Logs/LogRowMessageDetectedFields.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRowMessageDetectedFields.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { cx, css } from 'emotion'; -import { LogRowModel, Field, LinkModel } from '@grafana/data'; +import { LogRowModel, Field, LinkModel } from '@credativ/plutono-data'; import { Themeable } from '../../types/theme'; import { withTheme } from '../../themes/index'; diff --git a/packages/grafana-ui/src/components/Logs/LogRows.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRows.test.tsx similarity index 99% rename from packages/grafana-ui/src/components/Logs/LogRows.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogRows.test.tsx index 95301d20c0..c36aeb9f08 100644 --- a/packages/grafana-ui/src/components/Logs/LogRows.test.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRows.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { range } from 'lodash'; import { LogRows, PREVIEW_LIMIT } from './LogRows'; import { mount } from 'enzyme'; -import { LogLevel, LogRowModel, LogsDedupStrategy, MutableDataFrame, LogsSortOrder } from '@grafana/data'; +import { LogLevel, LogRowModel, LogsDedupStrategy, MutableDataFrame, LogsSortOrder } from '@credativ/plutono-data'; import { LogRow } from './LogRow'; describe('LogRows', () => { diff --git a/packages/grafana-ui/src/components/Logs/LogRows.tsx b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRows.tsx similarity index 99% rename from packages/grafana-ui/src/components/Logs/LogRows.tsx rename to packages/plutono-ui/grafana-ui/src/components/Logs/LogRows.tsx index 5c63cf0dd3..ea85ec7e0f 100644 --- a/packages/grafana-ui/src/components/Logs/LogRows.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/LogRows.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import memoizeOne from 'memoize-one'; -import { TimeZone, LogsDedupStrategy, LogRowModel, Field, LinkModel, LogsSortOrder, sortLogRows } from '@grafana/data'; +import { TimeZone, LogsDedupStrategy, LogRowModel, Field, LinkModel, LogsSortOrder, sortLogRows } from '@credativ/plutono-data'; import { Themeable } from '../../types/theme'; import { withTheme } from '../../themes/index'; diff --git a/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts b/packages/plutono-ui/grafana-ui/src/components/Logs/getLogRowStyles.ts similarity index 97% rename from packages/grafana-ui/src/components/Logs/getLogRowStyles.ts rename to packages/plutono-ui/grafana-ui/src/components/Logs/getLogRowStyles.ts index 8364403cb3..6fc82331ad 100644 --- a/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/getLogRowStyles.ts @@ -1,8 +1,8 @@ import { css } from 'emotion'; -import { GrafanaTheme, LogLevel } from '@grafana/data'; +import { PlutonoTheme, LogLevel } from '@credativ/plutono-data'; import { styleMixins, stylesFactory } from '../../themes'; -export const getLogRowStyles = stylesFactory((theme: GrafanaTheme, logLevel?: LogLevel) => { +export const getLogRowStyles = stylesFactory((theme: PlutonoTheme, logLevel?: LogLevel) => { let logColor = theme.isLight ? theme.palette.gray5 : theme.palette.gray2; const hoverBgColor = styleMixins.hoverColor(theme.colors.panelBg, theme); diff --git a/packages/grafana-ui/src/components/Logs/logParser.ts b/packages/plutono-ui/grafana-ui/src/components/Logs/logParser.ts similarity index 97% rename from packages/grafana-ui/src/components/Logs/logParser.ts rename to packages/plutono-ui/grafana-ui/src/components/Logs/logParser.ts index a8ff5725bb..07709e5d50 100644 --- a/packages/grafana-ui/src/components/Logs/logParser.ts +++ b/packages/plutono-ui/grafana-ui/src/components/Logs/logParser.ts @@ -1,4 +1,4 @@ -import { Field, getParser, LinkModel, LogRowModel } from '@grafana/data'; +import { Field, getParser, LinkModel, LogRowModel } from '@credativ/plutono-data'; import memoizeOne from 'memoize-one'; import { MAX_CHARACTERS } from './LogRowMessage'; diff --git a/packages/grafana-ui/src/components/MatchersUI/FieldNameByRegexMatcherEditor.tsx b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldNameByRegexMatcherEditor.tsx similarity index 93% rename from packages/grafana-ui/src/components/MatchersUI/FieldNameByRegexMatcherEditor.tsx rename to packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldNameByRegexMatcherEditor.tsx index 48739edad9..01d250753a 100644 --- a/packages/grafana-ui/src/components/MatchersUI/FieldNameByRegexMatcherEditor.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldNameByRegexMatcherEditor.tsx @@ -1,6 +1,6 @@ import React, { memo, useCallback } from 'react'; import { MatcherUIProps, FieldMatcherUIRegistryItem } from './types'; -import { FieldMatcherID, fieldMatchers } from '@grafana/data'; +import { FieldMatcherID, fieldMatchers } from '@credativ/plutono-data'; import { Input } from '../Input/Input'; export const FieldNameByRegexMatcherEditor = memo>((props) => { diff --git a/packages/grafana-ui/src/components/MatchersUI/FieldNameMatcherEditor.tsx b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldNameMatcherEditor.tsx similarity index 96% rename from packages/grafana-ui/src/components/MatchersUI/FieldNameMatcherEditor.tsx rename to packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldNameMatcherEditor.tsx index 8f96c02035..f4164503a4 100644 --- a/packages/grafana-ui/src/components/MatchersUI/FieldNameMatcherEditor.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldNameMatcherEditor.tsx @@ -1,6 +1,6 @@ import React, { memo, useMemo, useCallback } from 'react'; import { MatcherUIProps, FieldMatcherUIRegistryItem } from './types'; -import { FieldMatcherID, fieldMatchers, getFieldDisplayName, SelectableValue, DataFrame } from '@grafana/data'; +import { FieldMatcherID, fieldMatchers, getFieldDisplayName, SelectableValue, DataFrame } from '@credativ/plutono-data'; import { Select } from '../Select/Select'; export const FieldNameMatcherEditor = memo>((props) => { diff --git a/packages/grafana-ui/src/components/MatchersUI/FieldNamesMatcherEditor.tsx b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldNamesMatcherEditor.tsx similarity index 98% rename from packages/grafana-ui/src/components/MatchersUI/FieldNamesMatcherEditor.tsx rename to packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldNamesMatcherEditor.tsx index 5deb5132ef..8f247f8f66 100644 --- a/packages/grafana-ui/src/components/MatchersUI/FieldNamesMatcherEditor.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldNamesMatcherEditor.tsx @@ -7,7 +7,7 @@ import { SelectableValue, DataFrame, ByNamesMatcherOptions, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { MultiSelect } from '../Select/Select'; import { Input } from '../Input/Input'; diff --git a/packages/grafana-ui/src/components/MatchersUI/FieldTypeMatcherEditor.tsx b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldTypeMatcherEditor.tsx similarity index 98% rename from packages/grafana-ui/src/components/MatchersUI/FieldTypeMatcherEditor.tsx rename to packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldTypeMatcherEditor.tsx index af422a6db0..d99c5c98b5 100644 --- a/packages/grafana-ui/src/components/MatchersUI/FieldTypeMatcherEditor.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldTypeMatcherEditor.tsx @@ -1,6 +1,6 @@ import React, { memo, useMemo, useCallback } from 'react'; import { MatcherUIProps, FieldMatcherUIRegistryItem } from './types'; -import { FieldMatcherID, fieldMatchers, SelectableValue, FieldType, DataFrame } from '@grafana/data'; +import { FieldMatcherID, fieldMatchers, SelectableValue, FieldType, DataFrame } from '@credativ/plutono-data'; import { Select } from '../Select/Select'; export const FieldTypeMatcherEditor = memo>((props) => { diff --git a/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx similarity index 98% rename from packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx rename to packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx index 1f6a18b57f..c30c69e6f7 100644 --- a/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx @@ -1,6 +1,6 @@ import React, { memo, useMemo, useCallback } from 'react'; import { MatcherUIProps, FieldMatcherUIRegistryItem } from './types'; -import { FieldMatcherID, fieldMatchers, SelectableValue, DataFrame } from '@grafana/data'; +import { FieldMatcherID, fieldMatchers, SelectableValue, DataFrame } from '@credativ/plutono-data'; import { Select } from '../Select/Select'; /** diff --git a/packages/grafana-ui/src/components/MatchersUI/fieldMatchersUI.ts b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/fieldMatchersUI.ts similarity index 92% rename from packages/grafana-ui/src/components/MatchersUI/fieldMatchersUI.ts rename to packages/plutono-ui/grafana-ui/src/components/MatchersUI/fieldMatchersUI.ts index 26cda2b0ad..d68aa985c6 100644 --- a/packages/grafana-ui/src/components/MatchersUI/fieldMatchersUI.ts +++ b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/fieldMatchersUI.ts @@ -1,4 +1,4 @@ -import { Registry } from '@grafana/data'; +import { Registry } from '@credativ/plutono-data'; import { FieldMatcherUIRegistryItem } from './types'; import { fieldNameMatcherItem } from './FieldNameMatcherEditor'; import { fieldNameByRegexMatcherItem } from './FieldNameByRegexMatcherEditor'; diff --git a/packages/grafana-ui/src/components/MatchersUI/types.ts b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/types.ts similarity index 84% rename from packages/grafana-ui/src/components/MatchersUI/types.ts rename to packages/plutono-ui/grafana-ui/src/components/MatchersUI/types.ts index cd8e57f37b..fc3ef66e0a 100644 --- a/packages/grafana-ui/src/components/MatchersUI/types.ts +++ b/packages/plutono-ui/grafana-ui/src/components/MatchersUI/types.ts @@ -1,5 +1,5 @@ import React from 'react'; -import { DataFrame, RegistryItem, FieldMatcherInfo } from '@grafana/data'; +import { DataFrame, RegistryItem, FieldMatcherInfo } from '@credativ/plutono-data'; export interface FieldMatcherUIRegistryItem extends RegistryItem { component: React.ComponentType>; diff --git a/packages/grafana-ui/src/components/Menu/Menu.story.internal.tsx b/packages/plutono-ui/grafana-ui/src/components/Menu/Menu.story.internal.tsx similarity index 100% rename from packages/grafana-ui/src/components/Menu/Menu.story.internal.tsx rename to packages/plutono-ui/grafana-ui/src/components/Menu/Menu.story.internal.tsx diff --git a/packages/grafana-ui/src/components/Menu/Menu.tsx b/packages/plutono-ui/grafana-ui/src/components/Menu/Menu.tsx similarity index 98% rename from packages/grafana-ui/src/components/Menu/Menu.tsx rename to packages/plutono-ui/grafana-ui/src/components/Menu/Menu.tsx index 84eb7ea3b6..d62bb04811 100644 --- a/packages/grafana-ui/src/components/Menu/Menu.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Menu/Menu.tsx @@ -1,6 +1,6 @@ import React, { useCallback } from 'react'; import { css, cx } from 'emotion'; -import { GrafanaTheme, LinkTarget } from '@grafana/data'; +import { PlutonoTheme, LinkTarget } from '@credativ/plutono-data'; import { List } from '../List/List'; import { styleMixins, useStyles } from '../../themes'; import { Icon } from '../Icon/Icon'; @@ -154,7 +154,7 @@ const MenuItemComponent: React.FC = React.memo( ); MenuItemComponent.displayName = 'MenuItemComponent'; -const getMenuStyles = (theme: GrafanaTheme) => { +const getMenuStyles = (theme: PlutonoTheme) => { const linkColor = theme.colors.text; const linkColorHover = theme.colors.linkHover; const wrapperBg = theme.colors.formInputBg; diff --git a/packages/grafana-ui/src/components/Modal/Modal.mdx b/packages/plutono-ui/grafana-ui/src/components/Modal/Modal.mdx similarity index 100% rename from packages/grafana-ui/src/components/Modal/Modal.mdx rename to packages/plutono-ui/grafana-ui/src/components/Modal/Modal.mdx diff --git a/packages/grafana-ui/src/components/Modal/Modal.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Modal/Modal.story.tsx similarity index 97% rename from packages/grafana-ui/src/components/Modal/Modal.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Modal/Modal.story.tsx index 41f449e2f7..ac16f8437d 100644 --- a/packages/grafana-ui/src/components/Modal/Modal.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Modal/Modal.story.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { oneLineTrim } from 'common-tags'; import { boolean, text } from '@storybook/addon-knobs'; -import { Icon, Modal, ModalTabsHeader, TabContent } from '@grafana/ui'; +import { Icon, Modal, ModalTabsHeader, TabContent } from '@credativ/plutono-ui'; import { css, cx } from 'emotion'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; diff --git a/packages/grafana-ui/src/components/Modal/Modal.test.tsx b/packages/plutono-ui/grafana-ui/src/components/Modal/Modal.test.tsx similarity index 100% rename from packages/grafana-ui/src/components/Modal/Modal.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/Modal/Modal.test.tsx diff --git a/packages/grafana-ui/src/components/Modal/Modal.tsx b/packages/plutono-ui/grafana-ui/src/components/Modal/Modal.tsx similarity index 100% rename from packages/grafana-ui/src/components/Modal/Modal.tsx rename to packages/plutono-ui/grafana-ui/src/components/Modal/Modal.tsx diff --git a/packages/grafana-ui/src/components/Modal/ModalHeader.tsx b/packages/plutono-ui/grafana-ui/src/components/Modal/ModalHeader.tsx similarity index 100% rename from packages/grafana-ui/src/components/Modal/ModalHeader.tsx rename to packages/plutono-ui/grafana-ui/src/components/Modal/ModalHeader.tsx diff --git a/packages/grafana-ui/src/components/Modal/ModalTabContent.tsx b/packages/plutono-ui/grafana-ui/src/components/Modal/ModalTabContent.tsx similarity index 100% rename from packages/grafana-ui/src/components/Modal/ModalTabContent.tsx rename to packages/plutono-ui/grafana-ui/src/components/Modal/ModalTabContent.tsx diff --git a/packages/grafana-ui/src/components/Modal/ModalTabsHeader.tsx b/packages/plutono-ui/grafana-ui/src/components/Modal/ModalTabsHeader.tsx similarity index 100% rename from packages/grafana-ui/src/components/Modal/ModalTabsHeader.tsx rename to packages/plutono-ui/grafana-ui/src/components/Modal/ModalTabsHeader.tsx diff --git a/packages/grafana-ui/src/components/Modal/ModalsContext.tsx b/packages/plutono-ui/grafana-ui/src/components/Modal/ModalsContext.tsx similarity index 100% rename from packages/grafana-ui/src/components/Modal/ModalsContext.tsx rename to packages/plutono-ui/grafana-ui/src/components/Modal/ModalsContext.tsx diff --git a/packages/grafana-ui/src/components/Modal/getModalStyles.ts b/packages/plutono-ui/grafana-ui/src/components/Modal/getModalStyles.ts similarity index 93% rename from packages/grafana-ui/src/components/Modal/getModalStyles.ts rename to packages/plutono-ui/grafana-ui/src/components/Modal/getModalStyles.ts index 8efc592cba..3836d37638 100644 --- a/packages/grafana-ui/src/components/Modal/getModalStyles.ts +++ b/packages/plutono-ui/grafana-ui/src/components/Modal/getModalStyles.ts @@ -1,8 +1,8 @@ import { css } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { stylesFactory } from '../../themes'; -export const getModalStyles = stylesFactory((theme: GrafanaTheme) => { +export const getModalStyles = stylesFactory((theme: PlutonoTheme) => { const backdropBackground = theme.colors.bg3; return { diff --git a/packages/grafana-ui/src/components/Monaco/CodeEditor.mdx b/packages/plutono-ui/grafana-ui/src/components/Monaco/CodeEditor.mdx similarity index 100% rename from packages/grafana-ui/src/components/Monaco/CodeEditor.mdx rename to packages/plutono-ui/grafana-ui/src/components/Monaco/CodeEditor.mdx diff --git a/packages/grafana-ui/src/components/Monaco/CodeEditor.story.internal.tsx b/packages/plutono-ui/grafana-ui/src/components/Monaco/CodeEditor.story.internal.tsx similarity index 100% rename from packages/grafana-ui/src/components/Monaco/CodeEditor.story.internal.tsx rename to packages/plutono-ui/grafana-ui/src/components/Monaco/CodeEditor.story.internal.tsx diff --git a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx b/packages/plutono-ui/grafana-ui/src/components/Monaco/CodeEditor.tsx similarity index 100% rename from packages/grafana-ui/src/components/Monaco/CodeEditor.tsx rename to packages/plutono-ui/grafana-ui/src/components/Monaco/CodeEditor.tsx diff --git a/packages/grafana-ui/src/components/Monaco/CodeEditorLazy.tsx b/packages/plutono-ui/grafana-ui/src/components/Monaco/CodeEditorLazy.tsx similarity index 100% rename from packages/grafana-ui/src/components/Monaco/CodeEditorLazy.tsx rename to packages/plutono-ui/grafana-ui/src/components/Monaco/CodeEditorLazy.tsx diff --git a/packages/grafana-ui/src/components/Monaco/suggestions.test.ts b/packages/plutono-ui/grafana-ui/src/components/Monaco/suggestions.test.ts similarity index 100% rename from packages/grafana-ui/src/components/Monaco/suggestions.test.ts rename to packages/plutono-ui/grafana-ui/src/components/Monaco/suggestions.test.ts diff --git a/packages/grafana-ui/src/components/Monaco/suggestions.ts b/packages/plutono-ui/grafana-ui/src/components/Monaco/suggestions.ts similarity index 100% rename from packages/grafana-ui/src/components/Monaco/suggestions.ts rename to packages/plutono-ui/grafana-ui/src/components/Monaco/suggestions.ts diff --git a/packages/grafana-ui/src/components/Monaco/types.ts b/packages/plutono-ui/grafana-ui/src/components/Monaco/types.ts similarity index 100% rename from packages/grafana-ui/src/components/Monaco/types.ts rename to packages/plutono-ui/grafana-ui/src/components/Monaco/types.ts diff --git a/packages/grafana-ui/src/components/Monaco/utils.ts b/packages/plutono-ui/grafana-ui/src/components/Monaco/utils.ts similarity index 88% rename from packages/grafana-ui/src/components/Monaco/utils.ts rename to packages/plutono-ui/grafana-ui/src/components/Monaco/utils.ts index c2f50ab19f..0cd3ef6a3d 100644 --- a/packages/grafana-ui/src/components/Monaco/utils.ts +++ b/packages/plutono-ui/grafana-ui/src/components/Monaco/utils.ts @@ -1,4 +1,4 @@ -import { VariableSuggestion } from '@grafana/data'; +import { VariableSuggestion } from '@credativ/plutono-data'; import { CodeEditorSuggestionItem, CodeEditorSuggestionItemKind } from './types'; /** diff --git a/packages/grafana-ui/src/components/NodeGraph/Edge.tsx b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/Edge.tsx similarity index 100% rename from packages/grafana-ui/src/components/NodeGraph/Edge.tsx rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/Edge.tsx diff --git a/packages/grafana-ui/src/components/NodeGraph/EdgeArrowMarker.tsx b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/EdgeArrowMarker.tsx similarity index 100% rename from packages/grafana-ui/src/components/NodeGraph/EdgeArrowMarker.tsx rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/EdgeArrowMarker.tsx diff --git a/packages/grafana-ui/src/components/NodeGraph/EdgeLabel.tsx b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/EdgeLabel.tsx similarity index 94% rename from packages/grafana-ui/src/components/NodeGraph/EdgeLabel.tsx rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/EdgeLabel.tsx index 27e52eed90..01c23714c0 100644 --- a/packages/grafana-ui/src/components/NodeGraph/EdgeLabel.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/EdgeLabel.tsx @@ -2,13 +2,13 @@ import React, { memo } from 'react'; import { EdgeDatum, NodeDatum } from './types'; import { css } from 'emotion'; import { stylesFactory, useTheme } from '../../themes'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import tinycolor from 'tinycolor2'; import lightTheme from '../../themes/light'; import darkTheme from '../../themes/dark'; import { shortenLine } from './utils'; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { const inverseTheme = theme.isDark ? lightTheme : darkTheme; return { mainGroup: css` diff --git a/packages/grafana-ui/src/components/NodeGraph/Node.tsx b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/Node.tsx similarity index 96% rename from packages/grafana-ui/src/components/NodeGraph/Node.tsx rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/Node.tsx index 42dacab84a..ce9b7c6b92 100644 --- a/packages/grafana-ui/src/components/NodeGraph/Node.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/Node.tsx @@ -1,13 +1,13 @@ import React, { MouseEvent, memo } from 'react'; import { NodeDatum } from './types'; import { stylesFactory, useTheme } from '../../themes'; -import { getColorForTheme, GrafanaTheme } from '@grafana/data'; +import { getColorForTheme, PlutonoTheme } from '@credativ/plutono-data'; import { css } from 'emotion'; import tinycolor from 'tinycolor2'; const nodeR = 40; -const getStyles = stylesFactory((theme: GrafanaTheme) => ({ +const getStyles = stylesFactory((theme: PlutonoTheme) => ({ mainGroup: css` cursor: pointer; font-size: 10px; diff --git a/packages/grafana-ui/src/components/NodeGraph/NodeGraph.test.tsx b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/NodeGraph.test.tsx similarity index 100% rename from packages/grafana-ui/src/components/NodeGraph/NodeGraph.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/NodeGraph.test.tsx diff --git a/packages/grafana-ui/src/components/NodeGraph/NodeGraph.tsx b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/NodeGraph.tsx similarity index 98% rename from packages/grafana-ui/src/components/NodeGraph/NodeGraph.tsx rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/NodeGraph.tsx index 9adc9cef72..058a97f1f2 100644 --- a/packages/grafana-ui/src/components/NodeGraph/NodeGraph.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/NodeGraph.tsx @@ -6,7 +6,7 @@ import { EdgeDatum, NodeDatum } from './types'; import { Node } from './Node'; import { Edge } from './Edge'; import { ViewControls } from './ViewControls'; -import { DataFrame, GrafanaTheme, LinkModel } from '@grafana/data'; +import { DataFrame, PlutonoTheme, LinkModel } from '@credativ/plutono-data'; import { useZoom } from './useZoom'; import { Bounds, Config, defaultConfig, useLayout } from './layout'; import { EdgeArrowMarker } from './EdgeArrowMarker'; @@ -19,7 +19,7 @@ import { processNodes } from './utils'; import { Icon } from '..'; import { useNodeLimit } from './useNodeLimit'; -const getStyles = stylesFactory((theme: GrafanaTheme) => ({ +const getStyles = stylesFactory((theme: PlutonoTheme) => ({ wrapper: css` height: 100%; width: 100%; diff --git a/packages/grafana-ui/src/components/NodeGraph/ViewControls.tsx b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/ViewControls.tsx similarity index 95% rename from packages/grafana-ui/src/components/NodeGraph/ViewControls.tsx rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/ViewControls.tsx index 37444e7462..f05e3622f5 100644 --- a/packages/grafana-ui/src/components/NodeGraph/ViewControls.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/ViewControls.tsx @@ -1,11 +1,11 @@ import React, { useState } from 'react'; import { Button } from '../Button'; import { stylesFactory, useTheme } from '../../themes'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { css } from 'emotion'; import { HorizontalGroup } from '..'; -const getStyles = stylesFactory((theme: GrafanaTheme) => ({ +const getStyles = stylesFactory((theme: PlutonoTheme) => ({ scale: css` font-size: ${theme.typography.size.sm}; color: ${theme.colors.textFaint}; diff --git a/packages/grafana-ui/src/components/NodeGraph/index.ts b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/index.ts similarity index 100% rename from packages/grafana-ui/src/components/NodeGraph/index.ts rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/index.ts diff --git a/packages/grafana-ui/src/components/NodeGraph/layout.ts b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/layout.ts similarity index 100% rename from packages/grafana-ui/src/components/NodeGraph/layout.ts rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/layout.ts diff --git a/packages/grafana-ui/src/components/NodeGraph/types.ts b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/types.ts similarity index 100% rename from packages/grafana-ui/src/components/NodeGraph/types.ts rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/types.ts diff --git a/packages/grafana-ui/src/components/NodeGraph/useCategorizeFrames.ts b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/useCategorizeFrames.ts similarity index 94% rename from packages/grafana-ui/src/components/NodeGraph/useCategorizeFrames.ts rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/useCategorizeFrames.ts index b18ae1abc2..d7bfd6aeee 100644 --- a/packages/grafana-ui/src/components/NodeGraph/useCategorizeFrames.ts +++ b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/useCategorizeFrames.ts @@ -1,5 +1,5 @@ import { useMemo } from 'react'; -import { DataFrame } from '@grafana/data'; +import { DataFrame } from '@credativ/plutono-data'; /** * As we need 2 dataframes for the service map, one with nodes and one with edges we have to figure out which is which. diff --git a/packages/grafana-ui/src/components/NodeGraph/useContextMenu.tsx b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/useContextMenu.tsx similarity index 96% rename from packages/grafana-ui/src/components/NodeGraph/useContextMenu.tsx rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/useContextMenu.tsx index 75d73e5f0a..11cc5d146f 100644 --- a/packages/grafana-ui/src/components/NodeGraph/useContextMenu.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/useContextMenu.tsx @@ -1,6 +1,6 @@ import React, { MouseEvent, useCallback, useState } from 'react'; import { EdgeDatum, NodeDatum } from './types'; -import { DataFrame, Field, GrafanaTheme, LinkModel } from '@grafana/data'; +import { DataFrame, Field, PlutonoTheme, LinkModel } from '@credativ/plutono-data'; import { ContextMenu } from '../ContextMenu/ContextMenu'; import { useTheme } from '../../themes/ThemeContext'; import { stylesFactory } from '../../themes/stylesFactory'; @@ -117,7 +117,7 @@ function EdgeHeader(props: { edge: EdgeDatum; edges: DataFrame }) { ); } -export const getLabelStyles = stylesFactory((theme: GrafanaTheme) => { +export const getLabelStyles = stylesFactory((theme: PlutonoTheme) => { return { label: css` label: Label; diff --git a/packages/grafana-ui/src/components/NodeGraph/useNodeLimit.ts b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/useNodeLimit.ts similarity index 100% rename from packages/grafana-ui/src/components/NodeGraph/useNodeLimit.ts rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/useNodeLimit.ts diff --git a/packages/grafana-ui/src/components/NodeGraph/usePanning.ts b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/usePanning.ts similarity index 100% rename from packages/grafana-ui/src/components/NodeGraph/usePanning.ts rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/usePanning.ts diff --git a/packages/grafana-ui/src/components/NodeGraph/useZoom.ts b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/useZoom.ts similarity index 100% rename from packages/grafana-ui/src/components/NodeGraph/useZoom.ts rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/useZoom.ts diff --git a/packages/grafana-ui/src/components/NodeGraph/utils.test.ts b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/utils.test.ts similarity index 100% rename from packages/grafana-ui/src/components/NodeGraph/utils.test.ts rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/utils.test.ts diff --git a/packages/grafana-ui/src/components/NodeGraph/utils.ts b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/utils.ts similarity index 99% rename from packages/grafana-ui/src/components/NodeGraph/utils.ts rename to packages/plutono-ui/grafana-ui/src/components/NodeGraph/utils.ts index 5673035061..796ffa7170 100644 --- a/packages/grafana-ui/src/components/NodeGraph/utils.ts +++ b/packages/plutono-ui/grafana-ui/src/components/NodeGraph/utils.ts @@ -1,4 +1,4 @@ -import { DataFrame, Field, FieldCache, FieldType, ArrayVector, MutableDataFrame } from '@grafana/data'; +import { DataFrame, Field, FieldCache, FieldType, ArrayVector, MutableDataFrame } from '@credativ/plutono-data'; import { EdgeDatum, NodeDatum } from './types'; import { NodeGraphDataFrameFieldNames } from './index'; diff --git a/packages/grafana-ui/src/components/OptionsUI/color.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/color.tsx similarity index 93% rename from packages/grafana-ui/src/components/OptionsUI/color.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/color.tsx index eecd18dc4c..feecfa978a 100644 --- a/packages/grafana-ui/src/components/OptionsUI/color.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/color.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { getColorForTheme, GrafanaTheme } from '@grafana/data'; +import { getColorForTheme, PlutonoTheme } from '@credativ/plutono-data'; import { ColorPicker } from '../ColorPicker/ColorPicker'; import { stylesFactory, useTheme } from '../../themes'; import { css } from 'emotion'; @@ -35,7 +35,7 @@ export const ColorValueEditor: React.FC = ({ value, onChange }) => { ); }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { spot: css` color: ${theme.colors.text}; diff --git a/packages/grafana-ui/src/components/OptionsUI/fieldColor.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/fieldColor.tsx similarity index 97% rename from packages/grafana-ui/src/components/OptionsUI/fieldColor.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/fieldColor.tsx index ac1f3530bc..201e3e6f57 100644 --- a/packages/grafana-ui/src/components/OptionsUI/fieldColor.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/fieldColor.tsx @@ -6,12 +6,12 @@ import { FieldColor, fieldColorModeRegistry, FieldColorMode, - GrafanaTheme, + PlutonoTheme, getColorForTheme, FieldColorConfigSettings, FieldColorSeriesByMode, getFieldColorMode, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { Select } from '../Select/Select'; import { ColorValueEditor } from './color'; import { useStyles, useTheme } from '../../themes/ThemeContext'; @@ -105,7 +105,7 @@ export const FieldColorEditor: React.FC = ({ mode, theme }) => { @@ -145,7 +145,7 @@ const FieldColorModeViz: FC = ({ mode, theme }) => { return
; }; -const getStyles = (theme: GrafanaTheme) => { +const getStyles = (theme: PlutonoTheme) => { return { group: css` display: flex; diff --git a/packages/grafana-ui/src/components/OptionsUI/links.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/links.tsx similarity index 94% rename from packages/grafana-ui/src/components/OptionsUI/links.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/links.tsx index 768f14ff55..d88d2f0ed1 100644 --- a/packages/grafana-ui/src/components/OptionsUI/links.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/links.tsx @@ -4,7 +4,7 @@ import { DataLinksFieldConfigSettings, FieldConfigEditorProps, VariableSuggestionsScope, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { DataLinksInlineEditor } from '../DataLinks/DataLinksInlineEditor/DataLinksInlineEditor'; export const DataLinksValueEditor: React.FC> = ({ diff --git a/packages/grafana-ui/src/components/OptionsUI/mappings.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/mappings.tsx similarity index 93% rename from packages/grafana-ui/src/components/OptionsUI/mappings.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/mappings.tsx index a84408efe2..95a12b0a9d 100644 --- a/packages/grafana-ui/src/components/OptionsUI/mappings.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/mappings.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { FieldConfigEditorProps, ValueMapping, ValueMappingFieldConfigSettings } from '@grafana/data'; +import { FieldConfigEditorProps, ValueMapping, ValueMappingFieldConfigSettings } from '@credativ/plutono-data'; import { ValueMappingsEditor } from '../ValueMappingsEditor/ValueMappingsEditor'; export class ValueMappingsValueEditor extends React.PureComponent< diff --git a/packages/grafana-ui/src/components/OptionsUI/multiSelect.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/multiSelect.tsx similarity index 97% rename from packages/grafana-ui/src/components/OptionsUI/multiSelect.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/multiSelect.tsx index 627539fd2d..dc168a7181 100644 --- a/packages/grafana-ui/src/components/OptionsUI/multiSelect.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/multiSelect.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { FieldConfigEditorProps, SelectFieldConfigSettings, SelectableValue } from '@grafana/data'; +import { FieldConfigEditorProps, SelectFieldConfigSettings, SelectableValue } from '@credativ/plutono-data'; import { MultiSelect } from '../Select/Select'; interface State { diff --git a/packages/grafana-ui/src/components/OptionsUI/number.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/number.tsx similarity index 97% rename from packages/grafana-ui/src/components/OptionsUI/number.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/number.tsx index a2741d7f1d..49bcb69f6b 100644 --- a/packages/grafana-ui/src/components/OptionsUI/number.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/number.tsx @@ -4,7 +4,7 @@ import { toIntegerOrUndefined, toFloatOrUndefined, NumberFieldConfigSettings, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { Input } from '../Input/Input'; export const NumberValueEditor: React.FC> = ({ diff --git a/packages/grafana-ui/src/components/OptionsUI/select.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/select.tsx similarity index 97% rename from packages/grafana-ui/src/components/OptionsUI/select.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/select.tsx index 3023c30f48..ac918fb638 100644 --- a/packages/grafana-ui/src/components/OptionsUI/select.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/select.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { FieldConfigEditorProps, SelectFieldConfigSettings, SelectableValue } from '@grafana/data'; +import { FieldConfigEditorProps, SelectFieldConfigSettings, SelectableValue } from '@credativ/plutono-data'; import { Select } from '../Select/Select'; interface State { diff --git a/packages/grafana-ui/src/components/OptionsUI/slider.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/slider.tsx similarity index 95% rename from packages/grafana-ui/src/components/OptionsUI/slider.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/slider.tsx index bc0f741e04..1021bf5005 100644 --- a/packages/grafana-ui/src/components/OptionsUI/slider.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/slider.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { FieldConfigEditorProps, SliderFieldConfigSettings } from '@grafana/data'; +import { FieldConfigEditorProps, SliderFieldConfigSettings } from '@credativ/plutono-data'; import { Slider } from '../Slider/Slider'; export const SliderValueEditor: React.FC> = ({ diff --git a/packages/grafana-ui/src/components/OptionsUI/stats.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/stats.tsx similarity index 94% rename from packages/grafana-ui/src/components/OptionsUI/stats.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/stats.tsx index 453da4dc12..461ce2bf5b 100644 --- a/packages/grafana-ui/src/components/OptionsUI/stats.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/stats.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { FieldConfigEditorProps, StatsPickerConfigSettings } from '@grafana/data'; +import { FieldConfigEditorProps, StatsPickerConfigSettings } from '@credativ/plutono-data'; import { StatsPicker } from '../StatsPicker/StatsPicker'; export const StatsPickerEditor: React.FC> = ({ diff --git a/packages/grafana-ui/src/components/OptionsUI/string.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/string.tsx similarity index 97% rename from packages/grafana-ui/src/components/OptionsUI/string.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/string.tsx index 61dce866ac..00bfddd6bf 100644 --- a/packages/grafana-ui/src/components/OptionsUI/string.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/string.tsx @@ -1,5 +1,5 @@ import React, { useCallback } from 'react'; -import { FieldConfigEditorProps, StringFieldConfigSettings } from '@grafana/data'; +import { FieldConfigEditorProps, StringFieldConfigSettings } from '@credativ/plutono-data'; import { Input } from '../Input/Input'; import { TextArea } from '../TextArea/TextArea'; diff --git a/packages/grafana-ui/src/components/OptionsUI/strings.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/strings.tsx similarity index 94% rename from packages/grafana-ui/src/components/OptionsUI/strings.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/strings.tsx index 3ec429f16f..687dc6bcd9 100644 --- a/packages/grafana-ui/src/components/OptionsUI/strings.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/strings.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { FieldConfigEditorProps, StringFieldConfigSettings, GrafanaTheme } from '@grafana/data'; +import { FieldConfigEditorProps, StringFieldConfigSettings, PlutonoTheme } from '@credativ/plutono-data'; import { Input } from '../Input/Input'; import { Icon } from '../Icon/Icon'; import { stylesFactory, getTheme } from '../../themes'; @@ -92,7 +92,7 @@ export class StringArrayEditor extends React.PureComponent { } } -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { textInput: css` margin-bottom: 5px; diff --git a/packages/grafana-ui/src/components/OptionsUI/thresholds.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/thresholds.tsx similarity index 92% rename from packages/grafana-ui/src/components/OptionsUI/thresholds.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/thresholds.tsx index 9b89fb8ff4..6cef796785 100644 --- a/packages/grafana-ui/src/components/OptionsUI/thresholds.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/thresholds.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { FieldConfigEditorProps, ThresholdsConfig, ThresholdsMode, ThresholdsFieldConfigSettings } from '@grafana/data'; +import { FieldConfigEditorProps, ThresholdsConfig, ThresholdsMode, ThresholdsFieldConfigSettings } from '@credativ/plutono-data'; import { ThresholdsEditor } from '../ThresholdsEditorNew/ThresholdsEditor'; export class ThresholdsValueEditor extends React.PureComponent< diff --git a/packages/grafana-ui/src/components/OptionsUI/units.tsx b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/units.tsx similarity index 92% rename from packages/grafana-ui/src/components/OptionsUI/units.tsx rename to packages/plutono-ui/grafana-ui/src/components/OptionsUI/units.tsx index 6431f49de0..c4be27a083 100644 --- a/packages/grafana-ui/src/components/OptionsUI/units.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/OptionsUI/units.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { FieldConfigEditorProps, UnitFieldConfigSettings } from '@grafana/data'; +import { FieldConfigEditorProps, UnitFieldConfigSettings } from '@credativ/plutono-data'; import { UnitPicker } from '../UnitPicker/UnitPicker'; export const UnitValueEditor: React.FC> = ({ diff --git a/packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx b/packages/plutono-ui/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx similarity index 96% rename from packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx index d2d927abab..943190b8f5 100644 --- a/packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ToolbarButton, VerticalGroup } from '@grafana/ui'; +import { ToolbarButton, VerticalGroup } from '@credativ/plutono-ui'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import { PageToolbar } from './PageToolbar'; import { StoryExample } from '../../utils/storybook/StoryExample'; diff --git a/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx b/packages/plutono-ui/grafana-ui/src/components/PageLayout/PageToolbar.tsx similarity index 96% rename from packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx rename to packages/plutono-ui/grafana-ui/src/components/PageLayout/PageToolbar.tsx index 893d9e0e91..f196104860 100644 --- a/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/PageLayout/PageToolbar.tsx @@ -1,12 +1,12 @@ import React, { FC, ReactNode } from 'react'; import { css, cx } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { useStyles } from '../../themes/ThemeContext'; import { IconName } from '../../types'; import { Icon } from '../Icon/Icon'; import { styleMixins } from '../../themes'; import { IconButton } from '../IconButton/IconButton'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; export interface Props { pageIcon?: IconName; @@ -109,7 +109,7 @@ export const PageToolbar: FC = React.memo( PageToolbar.displayName = 'PageToolbar'; -const getStyles = (theme: GrafanaTheme) => { +const getStyles = (theme: PlutonoTheme) => { const { spacing, typography } = theme; const titleStyles = ` diff --git a/packages/grafana-ui/src/components/Pagination/Pagination.mdx b/packages/plutono-ui/grafana-ui/src/components/Pagination/Pagination.mdx similarity index 100% rename from packages/grafana-ui/src/components/Pagination/Pagination.mdx rename to packages/plutono-ui/grafana-ui/src/components/Pagination/Pagination.mdx diff --git a/packages/grafana-ui/src/components/Pagination/Pagination.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Pagination/Pagination.story.tsx similarity index 92% rename from packages/grafana-ui/src/components/Pagination/Pagination.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Pagination/Pagination.story.tsx index 3d57f9a0d2..cab296b3e0 100644 --- a/packages/grafana-ui/src/components/Pagination/Pagination.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Pagination/Pagination.story.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { number } from '@storybook/addon-knobs'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; -import { Pagination } from '@grafana/ui'; +import { Pagination } from '@credativ/plutono-ui'; import mdx from './Pagination.mdx'; export const WithPages = () => { diff --git a/packages/grafana-ui/src/components/Pagination/Pagination.tsx b/packages/plutono-ui/grafana-ui/src/components/Pagination/Pagination.tsx similarity index 100% rename from packages/grafana-ui/src/components/Pagination/Pagination.tsx rename to packages/plutono-ui/grafana-ui/src/components/Pagination/Pagination.tsx diff --git a/packages/grafana-ui/src/components/PieChart/PieChart.story.tsx b/packages/plutono-ui/grafana-ui/src/components/PieChart/PieChart.story.tsx similarity index 95% rename from packages/grafana-ui/src/components/PieChart/PieChart.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/PieChart/PieChart.story.tsx index 41e9654d5d..17616b13d0 100644 --- a/packages/grafana-ui/src/components/PieChart/PieChart.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/PieChart/PieChart.story.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { object, select, number, boolean } from '@storybook/addon-knobs'; -import { PieChart, PieChartType } from '@grafana/ui'; +import { PieChart, PieChartType } from '@credativ/plutono-ui'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; export default { diff --git a/packages/grafana-ui/src/components/PieChart/PieChart.tsx b/packages/plutono-ui/grafana-ui/src/components/PieChart/PieChart.tsx similarity index 97% rename from packages/grafana-ui/src/components/PieChart/PieChart.tsx rename to packages/plutono-ui/grafana-ui/src/components/PieChart/PieChart.tsx index 63bca6fdb4..6f3c0d7b17 100644 --- a/packages/grafana-ui/src/components/PieChart/PieChart.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/PieChart/PieChart.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { DisplayValue, FALLBACK_COLOR, formattedValueToString, GrafanaTheme } from '@grafana/data'; +import { DisplayValue, FALLBACK_COLOR, formattedValueToString, PlutonoTheme } from '@credativ/plutono-data'; import { useStyles, useTheme } from '../../themes/ThemeContext'; import tinycolor from 'tinycolor2'; import Pie, { PieArcDatum } from '@visx/shape/lib/shapes/Pie'; @@ -283,14 +283,14 @@ function getLabelPos(arc: PieArcDatum, outerRadius: number, innerR return [Math.cos(a) * r, Math.sin(a) * r]; } -function getGradientColorFrom(color: string, theme: GrafanaTheme) { +function getGradientColorFrom(color: string, theme: PlutonoTheme) { return tinycolor(color) .darken(20 * (theme.isDark ? 1 : -0.7)) .spin(8) .toRgbString(); } -function getGradientColorTo(color: string, theme: GrafanaTheme) { +function getGradientColorTo(color: string, theme: PlutonoTheme) { return tinycolor(color) .darken(10 * (theme.isDark ? 1 : -0.7)) .spin(-8) @@ -322,7 +322,7 @@ function getPieLayout(height: number, width: number, pieType: PieChartType, marg }; } -const getStyles = (theme: GrafanaTheme) => { +const getStyles = (theme: PlutonoTheme) => { return { container: css` width: 100%; diff --git a/packages/grafana-ui/src/components/Portal/Portal.tsx b/packages/plutono-ui/grafana-ui/src/components/Portal/Portal.tsx similarity index 100% rename from packages/grafana-ui/src/components/Portal/Portal.tsx rename to packages/plutono-ui/grafana-ui/src/components/Portal/Portal.tsx diff --git a/packages/grafana-ui/src/components/QueryField/QueryField.story.tsx b/packages/plutono-ui/grafana-ui/src/components/QueryField/QueryField.story.tsx similarity index 86% rename from packages/grafana-ui/src/components/QueryField/QueryField.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/QueryField/QueryField.story.tsx index de2ffe3e60..d842f53365 100644 --- a/packages/grafana-ui/src/components/QueryField/QueryField.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/QueryField/QueryField.story.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; -import { QueryField } from '@grafana/ui'; +import { QueryField } from '@credativ/plutono-ui'; export default { title: 'Data Source/QueryField', diff --git a/packages/grafana-ui/src/components/QueryField/QueryField.test.tsx b/packages/plutono-ui/grafana-ui/src/components/QueryField/QueryField.test.tsx similarity index 100% rename from packages/grafana-ui/src/components/QueryField/QueryField.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/QueryField/QueryField.test.tsx diff --git a/packages/grafana-ui/src/components/QueryField/QueryField.tsx b/packages/plutono-ui/grafana-ui/src/components/QueryField/QueryField.tsx similarity index 99% rename from packages/grafana-ui/src/components/QueryField/QueryField.tsx rename to packages/plutono-ui/grafana-ui/src/components/QueryField/QueryField.tsx index 42669c004c..f336ef99c0 100644 --- a/packages/grafana-ui/src/components/QueryField/QueryField.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/QueryField/QueryField.tsx @@ -6,7 +6,7 @@ import Plain from 'slate-plain-serializer'; import classnames from 'classnames'; import { Editor, Plugin } from 'slate-react'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { ClearPlugin, diff --git a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx b/packages/plutono-ui/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx similarity index 97% rename from packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx index c18c266340..1ff10d35cb 100644 --- a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import { UseState } from '../../utils/storybook/UseState'; -import { RefreshPicker } from '@grafana/ui'; +import { RefreshPicker } from '@credativ/plutono-ui'; import { StoryExample } from '../../utils/storybook/StoryExample'; import { DashboardStoryCanvas } from '../../utils/storybook/DashboardStoryCanvas'; import { HorizontalGroup } from '../Layout/Layout'; diff --git a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.test.tsx b/packages/plutono-ui/grafana-ui/src/components/RefreshPicker/RefreshPicker.test.tsx similarity index 100% rename from packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.test.tsx rename to packages/plutono-ui/grafana-ui/src/components/RefreshPicker/RefreshPicker.test.tsx diff --git a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx b/packages/plutono-ui/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx similarity index 96% rename from packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx rename to packages/plutono-ui/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx index ed18fe8842..283d459f50 100644 --- a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx @@ -1,9 +1,9 @@ import React, { PureComponent } from 'react'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { Tooltip } from '../Tooltip/Tooltip'; import { ButtonSelect } from '../Dropdown/ButtonSelect'; import { ButtonGroup, ToolbarButton, ToolbarButtonVariant } from '../Button'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; // Default intervals used in the refresh picker component export const defaultIntervals = ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d']; diff --git a/packages/grafana-ui/src/components/RefreshPicker/_RefreshPicker.scss b/packages/plutono-ui/grafana-ui/src/components/RefreshPicker/_RefreshPicker.scss similarity index 100% rename from packages/grafana-ui/src/components/RefreshPicker/_RefreshPicker.scss rename to packages/plutono-ui/grafana-ui/src/components/RefreshPicker/_RefreshPicker.scss diff --git a/packages/grafana-ui/src/components/SecretFormField/SecretFormField.story.internal.tsx b/packages/plutono-ui/grafana-ui/src/components/SecretFormField/SecretFormField.story.internal.tsx similarity index 100% rename from packages/grafana-ui/src/components/SecretFormField/SecretFormField.story.internal.tsx rename to packages/plutono-ui/grafana-ui/src/components/SecretFormField/SecretFormField.story.internal.tsx diff --git a/packages/grafana-ui/src/components/SecretFormField/SecretFormField.tsx b/packages/plutono-ui/grafana-ui/src/components/SecretFormField/SecretFormField.tsx similarity index 100% rename from packages/grafana-ui/src/components/SecretFormField/SecretFormField.tsx rename to packages/plutono-ui/grafana-ui/src/components/SecretFormField/SecretFormField.tsx diff --git a/packages/grafana-ui/src/components/Segment/Segment.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Segment/Segment.story.tsx similarity index 98% rename from packages/grafana-ui/src/components/Segment/Segment.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Segment/Segment.story.tsx index 826e192746..bca3324f81 100644 --- a/packages/grafana-ui/src/components/Segment/Segment.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Segment/Segment.story.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { action } from '@storybook/addon-actions'; -import { Segment, Icon } from '@grafana/ui'; +import { Segment, Icon } from '@credativ/plutono-ui'; const AddButton = ( diff --git a/packages/grafana-ui/src/components/Segment/Segment.tsx b/packages/plutono-ui/grafana-ui/src/components/Segment/Segment.tsx similarity index 96% rename from packages/grafana-ui/src/components/Segment/Segment.tsx rename to packages/plutono-ui/grafana-ui/src/components/Segment/Segment.tsx index 53cdfb834c..0319488f8e 100644 --- a/packages/grafana-ui/src/components/Segment/Segment.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Segment/Segment.tsx @@ -1,7 +1,7 @@ import React, { HTMLProps } from 'react'; import { cx } from 'emotion'; import _ from 'lodash'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { SegmentSelect, useExpandableLabel, SegmentProps } from './'; import { getSegmentStyles } from './styles'; import { InlineLabel } from '../Forms/InlineLabel'; diff --git a/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Segment/SegmentAsync.story.tsx similarity index 97% rename from packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Segment/SegmentAsync.story.tsx index 245927289f..91bfc7df92 100644 --- a/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Segment/SegmentAsync.story.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { action } from '@storybook/addon-actions'; -import { SelectableValue } from '@grafana/data'; -import { SegmentAsync, Icon } from '@grafana/ui'; +import { SelectableValue } from '@credativ/plutono-data'; +import { SegmentAsync, Icon } from '@credativ/plutono-ui'; const AddButton = ( diff --git a/packages/grafana-ui/src/components/Segment/SegmentAsync.tsx b/packages/plutono-ui/grafana-ui/src/components/Segment/SegmentAsync.tsx similarity index 97% rename from packages/grafana-ui/src/components/Segment/SegmentAsync.tsx rename to packages/plutono-ui/grafana-ui/src/components/Segment/SegmentAsync.tsx index f7a840925e..84c9843112 100644 --- a/packages/grafana-ui/src/components/Segment/SegmentAsync.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Segment/SegmentAsync.tsx @@ -2,7 +2,7 @@ import React, { HTMLProps } from 'react'; import { cx } from 'emotion'; import _ from 'lodash'; import { SegmentSelect } from './SegmentSelect'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { useExpandableLabel, SegmentProps } from '.'; import { useAsyncFn } from 'react-use'; import { AsyncState } from 'react-use/lib/useAsync'; diff --git a/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx b/packages/plutono-ui/grafana-ui/src/components/Segment/SegmentInput.story.tsx similarity index 97% rename from packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx rename to packages/plutono-ui/grafana-ui/src/components/Segment/SegmentInput.story.tsx index 7377a0f59a..1621ff98e5 100644 --- a/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Segment/SegmentInput.story.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { action } from '@storybook/addon-actions'; -import { SegmentInput, Icon } from '@grafana/ui'; +import { SegmentInput, Icon } from '@credativ/plutono-ui'; const SegmentFrame = ({ children }: any) => ( <> diff --git a/packages/grafana-ui/src/components/Segment/SegmentInput.tsx b/packages/plutono-ui/grafana-ui/src/components/Segment/SegmentInput.tsx similarity index 100% rename from packages/grafana-ui/src/components/Segment/SegmentInput.tsx rename to packages/plutono-ui/grafana-ui/src/components/Segment/SegmentInput.tsx diff --git a/packages/grafana-ui/src/components/Segment/SegmentSelect.tsx b/packages/plutono-ui/grafana-ui/src/components/Segment/SegmentSelect.tsx similarity index 96% rename from packages/grafana-ui/src/components/Segment/SegmentSelect.tsx rename to packages/plutono-ui/grafana-ui/src/components/Segment/SegmentSelect.tsx index e242612fa8..481792a0f1 100644 --- a/packages/grafana-ui/src/components/Segment/SegmentSelect.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Segment/SegmentSelect.tsx @@ -1,7 +1,7 @@ import React, { HTMLProps, useRef } from 'react'; import { css, cx } from 'emotion'; import useClickAway from 'react-use/lib/useClickAway'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { Select } from '../Forms/Legacy/Select/Select'; export interface Props extends Omit, 'value' | 'onChange'> { diff --git a/packages/grafana-ui/src/components/Segment/index.ts b/packages/plutono-ui/grafana-ui/src/components/Segment/index.ts similarity index 100% rename from packages/grafana-ui/src/components/Segment/index.ts rename to packages/plutono-ui/grafana-ui/src/components/Segment/index.ts diff --git a/packages/grafana-ui/src/components/Segment/styles.ts b/packages/plutono-ui/grafana-ui/src/components/Segment/styles.ts similarity index 71% rename from packages/grafana-ui/src/components/Segment/styles.ts rename to packages/plutono-ui/grafana-ui/src/components/Segment/styles.ts index 22efd47aba..06e4770ebd 100644 --- a/packages/grafana-ui/src/components/Segment/styles.ts +++ b/packages/plutono-ui/grafana-ui/src/components/Segment/styles.ts @@ -1,7 +1,7 @@ -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { css } from 'emotion'; -export const getSegmentStyles = (theme: GrafanaTheme) => { +export const getSegmentStyles = (theme: PlutonoTheme) => { return { segment: css` cursor: pointer; diff --git a/packages/grafana-ui/src/components/Segment/types.ts b/packages/plutono-ui/grafana-ui/src/components/Segment/types.ts similarity index 100% rename from packages/grafana-ui/src/components/Segment/types.ts rename to packages/plutono-ui/grafana-ui/src/components/Segment/types.ts diff --git a/packages/grafana-ui/src/components/Segment/useExpandableLabel.tsx b/packages/plutono-ui/grafana-ui/src/components/Segment/useExpandableLabel.tsx similarity index 100% rename from packages/grafana-ui/src/components/Segment/useExpandableLabel.tsx rename to packages/plutono-ui/grafana-ui/src/components/Segment/useExpandableLabel.tsx diff --git a/packages/grafana-ui/src/components/Select/DropdownIndicator.tsx b/packages/plutono-ui/grafana-ui/src/components/Select/DropdownIndicator.tsx similarity index 100% rename from packages/grafana-ui/src/components/Select/DropdownIndicator.tsx rename to packages/plutono-ui/grafana-ui/src/components/Select/DropdownIndicator.tsx diff --git a/packages/grafana-ui/src/components/Select/IndicatorsContainer.tsx b/packages/plutono-ui/grafana-ui/src/components/Select/IndicatorsContainer.tsx similarity index 100% rename from packages/grafana-ui/src/components/Select/IndicatorsContainer.tsx rename to packages/plutono-ui/grafana-ui/src/components/Select/IndicatorsContainer.tsx diff --git a/packages/grafana-ui/src/components/Select/InputControl.tsx b/packages/plutono-ui/grafana-ui/src/components/Select/InputControl.tsx similarity index 94% rename from packages/grafana-ui/src/components/Select/InputControl.tsx rename to packages/plutono-ui/grafana-ui/src/components/Select/InputControl.tsx index 8d1f6c7937..7e4efea64f 100644 --- a/packages/grafana-ui/src/components/Select/InputControl.tsx +++ b/packages/plutono-ui/grafana-ui/src/components/Select/InputControl.tsx @@ -4,7 +4,7 @@ import { sharedInputStyle } from '../Forms/commonStyles'; import { getInputStyles } from '../Input/Input'; import { css, cx } from 'emotion'; import { stylesFactory } from '../../themes'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { focusCss } from '../../themes/mixins'; interface InputControlProps { @@ -17,7 +17,7 @@ interface InputControlProps { } const getInputControlStyles = stylesFactory( - (theme: GrafanaTheme, invalid: boolean, focused: boolean, disabled: boolean, withPrefix: boolean) => { + (theme: PlutonoTheme, invalid: boolean, focused: boolean, disabled: boolean, withPrefix: boolean) => { const styles = getInputStyles({ theme, invalid }); return { diff --git a/packages/grafana-ui/src/components/Select/MultiValue.tsx b/packages/plutono-ui/grafana-ui/src/components/Select/MultiValue.tsx similarity index 100% rename from packages/grafana-ui/src/components/Select/MultiValue.tsx rename to packages/plutono-ui/grafana-ui/src/components/Select/MultiValue.tsx diff --git a/packages/grafana-ui/src/components/Select/Select.mdx b/packages/plutono-ui/grafana-ui/src/components/Select/Select.mdx similarity index 95% rename from packages/grafana-ui/src/components/Select/Select.mdx rename to packages/plutono-ui/grafana-ui/src/components/Select/Select.mdx index db9e1fb7ea..9853aa6958 100644 --- a/packages/grafana-ui/src/components/Select/Select.mdx +++ b/packages/plutono-ui/grafana-ui/src/components/Select/Select.mdx @@ -43,7 +43,7 @@ const options = [ Creatable option is used when you want to be able to add a custom value to the list of options. `allowCustomValue` needs to be true and you must handle the value creation with `onCreateOption`. ```jsx -import { Select } from "@grafana/ui"; +import { Select } from "@credativ/plutono-ui"; const SelectComponent = () => { const [value, setValue] = useState>(); @@ -67,7 +67,7 @@ Like regular Select, but handles fetching options asynchronously. Use the `loadO ```jsx -import { AsyncSelect } from '@grafana/ui'; +import { AsyncSelect } from '@credativ/plutono-ui'; const basicSelectAsync = () => { const [value, setValue] = useState>(); @@ -103,7 +103,7 @@ const loadAsyncOptions = () => { Possible to Select multiple values at the same time. ```tsx -import { MultiSelect } from '@grafana/ui'; +import { MultiSelect } from '@credativ/plutono-ui'; const multiSelect = () => { const [value, setValue] = useState>>([]); @@ -133,7 +133,7 @@ Using React Testing Library, you can select the ` diff --git a/public/app/features/dashboard/components/ShareModal/ShareExport.tsx b/public/app/features/dashboard/components/ShareModal/ShareExport.tsx index 0f4c14a585..dc8dc7ea14 100644 --- a/public/app/features/dashboard/components/ShareModal/ShareExport.tsx +++ b/public/app/features/dashboard/components/ShareModal/ShareExport.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { saveAs } from 'file-saver'; -import { Button, Field, Switch } from '@grafana/ui'; +import { Button, Field, Switch } from '@credativ/plutono-ui'; import { DashboardModel, PanelModel } from 'app/features/dashboard/state'; import { DashboardExporter } from 'app/features/dashboard/components/DashExportModal'; import { appEvents } from 'app/core/core'; diff --git a/public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx b/public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx index 4cf7c6512d..80536dc0ee 100644 --- a/public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx +++ b/public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { shallow, ShallowWrapper } from 'enzyme'; -import { setTemplateSrv } from '@grafana/runtime'; +import { setTemplateSrv } from '@credativ/plutono-runtime'; import config from 'app/core/config'; import { ShareLink, Props, State } from './ShareLink'; import { initTemplateSrv } from '../../../../../test/helpers/initTemplateSrv'; @@ -44,8 +44,8 @@ function setUTCTimeZone() { } const mockUid = 'abc123'; -jest.mock('@grafana/runtime', () => { - const original = jest.requireActual('@grafana/runtime'); +jest.mock('@credativ/plutono-runtime', () => { + const original = jest.requireActual('@credativ/plutono-runtime'); return { ...original, diff --git a/public/app/features/dashboard/components/ShareModal/ShareLink.tsx b/public/app/features/dashboard/components/ShareModal/ShareLink.tsx index 0ece68de6a..a37ed987fa 100644 --- a/public/app/features/dashboard/components/ShareModal/ShareLink.tsx +++ b/public/app/features/dashboard/components/ShareModal/ShareLink.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; -import { selectors as e2eSelectors } from '@grafana/e2e-selectors'; -import { Field, RadioButtonGroup, Switch, ClipboardButton, Icon, InfoBox, Input, FieldSet } from '@grafana/ui'; -import { SelectableValue, PanelModel, AppEvents } from '@grafana/data'; +import { selectors as e2eSelectors } from '@credativ/plutono-e2e-selectors'; +import { Field, RadioButtonGroup, Switch, ClipboardButton, Icon, InfoBox, Input, FieldSet } from '@credativ/plutono-ui'; +import { SelectableValue, PanelModel, AppEvents } from '@credativ/plutono-data'; import { DashboardModel } from 'app/features/dashboard/state'; import { buildImageUrl, buildShareUrl } from './utils'; import { appEvents } from 'app/core/core'; @@ -140,14 +140,14 @@ export class ShareLink extends PureComponent {

<>To render a panel image, you must install the - Grafana Image Renderer plugin + Plutono Image Renderer plugin - . Please contact your Grafana administrator to install the plugin. + . Please contact your Plutono administrator to install the plugin.

)} diff --git a/public/app/features/dashboard/components/ShareModal/ShareModal.tsx b/public/app/features/dashboard/components/ShareModal/ShareModal.tsx index 1de8c0c6d0..ed6bedc11f 100644 --- a/public/app/features/dashboard/components/ShareModal/ShareModal.tsx +++ b/public/app/features/dashboard/components/ShareModal/ShareModal.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Modal, ModalTabsHeader, TabContent } from '@grafana/ui'; +import { Modal, ModalTabsHeader, TabContent } from '@credativ/plutono-ui'; import { DashboardModel, PanelModel } from 'app/features/dashboard/state'; import { ShareLink } from './ShareLink'; import { ShareSnapshot } from './ShareSnapshot'; diff --git a/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx b/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx index 3d1a85c195..3eca9ef1b8 100644 --- a/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx +++ b/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; -import { Button, ClipboardButton, Icon, Spinner, Select, Input, LinkButton, Field } from '@grafana/ui'; -import { AppEvents, SelectableValue } from '@grafana/data'; -import { getBackendSrv } from '@grafana/runtime'; +import { Button, ClipboardButton, Icon, Spinner, Select, Input, LinkButton, Field } from '@credativ/plutono-ui'; +import { AppEvents, SelectableValue } from '@credativ/plutono-data'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { DashboardModel, PanelModel } from 'app/features/dashboard/state'; import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { appEvents } from 'app/core/core'; diff --git a/public/app/features/dashboard/components/ShareModal/types.ts b/public/app/features/dashboard/components/ShareModal/types.ts index 3627981b75..5dbca835b7 100644 --- a/public/app/features/dashboard/components/ShareModal/types.ts +++ b/public/app/features/dashboard/components/ShareModal/types.ts @@ -1,5 +1,5 @@ import React from 'react'; -import { PanelModel } from '@grafana/data'; +import { PanelModel } from '@credativ/plutono-data'; import { DashboardModel } from 'app/features/dashboard/state'; export interface ShareModalTabProps { diff --git a/public/app/features/dashboard/components/ShareModal/utils.ts b/public/app/features/dashboard/components/ShareModal/utils.ts index 51569ccaac..bf4b604153 100644 --- a/public/app/features/dashboard/components/ShareModal/utils.ts +++ b/public/app/features/dashboard/components/ShareModal/utils.ts @@ -1,7 +1,7 @@ -import { config } from '@grafana/runtime'; +import { config } from '@credativ/plutono-runtime'; import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { createShortLink } from 'app/core/utils/shortLinks'; -import { PanelModel, dateTime, urlUtil } from '@grafana/data'; +import { PanelModel, dateTime, urlUtil } from '@credativ/plutono-data'; export function buildParams(useCurrentTimeRange: boolean, selectedTheme?: string, panel?: PanelModel) { let params = urlUtil.getUrlSearchParams(); diff --git a/public/app/features/dashboard/components/SubMenu/Annotations.tsx b/public/app/features/dashboard/components/SubMenu/Annotations.tsx index 0679b81087..062121c910 100644 --- a/public/app/features/dashboard/components/SubMenu/Annotations.tsx +++ b/public/app/features/dashboard/components/SubMenu/Annotations.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent, useEffect, useState } from 'react'; -import { LegacyForms } from '@grafana/ui'; -import { AnnotationQuery } from '@grafana/data'; +import { LegacyForms } from '@credativ/plutono-ui'; +import { AnnotationQuery } from '@credativ/plutono-data'; const { Switch } = LegacyForms; interface Props { diff --git a/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx b/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx index bdc03e6c6a..f6d9423556 100644 --- a/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx +++ b/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx @@ -1,6 +1,6 @@ import React, { FC, useReducer } from 'react'; -import { Icon, IconName, Tooltip } from '@grafana/ui'; -import { sanitize, sanitizeUrl } from '@grafana/data/src/text/sanitize'; +import { Icon, IconName, Tooltip } from '@credativ/plutono-ui'; +import { sanitize, sanitizeUrl } from '@credativ/plutono-data/src/text/sanitize'; import { DashboardLinksDashboard } from './DashboardLinksDashboard'; import { getLinkSrv } from '../../../panel/panellinks/link_srv'; @@ -9,7 +9,7 @@ import { DashboardLink } from '../../state/DashboardModel'; import { linkIconMap } from '../LinksSettings/LinkSettingsEdit'; import { useEffectOnce } from 'react-use'; import { CoreEvents } from 'app/types'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; export interface Props { dashboard: DashboardModel; diff --git a/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx b/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx index 576e33330b..8b9d7f5105 100644 --- a/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx +++ b/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx @@ -1,11 +1,11 @@ import React, { useRef, useState } from 'react'; -import { Icon, Tooltip } from '@grafana/ui'; -import { sanitize, sanitizeUrl } from '@grafana/data/src/text/sanitize'; +import { Icon, Tooltip } from '@credativ/plutono-ui'; +import { sanitize, sanitizeUrl } from '@credativ/plutono-data/src/text/sanitize'; import { getBackendSrv } from 'app/core/services/backend_srv'; import { getLinkSrv } from '../../../panel/panellinks/link_srv'; import { DashboardLink } from '../../state/DashboardModel'; import { DashboardSearchHit } from 'app/features/search/types'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { useAsync } from 'react-use'; interface Props { diff --git a/public/app/features/dashboard/components/SubMenu/SubMenu.tsx b/public/app/features/dashboard/components/SubMenu/SubMenu.tsx index 4c1411e7d8..f60b798562 100644 --- a/public/app/features/dashboard/components/SubMenu/SubMenu.tsx +++ b/public/app/features/dashboard/components/SubMenu/SubMenu.tsx @@ -8,7 +8,7 @@ import { DashboardLinks } from './DashboardLinks'; import { Annotations } from './Annotations'; import { SubMenuItems } from './SubMenuItems'; import { DashboardLink } from '../../state/DashboardModel'; -import { AnnotationQuery } from '@grafana/data'; +import { AnnotationQuery } from '@credativ/plutono-data'; interface OwnProps { dashboard: DashboardModel; diff --git a/public/app/features/dashboard/components/SubMenu/SubMenuItems.tsx b/public/app/features/dashboard/components/SubMenu/SubMenuItems.tsx index ce20a18357..be98f2112f 100644 --- a/public/app/features/dashboard/components/SubMenu/SubMenuItems.tsx +++ b/public/app/features/dashboard/components/SubMenu/SubMenuItems.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent, useEffect, useState } from 'react'; import { VariableHide, VariableModel } from '../../../variables/types'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { PickerRenderer } from '../../../variables/pickers/PickerRenderer'; interface Props { diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx index 2b9f134059..002a35382e 100644 --- a/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx +++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx @@ -1,15 +1,15 @@ import React, { useEffect, useMemo, useState } from 'react'; import { mergeMap } from 'rxjs/operators'; import { css } from 'emotion'; -import { Icon, JSONFormatter, useStyles } from '@grafana/ui'; +import { Icon, JSONFormatter, useStyles } from '@credativ/plutono-ui'; import { DataFrame, DataTransformerConfig, - GrafanaTheme, + PlutonoTheme, transformDataFrame, TransformerRegistryItem, -} from '@grafana/data'; -import { selectors } from '@grafana/e2e-selectors'; +} from '@credativ/plutono-data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { TransformationsEditorTransformation } from './types'; @@ -95,7 +95,7 @@ export const TransformationEditor = ({ ); }; -const getStyles = (theme: GrafanaTheme) => { +const getStyles = (theme: PlutonoTheme) => { const debugBorder = theme.isLight ? theme.palette.gray85 : theme.palette.gray15; return { diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx index 277becf250..2180df5793 100644 --- a/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx +++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; -import { DataFrame, DataTransformerConfig, TransformerRegistryItem } from '@grafana/data'; -import { HorizontalGroup } from '@grafana/ui'; +import { DataFrame, DataTransformerConfig, TransformerRegistryItem } from '@credativ/plutono-data'; +import { HorizontalGroup } from '@credativ/plutono-ui'; import { TransformationEditor } from './TransformationEditor'; import { diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRows.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRows.tsx index 6477e0ee92..955597c338 100644 --- a/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRows.tsx +++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRows.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { DataFrame, DataTransformerConfig, standardTransformersRegistry } from '@grafana/data'; +import { DataFrame, DataTransformerConfig, standardTransformersRegistry } from '@credativ/plutono-data'; import { TransformationOperationRow } from './TransformationOperationRow'; import { TransformationsEditorTransformation } from './types'; diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx index 5269a9a6d3..704b554a93 100644 --- a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx +++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { DataTransformerConfig, standardTransformersRegistry } from '@grafana/data'; +import { DataTransformerConfig, standardTransformersRegistry } from '@credativ/plutono-data'; import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { TransformationsEditor } from './TransformationsEditor'; import { PanelModel } from '../../state'; import { getStandardTransformers } from 'app/core/utils/standardTransformers'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; const setup = (transformations: DataTransformerConfig[] = []) => { const panel = new PanelModel({}); diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx index 6d0e7d7169..ca915eb06c 100644 --- a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx +++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx @@ -12,19 +12,19 @@ import { withTheme, Input, IconButton, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; import { DataFrame, DataTransformerConfig, DocsId, - GrafanaTheme, + PlutonoTheme, PanelData, SelectableValue, standardTransformersRegistry, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { Card, CardProps } from '../../../../core/components/Card/Card'; import { css } from 'emotion'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { Unsubscribable } from 'rxjs'; import { PanelModel } from '../../state'; import { getDocsLink } from 'app/core/utils/docsLinks'; @@ -366,7 +366,7 @@ const TransformationCard: React.FC = (props) => { return ; }; -const getTransformationCardStyles = stylesFactory((theme: GrafanaTheme) => { +const getTransformationCardStyles = stylesFactory((theme: PlutonoTheme) => { return { card: css` background: ${theme.colors.bg2}; diff --git a/public/app/features/dashboard/components/TransformationsEditor/types.ts b/public/app/features/dashboard/components/TransformationsEditor/types.ts index 50ff63d2fc..b544e774cc 100644 --- a/public/app/features/dashboard/components/TransformationsEditor/types.ts +++ b/public/app/features/dashboard/components/TransformationsEditor/types.ts @@ -1,4 +1,4 @@ -import { DataTransformerConfig } from '@grafana/data'; +import { DataTransformerConfig } from '@credativ/plutono-data'; export interface TransformationsEditorTransformation { transformation: DataTransformerConfig; diff --git a/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts index a2d2a9c529..a08d55c4d5 100644 --- a/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts +++ b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts @@ -4,8 +4,8 @@ import angular, { ILocationService, IScope } from 'angular'; import { DashboardModel } from '../../state/DashboardModel'; import { DecoratedRevisionModel } from '../DashboardSettings/VersionsSettings'; import { CalculateDiffOptions, HistorySrv } from './HistorySrv'; -import { AppEvents, locationUtil } from '@grafana/data'; -import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; +import { AppEvents, locationUtil } from '@credativ/plutono-data'; +import { PlutonoRootScope } from 'app/routes/PlutonoCtrl'; import { CoreEvents } from 'app/types'; import { promiseToDigest } from '../../../../core/utils/promiseToDigest'; @@ -22,7 +22,7 @@ export class HistoryListCtrl { /** @ngInject */ constructor( private $route: any, - private $rootScope: GrafanaRootScope, + private $rootScope: PlutonoRootScope, private $location: ILocationService, private historySrv: HistorySrv, public $scope: IScope @@ -111,4 +111,4 @@ export function dashboardHistoryDirective() { }; } -angular.module('grafana.directives').directive('gfDashboardHistory', dashboardHistoryDirective); +angular.module('plutono.directives').directive('gfDashboardHistory', dashboardHistoryDirective); diff --git a/public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts b/public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts index 6ce068e4d9..6d03dd5f0a 100644 --- a/public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts +++ b/public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts @@ -6,8 +6,8 @@ const getMock = jest.fn().mockResolvedValue({}); const postMock = jest.fn().mockResolvedValue({}); jest.mock('app/core/store'); -jest.mock('@grafana/runtime', () => { - const original = jest.requireActual('@grafana/runtime'); +jest.mock('@credativ/plutono-runtime', () => { + const original = jest.requireActual('@credativ/plutono-runtime'); return { ...original, diff --git a/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts b/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts index 8124f20b4a..287eb2ccd5 100644 --- a/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts +++ b/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import coreModule from 'app/core/core_module'; import { DashboardModel } from '../../state/DashboardModel'; -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; export interface HistoryListOpts { limit: number; diff --git a/public/app/features/dashboard/components/VersionHistory/RevertDashboardModal.tsx b/public/app/features/dashboard/components/VersionHistory/RevertDashboardModal.tsx index 831e1e83d7..84db026262 100644 --- a/public/app/features/dashboard/components/VersionHistory/RevertDashboardModal.tsx +++ b/public/app/features/dashboard/components/VersionHistory/RevertDashboardModal.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ConfirmModal } from '@grafana/ui'; +import { ConfirmModal } from '@credativ/plutono-ui'; import { useDashboardRestore } from './useDashboardRestore'; export interface RevertDashboardModalProps { hideModal: () => void; diff --git a/public/app/features/dashboard/components/VersionHistory/VersionHistoryButtons.tsx b/public/app/features/dashboard/components/VersionHistory/VersionHistoryButtons.tsx index fcb23f9d29..43494e7a4b 100644 --- a/public/app/features/dashboard/components/VersionHistory/VersionHistoryButtons.tsx +++ b/public/app/features/dashboard/components/VersionHistory/VersionHistoryButtons.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { HorizontalGroup, Tooltip, Button } from '@grafana/ui'; +import { HorizontalGroup, Tooltip, Button } from '@credativ/plutono-ui'; type VersionsButtonsType = { hasMore: boolean; diff --git a/public/app/features/dashboard/components/VersionHistory/VersionHistoryComparison.tsx b/public/app/features/dashboard/components/VersionHistory/VersionHistoryComparison.tsx index 0639303b3d..9cc11e6937 100644 --- a/public/app/features/dashboard/components/VersionHistory/VersionHistoryComparison.tsx +++ b/public/app/features/dashboard/components/VersionHistory/VersionHistoryComparison.tsx @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { AngularComponent, getAngularLoader } from '@grafana/runtime'; +import { AngularComponent, getAngularLoader } from '@credativ/plutono-runtime'; import { DashboardModel } from '../../state/DashboardModel'; import { DecoratedRevisionModel } from '../DashboardSettings/VersionsSettings'; diff --git a/public/app/features/dashboard/components/VersionHistory/VersionHistoryHeader.tsx b/public/app/features/dashboard/components/VersionHistory/VersionHistoryHeader.tsx index d6d7780153..a9e80a0ae0 100644 --- a/public/app/features/dashboard/components/VersionHistory/VersionHistoryHeader.tsx +++ b/public/app/features/dashboard/components/VersionHistory/VersionHistoryHeader.tsx @@ -1,6 +1,6 @@ import React from 'react'; import noop from 'lodash/noop'; -import { Icon } from '@grafana/ui'; +import { Icon } from '@credativ/plutono-ui'; type VersionHistoryHeaderProps = { isComparing?: boolean; diff --git a/public/app/features/dashboard/components/VersionHistory/VersionHistoryTable.tsx b/public/app/features/dashboard/components/VersionHistory/VersionHistoryTable.tsx index 5831f5eedf..7c099ae937 100644 --- a/public/app/features/dashboard/components/VersionHistory/VersionHistoryTable.tsx +++ b/public/app/features/dashboard/components/VersionHistory/VersionHistoryTable.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { css } from 'emotion'; -import { Checkbox, Button, Tag, ModalsController } from '@grafana/ui'; +import { Checkbox, Button, Tag, ModalsController } from '@credativ/plutono-ui'; import { DecoratedRevisionModel } from '../DashboardSettings/VersionsSettings'; import { RevertDashboardModal } from './RevertDashboardModal'; diff --git a/public/app/features/dashboard/components/VersionHistory/useDashboardRestore.tsx b/public/app/features/dashboard/components/VersionHistory/useDashboardRestore.tsx index 4e917cb9eb..ec95ff5a7a 100644 --- a/public/app/features/dashboard/components/VersionHistory/useDashboardRestore.tsx +++ b/public/app/features/dashboard/components/VersionHistory/useDashboardRestore.tsx @@ -1,7 +1,7 @@ import { useEffect } from 'react'; import { useSelector, useDispatch } from 'react-redux'; import { useAsyncFn } from 'react-use'; -import { AppEvents, locationUtil } from '@grafana/data'; +import { AppEvents, locationUtil } from '@credativ/plutono-data'; import appEvents from 'app/core/app_events'; import { updateLocation } from 'app/core/reducers/location'; import { dashboardWatcher } from 'app/features/live/dashboard/dashboardWatcher'; diff --git a/public/app/features/dashboard/components/VizTypePicker/VizTypePicker.tsx b/public/app/features/dashboard/components/VizTypePicker/VizTypePicker.tsx index dd71a90e83..069639b7ad 100644 --- a/public/app/features/dashboard/components/VizTypePicker/VizTypePicker.tsx +++ b/public/app/features/dashboard/components/VizTypePicker/VizTypePicker.tsx @@ -2,8 +2,8 @@ import React, { useCallback, useMemo } from 'react'; import config from 'app/core/config'; import VizTypePickerPlugin from './VizTypePickerPlugin'; -import { EmptySearchResult, stylesFactory, useTheme } from '@grafana/ui'; -import { GrafanaTheme, PanelPluginMeta, PluginState } from '@grafana/data'; +import { EmptySearchResult, stylesFactory, useTheme } from '@credativ/plutono-ui'; +import { PlutonoTheme, PanelPluginMeta, PluginState } from '@credativ/plutono-data'; import { css } from 'emotion'; export interface Props { @@ -102,7 +102,7 @@ export const VizTypePicker: React.FC = ({ searchQuery, onTypeChange, curr VizTypePicker.displayName = 'VizTypePicker'; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { grid: css` max-width: 100%; diff --git a/public/app/features/dashboard/components/VizTypePicker/VizTypePickerPlugin.tsx b/public/app/features/dashboard/components/VizTypePicker/VizTypePickerPlugin.tsx index 4aa96f02c8..a133547296 100644 --- a/public/app/features/dashboard/components/VizTypePicker/VizTypePickerPlugin.tsx +++ b/public/app/features/dashboard/components/VizTypePicker/VizTypePickerPlugin.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { GrafanaTheme, PanelPluginMeta, PluginState } from '@grafana/data'; -import { Badge, BadgeProps, styleMixins, stylesFactory, useTheme } from '@grafana/ui'; +import { PlutonoTheme, PanelPluginMeta, PluginState } from '@credativ/plutono-data'; +import { Badge, BadgeProps, styleMixins, stylesFactory, useTheme } from '@credativ/plutono-ui'; import { css, cx } from 'emotion'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { isUnsignedPluginSignature, PluginSignatureBadge } from '../../../plugins/PluginSignatureBadge'; interface Props { @@ -45,7 +45,7 @@ const VizTypePickerPlugin: React.FC = ({ isCurrent, plugin, onClick, disa VizTypePickerPlugin.displayName = 'VizTypePickerPlugin'; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { wrapper: css` position: relative; diff --git a/public/app/features/dashboard/containers/DashboardPage.test.tsx b/public/app/features/dashboard/containers/DashboardPage.test.tsx index fb379119eb..50a6c74b26 100644 --- a/public/app/features/dashboard/containers/DashboardPage.test.tsx +++ b/public/app/features/dashboard/containers/DashboardPage.test.tsx @@ -115,7 +115,7 @@ describe('DashboardPage', () => { }); it('Should update title', () => { - expect(document.title).toBe('My dashboard - Grafana'); + expect(document.title).toBe('My dashboard - Plutono'); }); it('Should render dashboard grid', () => { diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx index 5d9cfe9baf..582bde02dc 100644 --- a/public/app/features/dashboard/containers/DashboardPage.tsx +++ b/public/app/features/dashboard/containers/DashboardPage.tsx @@ -13,7 +13,7 @@ import { DashboardGrid } from '../dashgrid/DashboardGrid'; import { DashNav } from '../components/DashNav'; import { DashboardSettings } from '../components/DashboardSettings'; import { PanelEditor } from '../components/PanelEditor/PanelEditor'; -import { Alert, Button, CustomScrollbar, HorizontalGroup, Spinner, VerticalGroup } from '@grafana/ui'; +import { Alert, Button, CustomScrollbar, HorizontalGroup, Spinner, VerticalGroup } from '@credativ/plutono-ui'; // Redux import { initDashboard } from '../state/initDashboard'; import { notifyApp, updateLocation } from 'app/core/actions'; diff --git a/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap b/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap index 6dbfba5410..dd099f4dc7 100644 --- a/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap +++ b/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap @@ -12,7 +12,7 @@ exports[`DashboardPage Dashboard init completed Should render dashboard grid 1` "list": Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -120,7 +120,7 @@ exports[`DashboardPage Dashboard init completed Should render dashboard grid 1` Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -135,7 +135,7 @@ exports[`DashboardPage Dashboard init completed Should render dashboard grid 1` "list": Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -232,7 +232,7 @@ exports[`DashboardPage Dashboard init completed Should render dashboard grid 1` "list": Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -384,7 +384,7 @@ exports[`DashboardPage When dashboard has editview url state should render setti "list": Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -492,7 +492,7 @@ exports[`DashboardPage When dashboard has editview url state should render setti Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -507,7 +507,7 @@ exports[`DashboardPage When dashboard has editview url state should render setti "list": Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -604,7 +604,7 @@ exports[`DashboardPage When dashboard has editview url state should render setti "list": Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -706,7 +706,7 @@ exports[`DashboardPage When dashboard has editview url state should render setti "list": Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", diff --git a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx index f475124a45..3185c6bad8 100644 --- a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx +++ b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx @@ -14,7 +14,7 @@ import { initDashboardPanel } from '../state/actions'; // Types import { DashboardModel, PanelModel } from '../state'; import { StoreState } from 'app/types'; -import { PanelPlugin } from '@grafana/data'; +import { PanelPlugin } from '@credativ/plutono-data'; export interface OwnProps { panel: PanelModel; diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.test.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.test.tsx index fef5ef8c71..e586a21838 100644 --- a/public/app/features/dashboard/dashgrid/PanelChrome.test.tsx +++ b/public/app/features/dashboard/dashgrid/PanelChrome.test.tsx @@ -3,7 +3,7 @@ import { ReplaySubject } from 'rxjs'; import { Provider } from 'react-redux'; import configureMockStore from 'redux-mock-store'; import { act, render, screen } from '@testing-library/react'; -import { getDefaultTimeRange, LoadingState, PanelData, PanelPlugin, PanelProps } from '@grafana/data'; +import { getDefaultTimeRange, LoadingState, PanelData, PanelPlugin, PanelProps } from '@credativ/plutono-data'; import { PanelChrome, Props } from './PanelChrome'; import { DashboardModel, PanelModel } from '../state'; diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx index 8b4b3a79aa..09435a59b5 100644 --- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx +++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx @@ -4,7 +4,7 @@ import classNames from 'classnames'; import { Subscription } from 'rxjs'; // Components import { PanelHeader } from './PanelHeader/PanelHeader'; -import { ErrorBoundary } from '@grafana/ui'; +import { ErrorBoundary } from '@credativ/plutono-ui'; // Utils & Services import { getTimeSrv, TimeSrv } from '../services/TimeSrv'; import { applyPanelTimeOverrides } from 'app/features/dashboard/utils/panel'; @@ -23,8 +23,8 @@ import { PanelPluginMeta, toDataFrameDTO, toUtc, -} from '@grafana/data'; -import { selectors } from '@grafana/e2e-selectors'; +} from '@credativ/plutono-data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { loadSnapshotData } from '../utils/loadSnapshotData'; import { RefreshEvent, RenderEvent } from 'app/types/events'; diff --git a/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx b/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx index b2ebd168ef..4283bcb057 100644 --- a/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx +++ b/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx @@ -7,15 +7,15 @@ import { connect, MapDispatchToProps, MapStateToProps } from 'react-redux'; import { PanelHeader } from './PanelHeader/PanelHeader'; // Utils & Services import { getTimeSrv, TimeSrv } from '../services/TimeSrv'; -import { AngularComponent, getAngularLoader } from '@grafana/runtime'; +import { AngularComponent, getAngularLoader } from '@credativ/plutono-runtime'; import { setPanelAngularComponent } from '../state/reducers'; import config from 'app/core/config'; // Types import { DashboardModel, PanelModel } from '../state'; import { StoreState } from 'app/types'; -import { getDefaultTimeRange, LoadingState, PanelData, PanelPlugin } from '@grafana/data'; +import { getDefaultTimeRange, LoadingState, PanelData, PanelPlugin } from '@credativ/plutono-data'; import { PANEL_BORDER } from 'app/core/constants'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { RenderEvent } from 'app/types/events'; interface OwnProps { diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx index 787399ceae..62efd4c9a3 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx @@ -1,8 +1,8 @@ import React, { FC } from 'react'; import { cx } from 'emotion'; -import { DataLink, PanelData } from '@grafana/data'; -import { Icon } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; +import { DataLink, PanelData } from '@credativ/plutono-data'; +import { Icon } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import PanelHeaderCorner from './PanelHeaderCorner'; import { DashboardModel } from 'app/features/dashboard/state/DashboardModel'; diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx index 6e70c6c282..871ed0ec2f 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx @@ -1,13 +1,13 @@ import React, { Component } from 'react'; -import { renderMarkdown, LinkModelSupplier, ScopedVars } from '@grafana/data'; -import { Tooltip, PopoverContent } from '@grafana/ui'; -import { getLocationSrv, getTemplateSrv } from '@grafana/runtime'; +import { renderMarkdown, LinkModelSupplier, ScopedVars } from '@credativ/plutono-data'; +import { Tooltip, PopoverContent } from '@credativ/plutono-ui'; +import { getLocationSrv, getTemplateSrv } from '@credativ/plutono-runtime'; import { PanelModel } from 'app/features/dashboard/state/PanelModel'; import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { InspectTab } from 'app/features/inspector/types'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; enum InfoMode { Error = 'Error', diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderLoadingIndicator.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderLoadingIndicator.tsx index a32ea8fed4..c5c277d738 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderLoadingIndicator.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderLoadingIndicator.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { css } from 'emotion'; -import { GrafanaTheme, LoadingState } from '@grafana/data'; -import { Icon, Tooltip, useStyles } from '@grafana/ui'; +import { PlutonoTheme, LoadingState } from '@credativ/plutono-data'; +import { Icon, Tooltip, useStyles } from '@credativ/plutono-ui'; interface Props { state: LoadingState; @@ -32,7 +32,7 @@ export const PanelHeaderLoadingIndicator: FC = ({ state, onClick }) => { return null; }; -function getStyles(theme: GrafanaTheme) { +function getStyles(theme: PlutonoTheme) { return { streamIndicator: css` width: 10px; diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx index c180359922..d3d461ef8f 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { PanelHeaderMenuItem } from './PanelHeaderMenuItem'; -import { PanelMenuItem } from '@grafana/data'; +import { PanelMenuItem } from '@credativ/plutono-data'; export interface Props { items: PanelMenuItem[]; diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx index 86cbe5db04..c2dc52bbb8 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx @@ -1,8 +1,8 @@ import React, { FC, useState } from 'react'; import { css } from 'emotion'; -import { PanelMenuItem } from '@grafana/data'; -import { Icon, IconName, useTheme } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; +import { PanelMenuItem } from '@credativ/plutono-data'; +import { Icon, IconName, useTheme } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; interface Props { children?: any; diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuProvider.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuProvider.tsx index 4fd29502f9..32569dc1e8 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuProvider.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuProvider.tsx @@ -1,6 +1,6 @@ import { FC, ReactElement, useEffect, useState } from 'react'; import { useSelector } from 'react-redux'; -import { PanelMenuItem } from '@grafana/data'; +import { PanelMenuItem } from '@credativ/plutono-data'; import { DashboardModel, PanelModel } from '../../state'; import { StoreState } from '../../../../types'; diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx index 38741292e1..37c3e33fde 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx @@ -1,5 +1,5 @@ import React, { FC, HTMLAttributes, MouseEvent, ReactElement, useCallback, useState } from 'react'; -import { CartesianCoords2D } from '@grafana/data'; +import { CartesianCoords2D } from '@credativ/plutono-data'; interface PanelHeaderMenuTriggerApi { panelMenuOpen: boolean; diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuWrapper.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuWrapper.tsx index 596dc96fa6..80ef4ae192 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuWrapper.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuWrapper.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { ClickOutsideWrapper } from '@grafana/ui'; +import { ClickOutsideWrapper } from '@credativ/plutono-ui'; import { PanelHeaderMenuProvider } from './PanelHeaderMenuProvider'; import { PanelHeaderMenu } from './PanelHeaderMenu'; import { DashboardModel, PanelModel } from '../../state'; diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotice.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotice.tsx index 16e9670523..58744d25dd 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotice.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotice.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { QueryResultMetaNotice } from '@grafana/data'; -import { Icon, Tooltip } from '@grafana/ui'; +import { QueryResultMetaNotice } from '@credativ/plutono-data'; +import { Icon, Tooltip } from '@credativ/plutono-ui'; interface Props { notice: QueryResultMetaNotice; diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotices.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotices.tsx index d4b888a9aa..e3aadc7af2 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotices.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotices.tsx @@ -1,5 +1,5 @@ import React, { FC, useCallback } from 'react'; -import { DataFrame, QueryResultMetaNotice } from '@grafana/data'; +import { DataFrame, QueryResultMetaNotice } from '@credativ/plutono-data'; import { PanelHeaderNotice } from './PanelHeaderNotice'; import { useDispatch } from 'react-redux'; import { updateLocation } from '../../../../core/actions'; diff --git a/public/app/features/dashboard/dashgrid/PanelPluginError.tsx b/public/app/features/dashboard/dashgrid/PanelPluginError.tsx index ce6a9a5e67..785780e80c 100644 --- a/public/app/features/dashboard/dashgrid/PanelPluginError.tsx +++ b/public/app/features/dashboard/dashgrid/PanelPluginError.tsx @@ -4,8 +4,8 @@ import React, { PureComponent, ReactNode } from 'react'; // Types import { AppNotificationSeverity } from 'app/types'; -import { Alert } from '@grafana/ui'; -import { PanelProps, PanelPlugin, PluginType, PanelPluginMeta } from '@grafana/data'; +import { Alert } from '@credativ/plutono-ui'; +import { PanelProps, PanelPlugin, PluginType, PanelPluginMeta } from '@credativ/plutono-data'; interface Props { title: string; diff --git a/public/app/features/dashboard/dashgrid/__snapshots__/DashboardGrid.test.tsx.snap b/public/app/features/dashboard/dashgrid/__snapshots__/DashboardGrid.test.tsx.snap index 8ae6c30200..321cc40dcb 100644 --- a/public/app/features/dashboard/dashgrid/__snapshots__/DashboardGrid.test.tsx.snap +++ b/public/app/features/dashboard/dashgrid/__snapshots__/DashboardGrid.test.tsx.snap @@ -55,7 +55,7 @@ exports[`DashboardGrid Can render dashboard grid Should render 1`] = ` "list": Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -279,7 +279,7 @@ exports[`DashboardGrid Can render dashboard grid Should render 1`] = ` "list": Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -503,7 +503,7 @@ exports[`DashboardGrid Can render dashboard grid Should render 1`] = ` "list": Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -727,7 +727,7 @@ exports[`DashboardGrid Can render dashboard grid Should render 1`] = ` "list": Array [ Object { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", diff --git a/public/app/features/dashboard/services/ChangeTracker.ts b/public/app/features/dashboard/services/ChangeTracker.ts index c9dde5246a..62ed932af1 100644 --- a/public/app/features/dashboard/services/ChangeTracker.ts +++ b/public/app/features/dashboard/services/ChangeTracker.ts @@ -2,7 +2,7 @@ import angular, { ILocationService, IRootScopeService } from 'angular'; import _ from 'lodash'; import { DashboardModel } from '../state/DashboardModel'; import { ContextSrv } from 'app/core/services/context_srv'; -import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; +import { PlutonoRootScope } from 'app/routes/PlutonoCtrl'; import { AppEventConsumer, CoreEvents } from 'app/types'; import { appEvents } from 'app/core/app_events'; import { UnsavedChangesModal } from '../components/SaveDashboard/UnsavedChangesModal'; @@ -24,7 +24,7 @@ export class ChangeTracker { $window: any, private $timeout: any, private contextSrv: ContextSrv, - private $rootScope: GrafanaRootScope + private $rootScope: PlutonoRootScope ) { this.$location = $location; this.$window = $window; diff --git a/public/app/features/dashboard/services/DashboardLoaderSrv.ts b/public/app/features/dashboard/services/DashboardLoaderSrv.ts index 96dc24e192..14c8dfb9f1 100644 --- a/public/app/features/dashboard/services/DashboardLoaderSrv.ts +++ b/public/app/features/dashboard/services/DashboardLoaderSrv.ts @@ -3,12 +3,12 @@ import moment from 'moment'; // eslint-disable-line no-restricted-imports import _ from 'lodash'; import $ from 'jquery'; import kbn from 'app/core/utils/kbn'; -import { AppEvents, dateMath, UrlQueryValue } from '@grafana/data'; +import { AppEvents, dateMath, UrlQueryValue } from '@credativ/plutono-data'; import impressionSrv from 'app/core/services/impression_srv'; import { backendSrv } from 'app/core/services/backend_srv'; import { DashboardSrv } from './DashboardSrv'; import DatasourceSrv from 'app/features/plugins/datasource_srv'; -import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; +import { PlutonoRootScope } from 'app/routes/PlutonoCtrl'; export class DashboardLoaderSrv { /** @ngInject */ @@ -19,7 +19,7 @@ export class DashboardLoaderSrv { private $timeout: any, contextSrv: any, private $routeParams: any, - private $rootScope: GrafanaRootScope + private $rootScope: PlutonoRootScope ) {} _dashboardLoadFailed(title: string, snapshot?: boolean) { @@ -136,4 +136,4 @@ export class DashboardLoaderSrv { } } -angular.module('grafana.services').service('dashboardLoaderSrv', DashboardLoaderSrv); +angular.module('plutono.services').service('dashboardLoaderSrv', DashboardLoaderSrv); diff --git a/public/app/features/dashboard/services/DashboardSrv.ts b/public/app/features/dashboard/services/DashboardSrv.ts index e86e686d17..8d18ae7f1c 100644 --- a/public/app/features/dashboard/services/DashboardSrv.ts +++ b/public/app/features/dashboard/services/DashboardSrv.ts @@ -3,7 +3,7 @@ import { appEvents } from 'app/core/app_events'; import { DashboardModel } from '../state/DashboardModel'; import { removePanel } from '../utils/panel'; import { CoreEvents, DashboardMeta } from 'app/types'; -import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; +import { PlutonoRootScope } from 'app/routes/PlutonoCtrl'; import { backendSrv } from 'app/core/services/backend_srv'; import { promiseToDigest } from '../../../core/utils/promiseToDigest'; import { saveDashboard } from 'app/features/manage-dashboards/state/actions'; @@ -12,7 +12,7 @@ export class DashboardSrv { dashboard: DashboardModel; /** @ngInject */ - constructor(private $rootScope: GrafanaRootScope) { + constructor(private $rootScope: PlutonoRootScope) { appEvents.on(CoreEvents.removePanel, this.onRemovePanel); } diff --git a/public/app/features/dashboard/services/TimeSrv.test.ts b/public/app/features/dashboard/services/TimeSrv.test.ts index 04786c33b4..6f0173de2d 100644 --- a/public/app/features/dashboard/services/TimeSrv.test.ts +++ b/public/app/features/dashboard/services/TimeSrv.test.ts @@ -1,6 +1,6 @@ import { TimeSrv } from './TimeSrv'; import { ContextSrvStub } from 'test/specs/helpers'; -import { isDateTime, dateTime } from '@grafana/data'; +import { isDateTime, dateTime } from '@credativ/plutono-data'; jest.mock('app/core/core', () => ({ appEvents: { diff --git a/public/app/features/dashboard/services/TimeSrv.ts b/public/app/features/dashboard/services/TimeSrv.ts index df59d33bdd..f2b4383f50 100644 --- a/public/app/features/dashboard/services/TimeSrv.ts +++ b/public/app/features/dashboard/services/TimeSrv.ts @@ -9,12 +9,12 @@ import { RawTimeRange, TimeRange, toUtc, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import coreModule from 'app/core/core_module'; import { ContextSrv } from 'app/core/services/context_srv'; import { DashboardModel } from '../state/DashboardModel'; -import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; +import { PlutonoRootScope } from 'app/routes/PlutonoCtrl'; import { getShiftedTimeRange, getZoomedTimeRange } from 'app/core/utils/timePicker'; import { appEvents } from '../../../core/core'; import { CoreEvents } from '../../../types'; @@ -32,7 +32,7 @@ export class TimeSrv { /** @ngInject */ constructor( - $rootScope: GrafanaRootScope, + $rootScope: PlutonoRootScope, private $timeout: ITimeoutService, private $location: ILocationService, private timer: any, @@ -219,7 +219,7 @@ export class TimeSrv { this.refreshTimer = this.timer.register( this.$timeout(() => { this.startNextRefreshTimer(afterMs); - if (this.contextSrv.isGrafanaVisible()) { + if (this.contextSrv.isPlutonoVisible()) { this.refreshDashboard(); } else { this.autoRefreshBlocked = true; diff --git a/public/app/features/dashboard/services/UnsavedChangesSrv.ts b/public/app/features/dashboard/services/UnsavedChangesSrv.ts index 4b71a83a7c..95d359f406 100644 --- a/public/app/features/dashboard/services/UnsavedChangesSrv.ts +++ b/public/app/features/dashboard/services/UnsavedChangesSrv.ts @@ -2,12 +2,12 @@ import angular, { ILocationService } from 'angular'; import { ChangeTracker } from './ChangeTracker'; import { ContextSrv } from 'app/core/services/context_srv'; import { DashboardSrv } from './DashboardSrv'; -import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; +import { PlutonoRootScope } from 'app/routes/PlutonoCtrl'; /** @ngInject */ export function unsavedChangesSrv( this: any, - $rootScope: GrafanaRootScope, + $rootScope: PlutonoRootScope, $location: ILocationService, $timeout: any, contextSrv: ContextSrv, @@ -20,4 +20,4 @@ export function unsavedChangesSrv( }; } -angular.module('grafana.services').service('unsavedChangesSrv', unsavedChangesSrv); +angular.module('plutono.services').service('unsavedChangesSrv', unsavedChangesSrv); diff --git a/public/app/features/dashboard/state/DashboardMigrator.test.ts b/public/app/features/dashboard/state/DashboardMigrator.test.ts index 40acec14d8..9e6e698eeb 100644 --- a/public/app/features/dashboard/state/DashboardMigrator.test.ts +++ b/public/app/features/dashboard/state/DashboardMigrator.test.ts @@ -3,7 +3,7 @@ import { DashboardModel } from '../state/DashboardModel'; import { PanelModel } from '../state/PanelModel'; import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN } from 'app/core/constants'; import { expect } from 'test/lib/common'; -import { DataLinkBuiltInVars } from '@grafana/data'; +import { DataLinkBuiltInVars } from '@credativ/plutono-data'; import { VariableHide } from '../../variables/types'; jest.mock('app/core/services/context_srv', () => ({})); diff --git a/public/app/features/dashboard/state/DashboardMigrator.ts b/public/app/features/dashboard/state/DashboardMigrator.ts index e76be48222..4df2faf85f 100644 --- a/public/app/features/dashboard/state/DashboardMigrator.ts +++ b/public/app/features/dashboard/state/DashboardMigrator.ts @@ -6,7 +6,7 @@ import kbn from 'app/core/utils/kbn'; // Types import { PanelModel } from './PanelModel'; import { DashboardModel } from './DashboardModel'; -import { DataLink, DataLinkBuiltInVars, urlUtil } from '@grafana/data'; +import { DataLink, DataLinkBuiltInVars, urlUtil } from '@credativ/plutono-data'; // Constants import { DEFAULT_PANEL_SPAN, diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts index f71b60845a..7a615d6aff 100644 --- a/public/app/features/dashboard/state/DashboardModel.ts +++ b/public/app/features/dashboard/state/DashboardModel.ts @@ -1,7 +1,7 @@ // Libaries import _ from 'lodash'; // Constants -import { DEFAULT_ANNOTATION_COLOR } from '@grafana/ui'; +import { DEFAULT_ANNOTATION_COLOR } from '@credativ/plutono-ui'; import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN, GRID_COLUMN_COUNT, REPEAT_DIR_VERTICAL } from 'app/core/constants'; // Utils & Services import { contextSrv } from 'app/core/services/context_srv'; @@ -19,7 +19,7 @@ import { TimeRange, TimeZone, UrlQueryValue, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { CoreEvents, DashboardMeta, KIOSK_MODE_TV } from 'app/types'; import { GetVariables, getVariables } from 'app/features/variables/state/selectors'; import { variableAdapters } from 'app/features/variables/adapters'; @@ -155,7 +155,7 @@ export class DashboardModel { } this.annotations.list.unshift({ - datasource: '-- Grafana --', + datasource: '-- Plutono --', name: 'Annotations & Alerts', type: 'dashboard', iconColor: DEFAULT_ANNOTATION_COLOR, diff --git a/public/app/features/dashboard/state/PanelModel.test.ts b/public/app/features/dashboard/state/PanelModel.test.ts index 6315ac6837..aa883a5dc8 100644 --- a/public/app/features/dashboard/state/PanelModel.test.ts +++ b/public/app/features/dashboard/state/PanelModel.test.ts @@ -7,12 +7,12 @@ import { PanelProps, standardEditorsRegistry, standardFieldConfigEditorRegistry, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { ComponentClass } from 'react'; import { PanelQueryRunner } from '../../query/state/PanelQueryRunner'; import { setTimeSrv } from '../services/TimeSrv'; import { TemplateSrv } from '../../templating/template_srv'; -import { setTemplateSrv } from '@grafana/runtime'; +import { setTemplateSrv } from '@credativ/plutono-runtime'; import { variableAdapters } from '../../variables/adapters'; import { createQueryVariableAdapter } from '../../variables/query/adapter'; import { mockStandardFieldConfigOptions } from '../../../../test/helpers/fieldConfig'; diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts index ccb175be9f..0471e9bb1b 100644 --- a/public/app/features/dashboard/state/PanelModel.ts +++ b/public/app/features/dashboard/state/PanelModel.ts @@ -1,7 +1,7 @@ // Libraries import _ from 'lodash'; // Utils -import { getTemplateSrv } from '@grafana/runtime'; +import { getTemplateSrv } from '@credativ/plutono-runtime'; import { getNextRefIdChar } from 'app/core/utils/query'; // Types import { @@ -17,7 +17,7 @@ import { PanelPlugin, ScopedVars, urlUtil, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { EDIT_PANEL_ID } from 'app/core/constants'; import config from 'app/core/config'; import { PanelQueryRunner } from '../../query/state/PanelQueryRunner'; diff --git a/public/app/features/dashboard/state/actions.ts b/public/app/features/dashboard/state/actions.ts index 4d81d9e19f..cf696b6923 100644 --- a/public/app/features/dashboard/state/actions.ts +++ b/public/app/features/dashboard/state/actions.ts @@ -1,5 +1,5 @@ // Services & Utils -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { createSuccessNotification } from 'app/core/copy/appNotification'; // Actions import { loadPluginDashboards } from '../../plugins/state/actions'; diff --git a/public/app/features/dashboard/state/analyticsProcessor.ts b/public/app/features/dashboard/state/analyticsProcessor.ts index 9834d86f14..f35111d306 100644 --- a/public/app/features/dashboard/state/analyticsProcessor.ts +++ b/public/app/features/dashboard/state/analyticsProcessor.ts @@ -1,5 +1,5 @@ import { DashboardModel } from './DashboardModel'; -import { reportMetaAnalytics, MetaAnalyticsEventName, DashboardViewEventPayload } from '@grafana/runtime'; +import { reportMetaAnalytics, MetaAnalyticsEventName, DashboardViewEventPayload } from '@credativ/plutono-runtime'; export function emitDashboardViewEvent(dashboard: DashboardModel) { const eventData: DashboardViewEventPayload = { diff --git a/public/app/features/dashboard/state/getPanelOptionsWithDefaults.test.ts b/public/app/features/dashboard/state/getPanelOptionsWithDefaults.test.ts index fdbdf90ed3..7327940c36 100644 --- a/public/app/features/dashboard/state/getPanelOptionsWithDefaults.test.ts +++ b/public/app/features/dashboard/state/getPanelOptionsWithDefaults.test.ts @@ -9,7 +9,7 @@ import { standardFieldConfigEditorRegistry, StandardOptionConfig, ThresholdsMode, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { getPanelPlugin } from 'app/features/plugins/__mocks__/pluginMocks'; import { mockStandardFieldConfigOptions } from 'test/helpers/fieldConfig'; import { getPanelOptionsWithDefaults, restoreCustomOverrideRules } from './getPanelOptionsWithDefaults'; diff --git a/public/app/features/dashboard/state/getPanelOptionsWithDefaults.ts b/public/app/features/dashboard/state/getPanelOptionsWithDefaults.ts index 2bf513a9e9..a6fe32be38 100644 --- a/public/app/features/dashboard/state/getPanelOptionsWithDefaults.ts +++ b/public/app/features/dashboard/state/getPanelOptionsWithDefaults.ts @@ -10,7 +10,7 @@ import { PanelPlugin, ThresholdsConfig, ThresholdsMode, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { mergeWith, isArray, isObject, unset, isEqual } from 'lodash'; export interface Props { diff --git a/public/app/features/dashboard/state/initDashboard.test.ts b/public/app/features/dashboard/state/initDashboard.test.ts index 6f76e76a13..f56a098244 100644 --- a/public/app/features/dashboard/state/initDashboard.test.ts +++ b/public/app/features/dashboard/state/initDashboard.test.ts @@ -5,7 +5,7 @@ import { DashboardInitPhase, DashboardRouteInfo } from 'app/types'; import { getBackendSrv } from 'app/core/services/backend_srv'; import { dashboardInitCompleted, dashboardInitFetching, dashboardInitServices } from './reducers'; import { updateLocation } from '../../../core/actions'; -import { setEchoSrv } from '@grafana/runtime'; +import { setEchoSrv } from '@credativ/plutono-runtime'; import { Echo } from '../../../core/services/echo/Echo'; import { variableAdapters } from 'app/features/variables/adapters'; import { createConstantVariableAdapter } from 'app/features/variables/constant/adapter'; diff --git a/public/app/features/dashboard/state/initDashboard.ts b/public/app/features/dashboard/state/initDashboard.ts index 72ec4b422f..473ed0ec34 100644 --- a/public/app/features/dashboard/state/initDashboard.ts +++ b/public/app/features/dashboard/state/initDashboard.ts @@ -26,7 +26,7 @@ import { DashboardInitPhase, } from 'app/types'; import { DashboardModel } from './DashboardModel'; -import { DataQuery, locationUtil } from '@grafana/data'; +import { DataQuery, locationUtil } from '@credativ/plutono-data'; import { initVariablesTransaction } from '../../variables/state/actions'; import { emitDashboardViewEvent } from './analyticsProcessor'; import { dashboardWatcher } from 'app/features/live/dashboard/dashboardWatcher'; diff --git a/public/app/features/dashboard/state/reducers.ts b/public/app/features/dashboard/state/reducers.ts index 0460b9c161..08042d29fe 100644 --- a/public/app/features/dashboard/state/reducers.ts +++ b/public/app/features/dashboard/state/reducers.ts @@ -7,13 +7,13 @@ import { PanelState, QueriesToUpdateOnDashboardLoad, } from 'app/types'; -import { AngularComponent } from '@grafana/runtime'; +import { AngularComponent } from '@credativ/plutono-runtime'; import { EDIT_PANEL_ID } from 'app/core/constants'; import { processAclItems } from 'app/core/utils/acl'; import { panelEditorReducer } from '../components/PanelEditor/state/reducers'; import { DashboardModel } from './DashboardModel'; import { PanelModel } from './PanelModel'; -import { PanelPlugin } from '@grafana/data'; +import { PanelPlugin } from '@credativ/plutono-data'; export const initialState: DashboardState = { initPhase: DashboardInitPhase.NotStarted, diff --git a/public/app/features/dashboard/utils/getPanelMenu.test.ts b/public/app/features/dashboard/utils/getPanelMenu.test.ts index 0d52d187b7..5749edbb3e 100644 --- a/public/app/features/dashboard/utils/getPanelMenu.test.ts +++ b/public/app/features/dashboard/utils/getPanelMenu.test.ts @@ -1,4 +1,4 @@ -import { PanelMenuItem } from '@grafana/data'; +import { PanelMenuItem } from '@credativ/plutono-data'; import { DashboardModel, PanelModel } from '../state'; import { getPanelMenu } from './getPanelMenu'; import { describe } from '../../../../test/lib/common'; diff --git a/public/app/features/dashboard/utils/getPanelMenu.ts b/public/app/features/dashboard/utils/getPanelMenu.ts index b1b0f9fe27..1511a8b7c8 100644 --- a/public/app/features/dashboard/utils/getPanelMenu.ts +++ b/public/app/features/dashboard/utils/getPanelMenu.ts @@ -1,7 +1,7 @@ import { updateLocation } from 'app/core/actions'; import { store } from 'app/store/store'; -import { AngularComponent, getDataSourceSrv, getLocationSrv } from '@grafana/runtime'; -import { PanelMenuItem } from '@grafana/data'; +import { AngularComponent, getDataSourceSrv, getLocationSrv } from '@credativ/plutono-runtime'; +import { PanelMenuItem } from '@credativ/plutono-data'; import { copyPanel, duplicatePanel, removePanel, sharePanel } from 'app/features/dashboard/utils/panel'; import { PanelModel } from 'app/features/dashboard/state/PanelModel'; import { DashboardModel } from 'app/features/dashboard/state/DashboardModel'; diff --git a/public/app/features/dashboard/utils/getRefreshFromUrl.ts b/public/app/features/dashboard/utils/getRefreshFromUrl.ts index a838313b66..80ac166358 100644 --- a/public/app/features/dashboard/utils/getRefreshFromUrl.ts +++ b/public/app/features/dashboard/utils/getRefreshFromUrl.ts @@ -1,4 +1,4 @@ -import { defaultIntervals } from '@grafana/ui'; +import { defaultIntervals } from '@credativ/plutono-ui'; interface Args { params: Record; diff --git a/public/app/features/dashboard/utils/loadSnapshotData.ts b/public/app/features/dashboard/utils/loadSnapshotData.ts index 33e26504fa..fbf53875c0 100644 --- a/public/app/features/dashboard/utils/loadSnapshotData.ts +++ b/public/app/features/dashboard/utils/loadSnapshotData.ts @@ -1,4 +1,4 @@ -import { applyFieldOverrides, getDefaultTimeRange, LoadingState, PanelData } from '@grafana/data'; +import { applyFieldOverrides, getDefaultTimeRange, LoadingState, PanelData } from '@credativ/plutono-data'; import { config } from 'app/core/config'; import { DashboardModel, PanelModel } from '../state'; import { getProcessedDataFrames } from '../../query/state/runRequest'; diff --git a/public/app/features/dashboard/utils/panel.test.ts b/public/app/features/dashboard/utils/panel.test.ts index 9b57ffc495..0f7bb884a8 100644 --- a/public/app/features/dashboard/utils/panel.test.ts +++ b/public/app/features/dashboard/utils/panel.test.ts @@ -1,4 +1,4 @@ -import { dateTime, DateTime, PanelProps, TimeRange } from '@grafana/data'; +import { dateTime, DateTime, PanelProps, TimeRange } from '@credativ/plutono-data'; import { applyPanelTimeOverrides, calculateInnerPanelHeight } from 'app/features/dashboard/utils/panel'; import { advanceTo, clear } from 'jest-date-mock'; import { PanelModel } from '../state'; diff --git a/public/app/features/dashboard/utils/panel.ts b/public/app/features/dashboard/utils/panel.ts index bed7a6d886..6ace604f90 100644 --- a/public/app/features/dashboard/utils/panel.ts +++ b/public/app/features/dashboard/utils/panel.ts @@ -4,7 +4,7 @@ import store from 'app/core/store'; // Models import { DashboardModel } from 'app/features/dashboard/state/DashboardModel'; import { PanelModel } from 'app/features/dashboard/state/PanelModel'; -import { TimeRange, AppEvents, rangeUtil, dateMath } from '@grafana/data'; +import { TimeRange, AppEvents, rangeUtil, dateMath } from '@credativ/plutono-data'; // Utils import { isString as _isString } from 'lodash'; @@ -12,7 +12,7 @@ import appEvents from 'app/core/app_events'; import config from 'app/core/config'; // Services -import { getTemplateSrv } from '@grafana/runtime'; +import { getTemplateSrv } from '@credativ/plutono-runtime'; // Constants import { LS_PANEL_COPY_KEY, PANEL_BORDER } from 'app/core/constants'; diff --git a/public/app/features/datasources/DashboardsTable.tsx b/public/app/features/datasources/DashboardsTable.tsx index 09ab4359b3..dc6955abc9 100644 --- a/public/app/features/datasources/DashboardsTable.tsx +++ b/public/app/features/datasources/DashboardsTable.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import { PluginDashboard } from '../../types'; -import { Icon } from '@grafana/ui'; +import { Icon } from '@credativ/plutono-ui'; export interface Props { dashboards: PluginDashboard[]; diff --git a/public/app/features/datasources/DataSourceDashboards.test.tsx b/public/app/features/datasources/DataSourceDashboards.test.tsx index c8770f550c..99d64b2002 100644 --- a/public/app/features/datasources/DataSourceDashboards.test.tsx +++ b/public/app/features/datasources/DataSourceDashboards.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { DataSourceDashboards, Props } from './DataSourceDashboards'; -import { DataSourceSettings, NavModel } from '@grafana/data'; +import { DataSourceSettings, NavModel } from '@credativ/plutono-data'; import { PluginDashboard } from 'app/types'; const setup = (propOverrides?: object) => { diff --git a/public/app/features/datasources/DataSourceDashboards.tsx b/public/app/features/datasources/DataSourceDashboards.tsx index 1f71b8ad76..8e480bedd8 100644 --- a/public/app/features/datasources/DataSourceDashboards.tsx +++ b/public/app/features/datasources/DataSourceDashboards.tsx @@ -17,7 +17,7 @@ import { getDataSource } from './state/selectors'; // Types import { PluginDashboard, StoreState } from 'app/types'; -import { DataSourceSettings, NavModel } from '@grafana/data'; +import { DataSourceSettings, NavModel } from '@credativ/plutono-data'; export interface Props { navModel: NavModel; diff --git a/public/app/features/datasources/DataSourcesList.tsx b/public/app/features/datasources/DataSourcesList.tsx index 6899120df1..d512bf8285 100644 --- a/public/app/features/datasources/DataSourcesList.tsx +++ b/public/app/features/datasources/DataSourcesList.tsx @@ -2,9 +2,9 @@ import React, { FC } from 'react'; // Types -import { DataSourceSettings } from '@grafana/data'; +import { DataSourceSettings } from '@credativ/plutono-data'; import { LayoutMode } from '../../core/components/LayoutSelector/LayoutSelector'; -import { Card, Tag, useStyles } from '@grafana/ui'; +import { Card, Tag, useStyles } from '@credativ/plutono-ui'; import { css } from 'emotion'; export interface Props { diff --git a/public/app/features/datasources/DataSourcesListPage.test.tsx b/public/app/features/datasources/DataSourcesListPage.test.tsx index e6735cd981..3f1ad44141 100644 --- a/public/app/features/datasources/DataSourcesListPage.test.tsx +++ b/public/app/features/datasources/DataSourcesListPage.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { DataSourceSettings, NavModel } from '@grafana/data'; +import { DataSourceSettings, NavModel } from '@credativ/plutono-data'; import { DataSourcesListPage, Props } from './DataSourcesListPage'; import { LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector'; diff --git a/public/app/features/datasources/DataSourcesListPage.tsx b/public/app/features/datasources/DataSourcesListPage.tsx index 4784bdfda4..0a0bdd011e 100644 --- a/public/app/features/datasources/DataSourcesListPage.tsx +++ b/public/app/features/datasources/DataSourcesListPage.tsx @@ -8,8 +8,8 @@ import OrgActionBar from 'app/core/components/OrgActionBar/OrgActionBar'; import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA'; import DataSourcesList from './DataSourcesList'; // Types -import { DataSourceSettings, NavModel } from '@grafana/data'; -import { IconName } from '@grafana/ui'; +import { DataSourceSettings, NavModel } from '@credativ/plutono-data'; +import { IconName } from '@credativ/plutono-ui'; import { StoreState } from 'app/types'; import { LayoutMode } from 'app/core/components/LayoutSelector/LayoutSelector'; // Actions @@ -42,7 +42,7 @@ const emptyListModel = { buttonLink: 'datasources/new', buttonTitle: 'Add data source', proTip: 'You can also define data sources through configuration files.', - proTipLink: 'http://docs.grafana.org/administration/provisioning/#datasources?utm_source=grafana_ds_list', + proTipLink: 'http://docs.plutono.org/administration/provisioning/#datasources', proTipLinkTitle: 'Learn more', proTipTarget: '_blank', }; diff --git a/public/app/features/datasources/NewDataSourcePage.tsx b/public/app/features/datasources/NewDataSourcePage.tsx index 041dbbbd2f..7ee81fc4b4 100644 --- a/public/app/features/datasources/NewDataSourcePage.tsx +++ b/public/app/features/datasources/NewDataSourcePage.tsx @@ -1,9 +1,9 @@ import React, { FC, PureComponent } from 'react'; import { connect } from 'react-redux'; import { hot } from 'react-hot-loader'; -import { DataSourcePluginMeta, NavModel } from '@grafana/data'; -import { Button, LinkButton, List } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; +import { DataSourcePluginMeta, NavModel } from '@credativ/plutono-data'; +import { Button, LinkButton, List } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import Page from 'app/core/components/Page/Page'; import { DataSourcePluginCategory, StoreState } from 'app/types'; @@ -77,7 +77,7 @@ class NewDataSourcePage extends PureComponent {
@@ -105,7 +105,7 @@ class NewDataSourcePage extends PureComponent {

Note that unsigned front-end datasource plugins are still usable, but this is subject - to change in the upcoming releases of Grafana + to change in the upcoming releases of Plutono

@@ -144,7 +144,7 @@ const DataSourceTypeCard: FC = (props) => { {learnMoreLink && ( { const dataSources = []; diff --git a/public/app/features/datasources/mocks.ts b/public/app/features/datasources/mocks.ts index bc4f9d0cdd..dd04c94c39 100644 --- a/public/app/features/datasources/mocks.ts +++ b/public/app/features/datasources/mocks.ts @@ -1,4 +1,4 @@ -import { DataSourceSettings } from '@grafana/data'; +import { DataSourceSettings } from '@credativ/plutono-data'; export function createDatasourceSettings(jsonData: T): DataSourceSettings { return { diff --git a/public/app/features/datasources/partials/tls_auth_settings.html b/public/app/features/datasources/partials/tls_auth_settings.html index f15193bf63..3af3fd1fab 100644 --- a/public/app/features/datasources/partials/tls_auth_settings.html +++ b/public/app/features/datasources/partials/tls_auth_settings.html @@ -1,7 +1,7 @@
TLS/SSL Auth Details
- TLS/SSL certificates are encrypted and stored in the Grafana database. + TLS/SSL certificates are encrypted and stored in the Plutono database.
diff --git a/public/app/features/datasources/settings/BasicSettings.tsx b/public/app/features/datasources/settings/BasicSettings.tsx index 5816563ef7..ba6e15665f 100644 --- a/public/app/features/datasources/settings/BasicSettings.tsx +++ b/public/app/features/datasources/settings/BasicSettings.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { InlineFormLabel, LegacyForms } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; +import { InlineFormLabel, LegacyForms } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; const { Input, Switch } = LegacyForms; diff --git a/public/app/features/datasources/settings/ButtonRow.tsx b/public/app/features/datasources/settings/ButtonRow.tsx index 2a9a6dfcaf..08e4e26b21 100644 --- a/public/app/features/datasources/settings/ButtonRow.tsx +++ b/public/app/features/datasources/settings/ButtonRow.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import config from 'app/core/config'; diff --git a/public/app/features/datasources/settings/CloudInfoBox.tsx b/public/app/features/datasources/settings/CloudInfoBox.tsx index 28ee4730f2..d860603113 100644 --- a/public/app/features/datasources/settings/CloudInfoBox.tsx +++ b/public/app/features/datasources/settings/CloudInfoBox.tsx @@ -1,9 +1,9 @@ -import { DataSourceSettings, GrafanaTheme } from '@grafana/data'; -import { FeatureInfoBox, useStyles } from '@grafana/ui'; +import { DataSourceSettings, PlutonoTheme } from '@credativ/plutono-data'; +import { FeatureInfoBox, useStyles } from '@credativ/plutono-ui'; import { css } from 'emotion'; import React, { FC } from 'react'; import { config } from 'app/core/config'; -import { GrafanaEdition } from '@grafana/data/src/types/config'; +import { PlutonoEdition } from '@credativ/plutono-data/src/types/config'; import { LocalStorageValueProvider } from 'app/core/components/LocalStorageValueProvider'; const LOCAL_STORAGE_KEY = 'datasources.settings.cloudInfoBox.isDismissed'; @@ -23,7 +23,7 @@ export const CloudInfoBox: FC = ({ dataSource }) => { } // Skip showing this info box in some editions - if (config.buildInfo.edition !== GrafanaEdition.OpenSource) { + if (config.buildInfo.edition !== PlutonoEdition.OpenSource) { return null; } @@ -60,12 +60,12 @@ export const CloudInfoBox: FC = ({ dataSource }) => { from Grafana Labs with the{' '} - free-forever Grafana Cloud plan + free-forever Plutono Cloud plan .
@@ -76,7 +76,7 @@ export const CloudInfoBox: FC = ({ dataSource }) => { ); }; -const getStyles = (theme: GrafanaTheme) => { +const getStyles = (theme: PlutonoTheme) => { return { box: css` margin: 0 0 ${theme.spacing.lg} 0; diff --git a/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx b/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx index 064f536d9e..db3f136b25 100644 --- a/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx +++ b/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { DataSourceSettingsPage, Props } from './DataSourceSettingsPage'; -import { DataSourceConstructor, DataSourcePlugin, DataSourceSettings, NavModel } from '@grafana/data'; +import { DataSourceConstructor, DataSourcePlugin, DataSourceSettings, NavModel } from '@credativ/plutono-data'; import { getMockDataSource } from '../__mocks__/dataSourcesMocks'; import { getMockPlugin } from '../../plugins/__mocks__/pluginMocks'; import { dataSourceLoaded, setDataSourceName, setIsDefault } from '../state/reducers'; diff --git a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx index 5857f334d4..93910ac51b 100644 --- a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx +++ b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx @@ -22,13 +22,13 @@ import { getNavModel } from 'app/core/selectors/navModel'; import { getRouteParamsId } from 'app/core/selectors/location'; // Types import { CoreEvents, StoreState } from 'app/types/'; -import { DataSourcePluginMeta, DataSourceSettings, NavModel, UrlQueryMap } from '@grafana/data'; -import { Alert, InfoBox } from '@grafana/ui'; +import { DataSourcePluginMeta, DataSourceSettings, NavModel, UrlQueryMap } from '@credativ/plutono-data'; +import { Alert, InfoBox } from '@credativ/plutono-ui'; import { getDataSourceLoadingNav } from '../state/navModel'; import PluginStateinfo from 'app/features/plugins/PluginStateInfo'; import { dataSourceLoaded, setDataSourceName, setIsDefault } from '../state/reducers'; import { connectWithCleanUp } from 'app/core/components/connectWithCleanUp'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { CloudInfoBox } from './CloudInfoBox'; export interface Props { diff --git a/public/app/features/datasources/settings/PluginSettings.tsx b/public/app/features/datasources/settings/PluginSettings.tsx index 9e4b84e22f..dbd36fc094 100644 --- a/public/app/features/datasources/settings/PluginSettings.tsx +++ b/public/app/features/datasources/settings/PluginSettings.tsx @@ -7,8 +7,8 @@ import { DataSourceApi, DataQuery, DataSourceJsonData, -} from '@grafana/data'; -import { getAngularLoader, AngularComponent } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { getAngularLoader, AngularComponent } from '@credativ/plutono-runtime'; export type GenericDataSourcePlugin = DataSourcePlugin>; diff --git a/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap b/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap index 01fdf2dd1d..7aefdcd842 100644 --- a/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap +++ b/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap @@ -98,7 +98,7 @@ exports[`Render should render alpha info text 1`] = ` "info": Object { "author": Object { "name": "Grafana Labs", - "url": "url/to/GrafanaLabs", + "url": "url/to/PlutonoLabs", }, "description": "pretty decent plugin", "links": Array [ @@ -375,7 +375,7 @@ exports[`Render should render is ready only message 1`] = ` "info": Object { "author": Object { "name": "Grafana Labs", - "url": "url/to/GrafanaLabs", + "url": "url/to/PlutonoLabs", }, "description": "pretty decent plugin", "links": Array [ diff --git a/public/app/features/datasources/state/actions.ts b/public/app/features/datasources/state/actions.ts index 926377bdc6..1159e74b75 100644 --- a/public/app/features/datasources/state/actions.ts +++ b/public/app/features/datasources/state/actions.ts @@ -3,7 +3,7 @@ import { getBackendSrv } from 'app/core/services/backend_srv'; import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; import { updateLocation, updateNavIndex } from 'app/core/actions'; import { buildNavModel } from './navModel'; -import { DataSourcePluginMeta, DataSourceSettings } from '@grafana/data'; +import { DataSourcePluginMeta, DataSourceSettings } from '@credativ/plutono-data'; import { DataSourcePluginCategory, ThunkResult, ThunkDispatch } from 'app/types'; import { getPluginSettings } from 'app/features/plugins/PluginSettingsCache'; import { importDataSourcePlugin } from 'app/features/plugins/plugin_loader'; @@ -21,7 +21,7 @@ import { } from './reducers'; import { buildCategories } from './buildCategories'; import { getDataSource, getDataSourceMeta } from './selectors'; -import { getDataSourceSrv } from '@grafana/runtime'; +import { getDataSourceSrv } from '@credativ/plutono-runtime'; export interface DataSourceTypesLoadedPayload { plugins: DataSourcePluginMeta[]; diff --git a/public/app/features/datasources/state/buildCategories.test.ts b/public/app/features/datasources/state/buildCategories.test.ts index f2c8fcfd62..5922f5427c 100644 --- a/public/app/features/datasources/state/buildCategories.test.ts +++ b/public/app/features/datasources/state/buildCategories.test.ts @@ -1,6 +1,6 @@ import { buildCategories } from './buildCategories'; import { getMockPlugin } from '../../plugins/__mocks__/pluginMocks'; -import { DataSourcePluginMeta } from '@grafana/data'; +import { DataSourcePluginMeta } from '@credativ/plutono-data'; const plugins: DataSourcePluginMeta[] = [ { @@ -39,7 +39,7 @@ describe('buildCategories', () => { expect(categories[1].plugins[0].id).toBe('loki'); }); - it('should add phantom plugin for Grafana cloud', () => { + it('should add phantom plugin for Plutono cloud', () => { expect(categories[2].title).toBe('Cloud'); expect(categories[2].plugins.length).toBe(2); expect(categories[2].plugins[1].id).toBe('gcloud'); diff --git a/public/app/features/datasources/state/buildCategories.ts b/public/app/features/datasources/state/buildCategories.ts index 9f1b6e9bd3..923b8ef692 100644 --- a/public/app/features/datasources/state/buildCategories.ts +++ b/public/app/features/datasources/state/buildCategories.ts @@ -1,4 +1,4 @@ -import { DataSourcePluginMeta, PluginType } from '@grafana/data'; +import { DataSourcePluginMeta, PluginType } from '@credativ/plutono-data'; import { DataSourcePluginCategory } from 'app/types'; import { config } from '../../../core/config'; @@ -50,7 +50,7 @@ export function buildCategories(plugins: DataSourcePluginMeta[]): DataSourcePlug for (const category of categories) { // add phantom plugin if (category.id === 'cloud') { - category.plugins.push(getGrafanaCloudPhantomPlugin()); + category.plugins.push(getPlutonoCloudPhantomPlugin()); } // add phantom plugins @@ -97,55 +97,55 @@ function sortPlugins(plugins: DataSourcePluginMeta[]) { function getEnterprisePhantomPlugins(): DataSourcePluginMeta[] { return [ getPhantomPlugin({ - id: 'grafana-splunk-datasource', + id: 'plutono-splunk-datasource', name: 'Splunk', description: 'Visualize & explore Splunk logs', imgUrl: 'public/img/plugins/splunk_logo_128.png', }), getPhantomPlugin({ - id: 'grafana-oracle-datasource', + id: 'plutono-oracle-datasource', name: 'Oracle', description: 'Visualize & explore Oracle SQL', imgUrl: 'public/img/plugins/oracle.png', }), getPhantomPlugin({ - id: 'grafana-dynatrace-datasource', + id: 'plutono-dynatrace-datasource', name: 'Dynatrace', description: 'Visualize & explore Dynatrace data', imgUrl: 'public/img/plugins/dynatrace.png', }), getPhantomPlugin({ - id: 'grafana-servicenow-datasource', + id: 'plutono-servicenow-datasource', description: 'ServiceNow integration & data source', name: 'ServiceNow', imgUrl: 'public/img/plugins/servicenow.svg', }), getPhantomPlugin({ - id: 'grafana-datadog-datasource', + id: 'plutono-datadog-datasource', description: 'DataDog integration & data source', name: 'DataDog', imgUrl: 'public/img/plugins/datadog.png', }), getPhantomPlugin({ - id: 'grafana-newrelic-datasource', + id: 'plutono-newrelic-datasource', description: 'New Relic integration & data source', name: 'New Relic', imgUrl: 'public/img/plugins/newrelic.svg', }), getPhantomPlugin({ - id: 'grafana-mongodb-datasource', + id: 'plutono-mongodb-datasource', description: 'MongoDB integration & data source', name: 'MongoDB', imgUrl: 'public/img/plugins/mongodb.svg', }), getPhantomPlugin({ - id: 'grafana-snowflake-datasource', + id: 'plutono-snowflake-datasource', description: 'Snowflake integration & data source', name: 'Snowflake', imgUrl: 'public/img/plugins/snowflake.svg', }), getPhantomPlugin({ - id: 'grafana-wavefront-datasource', + id: 'plutono-wavefront-datasource', description: 'Wavefront integration & data source', name: 'Wavefront', imgUrl: 'public/img/plugins/wavefront.svg', @@ -159,16 +159,16 @@ function getEnterprisePhantomPlugins(): DataSourcePluginMeta[] { ]; } -function getGrafanaCloudPhantomPlugin(): DataSourcePluginMeta { +function getPlutonoCloudPhantomPlugin(): DataSourcePluginMeta { return { id: 'gcloud', - name: 'Grafana Cloud', + name: 'Plutono Cloud', type: PluginType.datasource, module: 'phantom', baseUrl: '', info: { description: 'Hosted Graphite, Prometheus and Loki', - logos: { small: 'public/img/grafana_icon.svg', large: 'asd' }, + logos: { small: 'public/img/plutono_icon.svg', large: 'asd' }, author: { name: 'Grafana Labs' }, links: [ { diff --git a/public/app/features/datasources/state/navModel.ts b/public/app/features/datasources/state/navModel.ts index 479d7a6968..bf66d190df 100644 --- a/public/app/features/datasources/state/navModel.ts +++ b/public/app/features/datasources/state/navModel.ts @@ -1,4 +1,4 @@ -import { DataSourceSettings, PluginType, PluginInclude, NavModel, NavModelItem } from '@grafana/data'; +import { DataSourceSettings, PluginType, PluginInclude, NavModel, NavModelItem } from '@credativ/plutono-data'; import config from 'app/core/config'; import { GenericDataSourcePlugin } from '../settings/PluginSettings'; diff --git a/public/app/features/datasources/state/reducers.test.ts b/public/app/features/datasources/state/reducers.test.ts index 3f8094a8aa..e441938b5d 100644 --- a/public/app/features/datasources/state/reducers.test.ts +++ b/public/app/features/datasources/state/reducers.test.ts @@ -20,7 +20,7 @@ import { import { getMockDataSource, getMockDataSources } from '../__mocks__/dataSourcesMocks'; import { LayoutModes } from 'app/core/components/LayoutSelector/LayoutSelector'; import { DataSourceSettingsState, DataSourcesState } from 'app/types'; -import { PluginMeta, PluginMetaInfo, PluginType } from '@grafana/data'; +import { PluginMeta, PluginMetaInfo, PluginType } from '@credativ/plutono-data'; import { GenericDataSourcePlugin } from '../settings/PluginSettings'; const mockPlugin = () => diff --git a/public/app/features/datasources/state/reducers.ts b/public/app/features/datasources/state/reducers.ts index 191f6f84d2..8240440be6 100644 --- a/public/app/features/datasources/state/reducers.ts +++ b/public/app/features/datasources/state/reducers.ts @@ -1,5 +1,5 @@ import { AnyAction, createAction } from '@reduxjs/toolkit'; -import { DataSourcePluginMeta, DataSourceSettings } from '@grafana/data'; +import { DataSourcePluginMeta, DataSourceSettings } from '@credativ/plutono-data'; import { DataSourcesState, DataSourceSettingsState } from 'app/types'; import { LayoutMode, LayoutModes } from 'app/core/components/LayoutSelector/LayoutSelector'; diff --git a/public/app/features/datasources/state/selectors.ts b/public/app/features/datasources/state/selectors.ts index d8f7165e65..55ba5f56d2 100644 --- a/public/app/features/datasources/state/selectors.ts +++ b/public/app/features/datasources/state/selectors.ts @@ -1,4 +1,4 @@ -import { DataSourcePluginMeta, DataSourceSettings, UrlQueryValue } from '@grafana/data'; +import { DataSourcePluginMeta, DataSourceSettings, UrlQueryValue } from '@credativ/plutono-data'; import { DataSourcesState } from '../../../types/datasources'; export const getDataSources = (state: DataSourcesState) => { diff --git a/public/app/features/explore/AdHocFilter.tsx b/public/app/features/explore/AdHocFilter.tsx index 79435bb2a2..37404240d2 100644 --- a/public/app/features/explore/AdHocFilter.tsx +++ b/public/app/features/explore/AdHocFilter.tsx @@ -1,10 +1,10 @@ import React, { useContext } from 'react'; -import { LegacyForms, ThemeContext } from '@grafana/ui'; +import { LegacyForms, ThemeContext } from '@credativ/plutono-ui'; const { Select } = LegacyForms; import { css, cx } from 'emotion'; -import { GrafanaTheme, SelectableValue } from '@grafana/data'; +import { PlutonoTheme, SelectableValue } from '@credativ/plutono-data'; -const getStyles = (theme: GrafanaTheme) => ({ +const getStyles = (theme: PlutonoTheme) => ({ keyValueContainer: css` label: key-value-container; display: flex; diff --git a/public/app/features/explore/AdHocFilterField.test.tsx b/public/app/features/explore/AdHocFilterField.test.tsx index 82bf73bcda..a51364cdb9 100644 --- a/public/app/features/explore/AdHocFilterField.test.tsx +++ b/public/app/features/explore/AdHocFilterField.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount, shallow } from 'enzyme'; -import { DataSourceApi } from '@grafana/data'; +import { DataSourceApi } from '@credativ/plutono-data'; import { AdHocFilterField, DEFAULT_REMOVE_FILTER_VALUE, KeyValuePair, Props } from './AdHocFilterField'; import { AdHocFilter } from './AdHocFilter'; diff --git a/public/app/features/explore/AdHocFilterField.tsx b/public/app/features/explore/AdHocFilterField.tsx index 5ef1a90cec..32b6896245 100644 --- a/public/app/features/explore/AdHocFilterField.tsx +++ b/public/app/features/explore/AdHocFilterField.tsx @@ -1,7 +1,7 @@ import React from 'react'; import _ from 'lodash'; -import { DataSourceApi, DataQuery, DataSourceJsonData } from '@grafana/data'; -import { Icon } from '@grafana/ui'; +import { DataSourceApi, DataQuery, DataSourceJsonData } from '@credativ/plutono-data'; +import { Icon } from '@credativ/plutono-ui'; import { AdHocFilter } from './AdHocFilter'; export const DEFAULT_REMOVE_FILTER_VALUE = '-- remove filter --'; diff --git a/public/app/features/explore/ErrorContainer.test.tsx b/public/app/features/explore/ErrorContainer.test.tsx index 3210362aa7..42585470e6 100644 --- a/public/app/features/explore/ErrorContainer.test.tsx +++ b/public/app/features/explore/ErrorContainer.test.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { DataQueryError } from '@grafana/data'; +import { DataQueryError } from '@credativ/plutono-data'; import { shallow } from 'enzyme'; import { ErrorContainer } from './ErrorContainer'; diff --git a/public/app/features/explore/ErrorContainer.tsx b/public/app/features/explore/ErrorContainer.tsx index 332ef98cb3..b3232f63ef 100644 --- a/public/app/features/explore/ErrorContainer.tsx +++ b/public/app/features/explore/ErrorContainer.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from 'react'; -import { DataQueryError } from '@grafana/data'; -import { Icon } from '@grafana/ui'; +import { DataQueryError } from '@credativ/plutono-data'; +import { Icon } from '@credativ/plutono-ui'; import { FadeIn } from 'app/core/components/Animations/FadeIn'; export interface ErrorContainerProps { diff --git a/public/app/features/explore/Explore.test.tsx b/public/app/features/explore/Explore.test.tsx index 921127e870..22ec8aece4 100644 --- a/public/app/features/explore/Explore.test.tsx +++ b/public/app/features/explore/Explore.test.tsx @@ -1,12 +1,12 @@ import React from 'react'; -import { DataSourceApi, LoadingState, toUtc, DataQueryError, DataQueryRequest, CoreApp } from '@grafana/data'; +import { DataSourceApi, LoadingState, toUtc, DataQueryError, DataQueryRequest, CoreApp } from '@credativ/plutono-data'; import { getFirstNonQueryRowSpecificError } from 'app/core/utils/explore'; import { ExploreId } from 'app/types/explore'; import { shallow } from 'enzyme'; import { Explore, ExploreProps } from './Explore'; import { scanStopAction } from './state/query'; import { SecondaryActions } from './SecondaryActions'; -import { getTheme } from '@grafana/ui'; +import { getTheme } from '@credativ/plutono-ui'; const dummyProps: ExploreProps = { changeSize: jest.fn(), diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx index 5f42faa061..3fa78134c6 100644 --- a/public/app/features/explore/Explore.tsx +++ b/public/app/features/explore/Explore.tsx @@ -5,20 +5,20 @@ import { compose } from 'redux'; import { connect } from 'react-redux'; import AutoSizer from 'react-virtualized-auto-sizer'; import memoizeOne from 'memoize-one'; -import { selectors } from '@grafana/e2e-selectors'; -import { ErrorBoundaryAlert, stylesFactory, withTheme } from '@grafana/ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; +import { ErrorBoundaryAlert, stylesFactory, withTheme } from '@credativ/plutono-ui'; import { AbsoluteTimeRange, DataQuery, DataSourceApi, - GrafanaTheme, + PlutonoTheme, LoadingState, PanelData, RawTimeRange, TimeZone, LogsModel, DataFrame, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import LogsContainer from './LogsContainer'; import QueryRows from './QueryRows'; @@ -39,11 +39,11 @@ import { ErrorContainer } from './ErrorContainer'; //TODO:unification import { TraceView } from './TraceView/TraceView'; import { SecondaryActions } from './SecondaryActions'; -import { FILTER_FOR_OPERATOR, FILTER_OUT_OPERATOR, FilterItem } from '@grafana/ui/src/components/Table/types'; +import { FILTER_FOR_OPERATOR, FILTER_OUT_OPERATOR, FilterItem } from '@credativ/plutono-ui/src/components/Table/types'; import { ExploreGraphNGPanel } from './ExploreGraphNGPanel'; import { NodeGraphContainer } from './NodeGraphContainer'; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { exploreMain: css` label: exploreMain; @@ -88,7 +88,7 @@ export interface ExploreProps { queryResponse: PanelData; originPanelId: number; addQueryRow: typeof addQueryRow; - theme: GrafanaTheme; + theme: PlutonoTheme; loading: boolean; showMetrics: boolean; showTable: boolean; diff --git a/public/app/features/explore/ExploreDrawer.tsx b/public/app/features/explore/ExploreDrawer.tsx index ff7ace22d6..e4823befd6 100644 --- a/public/app/features/explore/ExploreDrawer.tsx +++ b/public/app/features/explore/ExploreDrawer.tsx @@ -4,10 +4,10 @@ import { Resizable, ResizeCallback } from 're-resizable'; import { css, cx, keyframes } from 'emotion'; // Services & Utils -import { stylesFactory, useTheme } from '@grafana/ui'; +import { stylesFactory, useTheme } from '@credativ/plutono-ui'; // Types -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; const drawerSlide = keyframes` 0% { @@ -19,7 +19,7 @@ const drawerSlide = keyframes` } `; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { const shadowColor = theme.isLight ? theme.palette.gray4 : theme.palette.black; return { diff --git a/public/app/features/explore/ExploreGraphNGPanel.tsx b/public/app/features/explore/ExploreGraphNGPanel.tsx index b57c565dbe..5c4c319920 100644 --- a/public/app/features/explore/ExploreGraphNGPanel.tsx +++ b/public/app/features/explore/ExploreGraphNGPanel.tsx @@ -7,9 +7,9 @@ import { Field, FieldColorModeId, FieldConfigSource, - GrafanaTheme, + PlutonoTheme, TimeZone, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { Collapse, DrawStyle, @@ -21,7 +21,7 @@ import { useStyles, useTheme, ZoomPlugin, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; import { defaultGraphConfig, getGraphFieldConfig } from 'app/plugins/panel/timeseries/config'; import { hideSeriesConfigFactory } from 'app/plugins/panel/timeseries/overrides/hideSeriesConfigFactory'; import { ContextMenuPlugin } from 'app/plugins/panel/timeseries/plugins/ContextMenuPlugin'; @@ -138,7 +138,7 @@ export function ExploreGraphNGPanel({ ); } -const getStyles = (theme: GrafanaTheme) => ({ +const getStyles = (theme: PlutonoTheme) => ({ timeSeriesDisclaimer: css` label: time-series-disclaimer; width: 300px; diff --git a/public/app/features/explore/ExploreGraphPanel.tsx b/public/app/features/explore/ExploreGraphPanel.tsx index 4b1c2f991a..ba82857135 100644 --- a/public/app/features/explore/ExploreGraphPanel.tsx +++ b/public/app/features/explore/ExploreGraphPanel.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { css, cx } from 'emotion'; -import { GrafanaTheme, TimeZone, AbsoluteTimeRange, GraphSeriesXY, dateTime } from '@grafana/data'; +import { PlutonoTheme, TimeZone, AbsoluteTimeRange, GraphSeriesXY, dateTime } from '@credativ/plutono-data'; import { selectThemeVariant, @@ -13,11 +13,11 @@ import { GraphSeriesTogglerAPI, Chart, Icon, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; const MAX_NUMBER_OF_TIME_SERIES = 20; -const getStyles = (theme: GrafanaTheme) => ({ +const getStyles = (theme: PlutonoTheme) => ({ timeSeriesDisclaimer: css` label: time-series-disclaimer; width: 300px; diff --git a/public/app/features/explore/ExplorePaneContainer.tsx b/public/app/features/explore/ExplorePaneContainer.tsx index 1470ff0e4d..e18c883180 100644 --- a/public/app/features/explore/ExplorePaneContainer.tsx +++ b/public/app/features/explore/ExplorePaneContainer.tsx @@ -3,9 +3,9 @@ import { hot } from 'react-hot-loader'; import { compose } from 'redux'; import { connect, ConnectedProps } from 'react-redux'; import memoizeOne from 'memoize-one'; -import { withTheme } from '@grafana/ui'; -import { DataQuery, ExploreUrlState, EventBusExtended, EventBusSrv } from '@grafana/data'; -import { selectors } from '@grafana/e2e-selectors'; +import { withTheme } from '@credativ/plutono-ui'; +import { DataQuery, ExploreUrlState, EventBusExtended, EventBusSrv } from '@credativ/plutono-data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import store from 'app/core/store'; import { lastSavedUrl, cleanupPaneAction } from './state/main'; import { initializeExplore, refreshExplore } from './state/explorePane'; diff --git a/public/app/features/explore/ExploreQueryInspector.test.tsx b/public/app/features/explore/ExploreQueryInspector.test.tsx index 1ef51b26c0..f80936cedd 100644 --- a/public/app/features/explore/ExploreQueryInspector.test.tsx +++ b/public/app/features/explore/ExploreQueryInspector.test.tsx @@ -1,7 +1,7 @@ import React, { ComponentProps } from 'react'; import { Observable } from 'rxjs'; import { render, screen, fireEvent } from '@testing-library/react'; -import { TimeRange, LoadingState } from '@grafana/data'; +import { TimeRange, LoadingState } from '@credativ/plutono-data'; import { ExploreId } from 'app/types'; import { ExploreQueryInspector } from './ExploreQueryInspector'; diff --git a/public/app/features/explore/ExploreQueryInspector.tsx b/public/app/features/explore/ExploreQueryInspector.tsx index c9412a4f07..33b6d5e659 100644 --- a/public/app/features/explore/ExploreQueryInspector.tsx +++ b/public/app/features/explore/ExploreQueryInspector.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { TabbedContainer, TabConfig } from '@grafana/ui'; -import { PanelData, TimeZone } from '@grafana/data'; +import { TabbedContainer, TabConfig } from '@credativ/plutono-ui'; +import { PanelData, TimeZone } from '@credativ/plutono-data'; import { runQueries } from './state/query'; import { StoreState, ExploreItemState, ExploreId } from 'app/types'; import { hot } from 'react-hot-loader'; diff --git a/public/app/features/explore/ExploreTimeControls.tsx b/public/app/features/explore/ExploreTimeControls.tsx index b20f42f490..00875d0508 100644 --- a/public/app/features/explore/ExploreTimeControls.tsx +++ b/public/app/features/explore/ExploreTimeControls.tsx @@ -3,7 +3,7 @@ import React, { Component } from 'react'; // Types import { ExploreId } from 'app/types'; -import { TimeRange, TimeZone, RawTimeRange, dateTimeForTimeZone, dateMath } from '@grafana/data'; +import { TimeRange, TimeZone, RawTimeRange, dateTimeForTimeZone, dateMath } from '@credativ/plutono-data'; // State diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx index c57ffeda9f..e183c5651a 100644 --- a/public/app/features/explore/ExploreToolbar.tsx +++ b/public/app/features/explore/ExploreToolbar.tsx @@ -5,8 +5,8 @@ import classNames from 'classnames'; import { css } from 'emotion'; import { ExploreId, ExploreItemState } from 'app/types/explore'; -import { Icon, IconButton, SetInterval, ToolbarButton, ToolbarButtonRow, Tooltip } from '@grafana/ui'; -import { DataSourceInstanceSettings, RawTimeRange, TimeRange, TimeZone } from '@grafana/data'; +import { Icon, IconButton, SetInterval, ToolbarButton, ToolbarButtonRow, Tooltip } from '@credativ/plutono-ui'; +import { DataSourceInstanceSettings, RawTimeRange, TimeRange, TimeZone } from '@credativ/plutono-data'; import { DataSourcePicker } from 'app/core/components/Select/DataSourcePicker'; import { StoreState } from 'app/types/store'; import { createAndCopyShortLink } from 'app/core/utils/shortLinks'; diff --git a/public/app/features/explore/LiveLogs.test.tsx b/public/app/features/explore/LiveLogs.test.tsx index 7690d59f54..d792d86750 100644 --- a/public/app/features/explore/LiveLogs.test.tsx +++ b/public/app/features/explore/LiveLogs.test.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { LogLevel, LogRowModel, MutableDataFrame } from '@grafana/data'; +import { LogLevel, LogRowModel, MutableDataFrame } from '@credativ/plutono-data'; import { mount } from 'enzyme'; import { LiveLogsWithTheme } from './LiveLogs'; diff --git a/public/app/features/explore/LiveLogs.tsx b/public/app/features/explore/LiveLogs.tsx index cff88f8557..c2fcaa1ac4 100644 --- a/public/app/features/explore/LiveLogs.tsx +++ b/public/app/features/explore/LiveLogs.tsx @@ -2,12 +2,12 @@ import React, { PureComponent } from 'react'; import { css, cx } from 'emotion'; import tinycolor from 'tinycolor2'; -import { LogMessageAnsi, Themeable, withTheme, getLogRowStyles, Icon } from '@grafana/ui'; -import { GrafanaTheme, LogRowModel, TimeZone, dateTimeFormat } from '@grafana/data'; +import { LogMessageAnsi, Themeable, withTheme, getLogRowStyles, Icon } from '@credativ/plutono-ui'; +import { PlutonoTheme, LogRowModel, TimeZone, dateTimeFormat } from '@credativ/plutono-data'; import { ElapsedTime } from './ElapsedTime'; -const getStyles = (theme: GrafanaTheme) => ({ +const getStyles = (theme: PlutonoTheme) => ({ logsRowsLive: css` label: logs-rows-live; font-family: ${theme.typography.fontFamily.monospace}; diff --git a/public/app/features/explore/LiveTailButton.tsx b/public/app/features/explore/LiveTailButton.tsx index 380327667f..0da11be89f 100644 --- a/public/app/features/explore/LiveTailButton.tsx +++ b/public/app/features/explore/LiveTailButton.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { css } from 'emotion'; import { CSSTransition } from 'react-transition-group'; -import { useTheme, Tooltip, stylesFactory, ButtonGroup, ToolbarButton } from '@grafana/ui'; -import { GrafanaTheme } from '@grafana/data'; +import { useTheme, Tooltip, stylesFactory, ButtonGroup, ToolbarButton } from '@credativ/plutono-ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; type LiveTailButtonProps = { splitted: boolean; @@ -57,7 +57,7 @@ export function LiveTailButton(props: LiveTailButtonProps) { ); } -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { stopButtonEnter: css` label: stopButtonEnter; diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx index ca43bf0223..f24a41b43b 100644 --- a/public/app/features/explore/Logs.tsx +++ b/public/app/features/explore/Logs.tsx @@ -18,8 +18,8 @@ import { GraphSeriesXY, LinkModel, Field, - GrafanaTheme, -} from '@grafana/data'; + PlutonoTheme, +} from '@credativ/plutono-data'; import { LogLabels, RadioButtonGroup, @@ -32,17 +32,17 @@ import { stylesFactory, Icon, Tooltip, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; import store from 'app/core/store'; import { ExploreGraphPanel } from './ExploreGraphPanel'; import { MetaInfoText } from './MetaInfoText'; -import { RowContextOptions } from '@grafana/ui/src/components/Logs/LogRowContextProvider'; -import { MAX_CHARACTERS } from '@grafana/ui/src/components/Logs/LogRowMessage'; +import { RowContextOptions } from '@credativ/plutono-ui/src/components/Logs/LogRowContextProvider'; +import { MAX_CHARACTERS } from '@credativ/plutono-ui/src/components/Logs/LogRowMessage'; const SETTINGS_KEYS = { - showLabels: 'grafana.explore.logs.showLabels', - showTime: 'grafana.explore.logs.showTime', - wrapLogMessage: 'grafana.explore.logs.wrapLogMessage', + showLabels: 'plutono.explore.logs.showLabels', + showTime: 'plutono.explore.logs.showTime', + wrapLogMessage: 'plutono.explore.logs.wrapLogMessage', }; function renderMetaItem(value: any, kind: LogsMetaKind) { @@ -65,7 +65,7 @@ interface Props { dedupedRows?: LogRowModel[]; visibleRange?: AbsoluteTimeRange; width: number; - theme: GrafanaTheme; + theme: PlutonoTheme; highlighterExpressions?: string[]; loading: boolean; absoluteRange: AbsoluteTimeRange; @@ -436,7 +436,7 @@ export class UnthemedLogs extends PureComponent { export const Logs = withTheme(UnthemedLogs); -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { noData: css` > * { diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx index 79295872b6..9b68364669 100644 --- a/public/app/features/explore/LogsContainer.tsx +++ b/public/app/features/explore/LogsContainer.tsx @@ -1,9 +1,9 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect, ConnectedProps } from 'react-redux'; -import { Collapse } from '@grafana/ui'; +import { Collapse } from '@credativ/plutono-ui'; -import { AbsoluteTimeRange, Field, LogLevel, LogRowModel, LogsDedupStrategy, RawTimeRange } from '@grafana/data'; +import { AbsoluteTimeRange, Field, LogLevel, LogRowModel, LogsDedupStrategy, RawTimeRange } from '@credativ/plutono-data'; import { ExploreId, ExploreItemState } from 'app/types/explore'; import { StoreState } from 'app/types'; diff --git a/public/app/features/explore/MetaInfoText.tsx b/public/app/features/explore/MetaInfoText.tsx index 9d3fff1964..41c21fa977 100644 --- a/public/app/features/explore/MetaInfoText.tsx +++ b/public/app/features/explore/MetaInfoText.tsx @@ -1,9 +1,9 @@ import React, { memo, useContext } from 'react'; import { css } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; -import { stylesFactory, ThemeContext } from '@grafana/ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { stylesFactory, ThemeContext } from '@credativ/plutono-ui'; -const getStyles = stylesFactory((theme: GrafanaTheme) => ({ +const getStyles = stylesFactory((theme: PlutonoTheme) => ({ metaContainer: css` flex: 1; color: ${theme.colors.textWeak}; diff --git a/public/app/features/explore/NoDataSourceCallToAction.tsx b/public/app/features/explore/NoDataSourceCallToAction.tsx index cd7aaccaca..e91a593504 100644 --- a/public/app/features/explore/NoDataSourceCallToAction.tsx +++ b/public/app/features/explore/NoDataSourceCallToAction.tsx @@ -1,6 +1,6 @@ import React, { useContext } from 'react'; import { css } from 'emotion'; -import { ThemeContext, LinkButton, CallToActionCard, Icon } from '@grafana/ui'; +import { ThemeContext, LinkButton, CallToActionCard, Icon } from '@credativ/plutono-ui'; export const NoDataSourceCallToAction = () => { const theme = useContext(ThemeContext); @@ -12,7 +12,7 @@ export const NoDataSourceCallToAction = () => { <> ProTip: You can also define data sources through configuration files. { const props: QueryRowProps = { diff --git a/public/app/features/explore/QueryRow.tsx b/public/app/features/explore/QueryRow.tsx index 1ef490558b..7cbf61d72a 100644 --- a/public/app/features/explore/QueryRow.tsx +++ b/public/app/features/explore/QueryRow.tsx @@ -19,8 +19,8 @@ import { AbsoluteTimeRange, LoadingState, EventBusExtended, -} from '@grafana/data'; -import { selectors } from '@grafana/e2e-selectors'; +} from '@credativ/plutono-data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { ExploreItemState, ExploreId } from 'app/types/explore'; import { highlightLogsExpressionAction } from './state/explorePane'; diff --git a/public/app/features/explore/QueryRowActions.tsx b/public/app/features/explore/QueryRowActions.tsx index 26f5797040..f055583ac4 100644 --- a/public/app/features/explore/QueryRowActions.tsx +++ b/public/app/features/explore/QueryRowActions.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Icon } from '@grafana/ui'; +import { Icon } from '@credativ/plutono-ui'; function formatLatency(value: number) { return `${(value / 1000).toFixed(1)}s`; diff --git a/public/app/features/explore/QueryStatus.test.tsx b/public/app/features/explore/QueryStatus.test.tsx index ecfc962e0f..59be787dc5 100644 --- a/public/app/features/explore/QueryStatus.test.tsx +++ b/public/app/features/explore/QueryStatus.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { LoadingState, TimeRange, PanelData } from '@grafana/data'; +import { LoadingState, TimeRange, PanelData } from '@credativ/plutono-data'; import QueryStatus from './QueryStatus'; diff --git a/public/app/features/explore/QueryStatus.tsx b/public/app/features/explore/QueryStatus.tsx index 4ff6e845d1..cba59d0ffa 100644 --- a/public/app/features/explore/QueryStatus.tsx +++ b/public/app/features/explore/QueryStatus.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import { ElapsedTime } from './ElapsedTime'; -import { PanelData, LoadingState } from '@grafana/data'; +import { PanelData, LoadingState } from '@credativ/plutono-data'; function formatLatency(value: number) { return `${(value / 1000).toFixed(1)}s`; diff --git a/public/app/features/explore/ReturnToDashboardButton.tsx b/public/app/features/explore/ReturnToDashboardButton.tsx index 3d21a8ceca..ba1ba6efa8 100644 --- a/public/app/features/explore/ReturnToDashboardButton.tsx +++ b/public/app/features/explore/ReturnToDashboardButton.tsx @@ -1,8 +1,8 @@ import React, { FC } from 'react'; import { connect } from 'react-redux'; import { hot } from 'react-hot-loader'; -import { Icon, Tooltip, ButtonSelect, ToolbarButton, ButtonGroup } from '@grafana/ui'; -import { DataQuery } from '@grafana/data'; +import { Icon, Tooltip, ButtonSelect, ToolbarButton, ButtonGroup } from '@credativ/plutono-ui'; +import { DataQuery } from '@credativ/plutono-data'; import kbn from '../../core/utils/kbn'; import { getDashboardSrv } from '../dashboard/services/DashboardSrv'; diff --git a/public/app/features/explore/RichHistory/RichHistory.test.tsx b/public/app/features/explore/RichHistory/RichHistory.test.tsx index 92ea6b4953..7bff65b077 100644 --- a/public/app/features/explore/RichHistory/RichHistory.test.tsx +++ b/public/app/features/explore/RichHistory/RichHistory.test.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { mount } from 'enzyme'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { ExploreId } from '../../../types/explore'; import { RichHistory, RichHistoryProps, Tabs } from './RichHistory'; -import { Tab } from '@grafana/ui'; +import { Tab } from '@credativ/plutono-ui'; jest.mock('../state/selectors', () => ({ getExploreDatasources: jest.fn() })); const setup = (propOverrides?: Partial) => { const props: RichHistoryProps = { - theme: {} as GrafanaTheme, + theme: {} as PlutonoTheme, exploreId: ExploreId.left, height: 100, activeDatasourceInstance: 'Test datasource', diff --git a/public/app/features/explore/RichHistory/RichHistory.tsx b/public/app/features/explore/RichHistory/RichHistory.tsx index f277cd90e0..12b756c80d 100644 --- a/public/app/features/explore/RichHistory/RichHistory.tsx +++ b/public/app/features/explore/RichHistory/RichHistory.tsx @@ -3,11 +3,11 @@ import React, { PureComponent } from 'react'; //Services & Utils import { RICH_HISTORY_SETTING_KEYS, SortOrder } from 'app/core/utils/richHistory'; import store from 'app/core/store'; -import { Themeable, withTheme, TabbedContainer, TabConfig } from '@grafana/ui'; +import { Themeable, withTheme, TabbedContainer, TabConfig } from '@credativ/plutono-ui'; //Types import { RichHistoryQuery, ExploreId } from 'app/types/explore'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; //Components import { RichHistorySettings } from './RichHistorySettings'; diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx index 212408f3e3..e80fa80e20 100644 --- a/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx +++ b/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { RichHistoryCard, Props } from './RichHistoryCard'; import { ExploreId } from '../../../types/explore'; -import { DataSourceApi, DataQuery } from '@grafana/data'; +import { DataSourceApi, DataQuery } from '@credativ/plutono-data'; const setup = (propOverrides?: Partial) => { const props: Props = { diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.tsx index ad4d080aee..22a62d6256 100644 --- a/public/app/features/explore/RichHistory/RichHistoryCard.tsx +++ b/public/app/features/explore/RichHistory/RichHistoryCard.tsx @@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react'; import { connect } from 'react-redux'; import { hot } from 'react-hot-loader'; import { css, cx } from 'emotion'; -import { stylesFactory, useTheme, TextArea, Button, IconButton } from '@grafana/ui'; -import { getDataSourceSrv } from '@grafana/runtime'; -import { GrafanaTheme, AppEvents, DataSourceApi } from '@grafana/data'; +import { stylesFactory, useTheme, TextArea, Button, IconButton } from '@credativ/plutono-ui'; +import { getDataSourceSrv } from '@credativ/plutono-runtime'; +import { PlutonoTheme, AppEvents, DataSourceApi } from '@credativ/plutono-data'; import { RichHistoryQuery, ExploreId } from 'app/types/explore'; import { createUrlFromRichHistory, createQueryText } from 'app/core/utils/richHistory'; import { createAndCopyShortLink } from 'app/core/utils/shortLinks'; @@ -27,7 +27,7 @@ export interface Props { datasourceInstance: DataSourceApi; } -const getStyles = stylesFactory((theme: GrafanaTheme, isRemoved: boolean) => { +const getStyles = stylesFactory((theme: PlutonoTheme, isRemoved: boolean) => { /* Hard-coded value so all buttons and icons on right side of card are aligned */ const rigtColumnWidth = '240px'; const rigtColumnContentWidth = '170px'; diff --git a/public/app/features/explore/RichHistory/RichHistoryQueriesTab.test.tsx b/public/app/features/explore/RichHistory/RichHistoryQueriesTab.test.tsx index 3aad1c717e..f69665ef3f 100644 --- a/public/app/features/explore/RichHistory/RichHistoryQueriesTab.test.tsx +++ b/public/app/features/explore/RichHistory/RichHistoryQueriesTab.test.tsx @@ -3,7 +3,7 @@ import { mount } from 'enzyme'; import { ExploreId } from '../../../types/explore'; import { SortOrder } from 'app/core/utils/richHistory'; import { RichHistoryQueriesTab, Props } from './RichHistoryQueriesTab'; -import { RangeSlider } from '@grafana/ui'; +import { RangeSlider } from '@credativ/plutono-ui'; jest.mock('../state/selectors', () => ({ getExploreDatasources: jest.fn() })); diff --git a/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx b/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx index 59e5f3b09f..5a628312ce 100644 --- a/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx +++ b/public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx @@ -6,8 +6,8 @@ import { uniqBy, debounce } from 'lodash'; import { RichHistoryQuery, ExploreId } from 'app/types/explore'; // Utils -import { stylesFactory, useTheme, RangeSlider, Select } from '@grafana/ui'; -import { GrafanaTheme, SelectableValue } from '@grafana/data'; +import { stylesFactory, useTheme, RangeSlider, Select } from '@credativ/plutono-ui'; +import { PlutonoTheme, SelectableValue } from '@credativ/plutono-data'; import { SortOrder, @@ -34,7 +34,7 @@ export interface Props { onSelectDatasourceFilters: (value: SelectableValue[]) => void; } -const getStyles = stylesFactory((theme: GrafanaTheme, height: number) => { +const getStyles = stylesFactory((theme: PlutonoTheme, height: number) => { const bgColor = theme.isLight ? theme.palette.gray5 : theme.palette.dark4; /* 134px is based on the width of the Query history tabs bar, so the content is aligned to right side of the tab */ diff --git a/public/app/features/explore/RichHistory/RichHistorySettings.test.tsx b/public/app/features/explore/RichHistory/RichHistorySettings.test.tsx index 9b205049c5..de85420249 100644 --- a/public/app/features/explore/RichHistory/RichHistorySettings.test.tsx +++ b/public/app/features/explore/RichHistory/RichHistorySettings.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { mount } from 'enzyme'; import { RichHistorySettings, RichHistorySettingsProps } from './RichHistorySettings'; -import { Select, Switch } from '@grafana/ui'; +import { Select, Switch } from '@credativ/plutono-ui'; const setup = (propOverrides?: Partial) => { const props: RichHistorySettingsProps = { diff --git a/public/app/features/explore/RichHistory/RichHistorySettings.tsx b/public/app/features/explore/RichHistory/RichHistorySettings.tsx index 9d9a989e50..451b0df786 100644 --- a/public/app/features/explore/RichHistory/RichHistorySettings.tsx +++ b/public/app/features/explore/RichHistory/RichHistorySettings.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { css } from 'emotion'; -import { stylesFactory, useTheme, Select, Button, Switch, Field } from '@grafana/ui'; -import { GrafanaTheme, AppEvents } from '@grafana/data'; +import { stylesFactory, useTheme, Select, Button, Switch, Field } from '@credativ/plutono-ui'; +import { PlutonoTheme, AppEvents } from '@credativ/plutono-data'; import appEvents from 'app/core/app_events'; import { CoreEvents } from 'app/types'; @@ -15,7 +15,7 @@ export interface RichHistorySettingsProps { deleteRichHistory: () => void; } -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { container: css` padding-left: ${theme.spacing.sm}; @@ -75,7 +75,7 @@ export function RichHistorySettings(props: RichHistorySettingsProps) {
diff --git a/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx b/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx index fcf808470c..13e520422d 100644 --- a/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx +++ b/public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx @@ -6,8 +6,8 @@ import { uniqBy, debounce } from 'lodash'; import { RichHistoryQuery, ExploreId } from 'app/types/explore'; // Utils -import { stylesFactory, useTheme, Select } from '@grafana/ui'; -import { GrafanaTheme, SelectableValue } from '@grafana/data'; +import { stylesFactory, useTheme, Select } from '@credativ/plutono-ui'; +import { PlutonoTheme, SelectableValue } from '@credativ/plutono-data'; import { filterAndSortQueries, createDatasourcesList, SortOrder } from 'app/core/utils/richHistory'; // Components @@ -25,7 +25,7 @@ export interface Props { onSelectDatasourceFilters: (value: SelectableValue[]) => void; } -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { const bgColor = theme.isLight ? theme.palette.gray5 : theme.palette.dark4; return { container: css` diff --git a/public/app/features/explore/RunButton.test.tsx b/public/app/features/explore/RunButton.test.tsx index f4b879c731..3f07d5c53a 100644 --- a/public/app/features/explore/RunButton.test.tsx +++ b/public/app/features/explore/RunButton.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { RunButton, Props } from './RunButton'; -import { RefreshPicker } from '@grafana/ui'; +import { RefreshPicker } from '@credativ/plutono-ui'; import { shallow } from 'enzyme'; import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv'; diff --git a/public/app/features/explore/RunButton.tsx b/public/app/features/explore/RunButton.tsx index 25be71ae58..b0ab4eb8cf 100644 --- a/public/app/features/explore/RunButton.tsx +++ b/public/app/features/explore/RunButton.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { RefreshPicker, defaultIntervals } from '@grafana/ui'; +import { RefreshPicker, defaultIntervals } from '@credativ/plutono-ui'; import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv'; export type Props = { diff --git a/public/app/features/explore/SecondaryActions.tsx b/public/app/features/explore/SecondaryActions.tsx index fed4e1793e..b6391ec0ff 100644 --- a/public/app/features/explore/SecondaryActions.tsx +++ b/public/app/features/explore/SecondaryActions.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { css, cx } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; -import { stylesFactory, Button, HorizontalGroup, useTheme } from '@grafana/ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { stylesFactory, Button, HorizontalGroup, useTheme } from '@credativ/plutono-ui'; type Props = { addQueryRowButtonDisabled?: boolean; @@ -14,7 +14,7 @@ type Props = { onClickQueryInspectorButton: () => void; }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { containerMargin: css` margin-top: ${theme.spacing.md}; diff --git a/public/app/features/explore/TableContainer.test.tsx b/public/app/features/explore/TableContainer.test.tsx index e2ac1083f0..a9c6fe5e0c 100644 --- a/public/app/features/explore/TableContainer.test.tsx +++ b/public/app/features/explore/TableContainer.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { render, shallow } from 'enzyme'; import { TableContainer } from './TableContainer'; -import { DataFrame } from '@grafana/data'; +import { DataFrame } from '@credativ/plutono-data'; import { ExploreId } from 'app/types/explore'; describe('TableContainer', () => { diff --git a/public/app/features/explore/TableContainer.tsx b/public/app/features/explore/TableContainer.tsx index 042acc58f4..f5aab498ed 100644 --- a/public/app/features/explore/TableContainer.tsx +++ b/public/app/features/explore/TableContainer.tsx @@ -1,15 +1,15 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { DataFrame, TimeRange, ValueLinkConfig } from '@grafana/data'; -import { Collapse, Table } from '@grafana/ui'; +import { DataFrame, TimeRange, ValueLinkConfig } from '@credativ/plutono-data'; +import { Collapse, Table } from '@credativ/plutono-ui'; import { ExploreId, ExploreItemState } from 'app/types/explore'; import { StoreState } from 'app/types'; import { splitOpen } from './state/main'; import { config } from 'app/core/config'; import { PANEL_BORDER } from 'app/core/constants'; import { MetaInfoText } from './MetaInfoText'; -import { FilterItem } from '@grafana/ui/src/components/Table/types'; +import { FilterItem } from '@credativ/plutono-ui/src/components/Table/types'; import { getFieldLinksForExplore } from './utils/links'; interface TableContainerProps { diff --git a/public/app/features/explore/Time.tsx b/public/app/features/explore/Time.tsx index 01033176f9..4dbf1990b1 100644 --- a/public/app/features/explore/Time.tsx +++ b/public/app/features/explore/Time.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { toDuration } from '@grafana/data'; +import { toDuration } from '@credativ/plutono-data'; export interface TimeProps { timeInMs: number; diff --git a/public/app/features/explore/TimeSyncButton.tsx b/public/app/features/explore/TimeSyncButton.tsx index 87cfe5bc4f..28874807b8 100644 --- a/public/app/features/explore/TimeSyncButton.tsx +++ b/public/app/features/explore/TimeSyncButton.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Tooltip, ToolbarButton } from '@grafana/ui'; +import { Tooltip, ToolbarButton } from '@credativ/plutono-ui'; interface TimeSyncButtonProps { isSynced: boolean; diff --git a/public/app/features/explore/TraceView/TraceView.test.tsx b/public/app/features/explore/TraceView/TraceView.test.tsx index 1484fc2192..b806695138 100644 --- a/public/app/features/explore/TraceView/TraceView.test.tsx +++ b/public/app/features/explore/TraceView/TraceView.test.tsx @@ -3,10 +3,10 @@ import { shallow } from 'enzyme'; import { render, prettyDOM } from '@testing-library/react'; import { TraceView } from './TraceView'; import { TracePageHeader, TraceTimelineViewer } from '@jaegertracing/jaeger-ui-components'; -import { setDataSourceSrv } from '@grafana/runtime'; +import { setDataSourceSrv } from '@credativ/plutono-runtime'; import { ExploreId } from 'app/types'; import { TraceData, TraceSpanData } from '@jaegertracing/jaeger-ui-components/src/types/trace'; -import { MutableDataFrame } from '@grafana/data'; +import { MutableDataFrame } from '@credativ/plutono-data'; jest.mock('react-redux', () => ({ useSelector: jest.fn(() => undefined), diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx index 0696ab327e..2144e5b51e 100644 --- a/public/app/features/explore/TraceView/TraceView.tsx +++ b/public/app/features/explore/TraceView/TraceView.tsx @@ -21,8 +21,8 @@ import { useSearch } from './useSearch'; import { useChildrenState } from './useChildrenState'; import { useDetailState } from './useDetailState'; import { useHoverIndentGuide } from './useHoverIndentGuide'; -import { colors, useTheme } from '@grafana/ui'; -import { DataFrame, DataFrameView, TraceSpanRow } from '@grafana/data'; +import { colors, useTheme } from '@credativ/plutono-ui'; +import { DataFrame, DataFrameView, TraceSpanRow } from '@credativ/plutono-data'; import { createSpanLinkFactory } from './createSpanLink'; import { useSelector } from 'react-redux'; import { StoreState } from 'app/types'; diff --git a/public/app/features/explore/TraceView/createSpanLink.test.ts b/public/app/features/explore/TraceView/createSpanLink.test.ts index 2374e25286..9ef9ab1ff6 100644 --- a/public/app/features/explore/TraceView/createSpanLink.test.ts +++ b/public/app/features/explore/TraceView/createSpanLink.test.ts @@ -1,5 +1,5 @@ -import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data'; -import { setDataSourceSrv, setTemplateSrv } from '@grafana/runtime'; +import { DataSourceInstanceSettings, ScopedVars } from '@credativ/plutono-data'; +import { setDataSourceSrv, setTemplateSrv } from '@credativ/plutono-runtime'; import { createSpanLinkFactory } from './createSpanLink'; describe('createSpanLinkFactory', () => { diff --git a/public/app/features/explore/TraceView/createSpanLink.tsx b/public/app/features/explore/TraceView/createSpanLink.tsx index 882f029dc0..a1a2d6a78d 100644 --- a/public/app/features/explore/TraceView/createSpanLink.tsx +++ b/public/app/features/explore/TraceView/createSpanLink.tsx @@ -1,6 +1,6 @@ -import { DataLink, dateTime, Field, mapInternalLinkToExplore, TimeRange } from '@grafana/data'; -import { getTemplateSrv } from '@grafana/runtime'; -import { Icon } from '@grafana/ui'; +import { DataLink, dateTime, Field, mapInternalLinkToExplore, TimeRange } from '@credativ/plutono-data'; +import { getTemplateSrv } from '@credativ/plutono-runtime'; +import { Icon } from '@credativ/plutono-ui'; import { SplitOpen } from 'app/types/explore'; import { TraceToLogsOptions } from 'app/core/components/TraceToLogsSettings'; import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; diff --git a/public/app/features/explore/TraceView/uiElements.tsx b/public/app/features/explore/TraceView/uiElements.tsx index 264300154e..506efd20cf 100644 --- a/public/app/features/explore/TraceView/uiElements.tsx +++ b/public/app/features/explore/TraceView/uiElements.tsx @@ -1,13 +1,13 @@ -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { Button, Input, Popover, PopoverController, stylesFactory, - Tooltip as GrafanaTooltip, + Tooltip as PlutonoTooltip, useTheme, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; import { ButtonProps, Elements, PopoverProps, TooltipProps } from '@jaegertracing/jaeger-ui-components'; import cx from 'classnames'; import { css } from 'emotion'; @@ -50,7 +50,7 @@ export const UIElements: Elements = { ); }, Tooltip({ children, title }: TooltipProps) { - return {children}; + return {children}; }, Icon: (() => null as any) as any, Dropdown: (() => null as any) as any, @@ -76,7 +76,7 @@ export const UIElements: Elements = { }, }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { Divider: css` display: inline-block; diff --git a/public/app/features/explore/Wrapper.test.tsx b/public/app/features/explore/Wrapper.test.tsx index 30e2e298cd..b5d5dfb296 100644 --- a/public/app/features/explore/Wrapper.test.tsx +++ b/public/app/features/explore/Wrapper.test.tsx @@ -3,7 +3,7 @@ import { render, screen, fireEvent, waitFor } from '@testing-library/react'; import Wrapper from './Wrapper'; import { configureStore } from '../../store/configureStore'; import { Provider } from 'react-redux'; -import { setDataSourceSrv } from '@grafana/runtime'; +import { setDataSourceSrv } from '@credativ/plutono-runtime'; import { ArrayDataFrame, DataQueryResponse, @@ -12,8 +12,8 @@ import { FieldType, QueryEditorProps, ScopedVars, -} from '@grafana/data'; -import { selectors } from '@grafana/e2e-selectors'; +} from '@credativ/plutono-data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { setTimeSrv } from '../dashboard/services/TimeSrv'; import { from, Observable } from 'rxjs'; diff --git a/public/app/features/explore/Wrapper.tsx b/public/app/features/explore/Wrapper.tsx index 4925e04e8d..cfa1c2560e 100644 --- a/public/app/features/explore/Wrapper.tsx +++ b/public/app/features/explore/Wrapper.tsx @@ -5,7 +5,7 @@ import { connect } from 'react-redux'; import { StoreState } from 'app/types'; import { ExploreId } from 'app/types/explore'; -import { CustomScrollbar, ErrorBoundaryAlert } from '@grafana/ui'; +import { CustomScrollbar, ErrorBoundaryAlert } from '@credativ/plutono-ui'; import { lastSavedUrl, resetExploreAction, richHistoryUpdatedAction } from './state/main'; import { getRichHistory } from '../../core/utils/richHistory'; import { ExplorePaneContainer } from './ExplorePaneContainer'; diff --git a/public/app/features/explore/flotgraph/getGraphSeriesModel.ts b/public/app/features/explore/flotgraph/getGraphSeriesModel.ts index 0b47da7ce2..6d1760840f 100644 --- a/public/app/features/explore/flotgraph/getGraphSeriesModel.ts +++ b/public/app/features/explore/flotgraph/getGraphSeriesModel.ts @@ -1,4 +1,4 @@ -import { colors } from '@grafana/ui'; +import { colors } from '@credativ/plutono-ui'; import { getFlotPairs, getDisplayProcessor, @@ -17,7 +17,7 @@ import { FieldColorModeId, FieldConfigSource, getFieldDisplayName, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { config } from 'app/core/config'; import { SeriesOptions, GraphOptions, GraphLegendEditorLegendOptions } from './types'; diff --git a/public/app/features/explore/flotgraph/types.ts b/public/app/features/explore/flotgraph/types.ts index 5342158267..4f19ad5477 100644 --- a/public/app/features/explore/flotgraph/types.ts +++ b/public/app/features/explore/flotgraph/types.ts @@ -1,5 +1,5 @@ -import { GraphTooltipOptions, LegendDisplayMode, LegendPlacement } from '@grafana/ui'; -import { YAxis } from '@grafana/data'; +import { GraphTooltipOptions, LegendDisplayMode, LegendPlacement } from '@credativ/plutono-ui'; +import { YAxis } from '@credativ/plutono-data'; export interface SeriesOptions { color?: string; diff --git a/public/app/features/explore/state/datasource.test.ts b/public/app/features/explore/state/datasource.test.ts index 504a85bef1..951c82b368 100644 --- a/public/app/features/explore/state/datasource.test.ts +++ b/public/app/features/explore/state/datasource.test.ts @@ -1,6 +1,6 @@ import { updateDatasourceInstanceAction, datasourceReducer } from './datasource'; import { ExploreId, ExploreItemState } from 'app/types'; -import { DataQuery, DataSourceApi } from '@grafana/data'; +import { DataQuery, DataSourceApi } from '@credativ/plutono-data'; import { createEmptyQueryResponse } from './utils'; describe('Datasource reducer', () => { diff --git a/public/app/features/explore/state/datasource.ts b/public/app/features/explore/state/datasource.ts index e6256e8d10..5d7c662675 100644 --- a/public/app/features/explore/state/datasource.ts +++ b/public/app/features/explore/state/datasource.ts @@ -1,7 +1,7 @@ // Libraries import { AnyAction, createAction } from '@reduxjs/toolkit'; -import { RefreshPicker } from '@grafana/ui'; -import { DataSourceApi, HistoryItem } from '@grafana/data'; +import { RefreshPicker } from '@credativ/plutono-ui'; +import { DataSourceApi, HistoryItem } from '@credativ/plutono-data'; import { stopQueryState } from 'app/core/utils/explore'; import { ExploreItemState, ThunkResult } from 'app/types'; diff --git a/public/app/features/explore/state/explorePane.test.ts b/public/app/features/explore/state/explorePane.test.ts index 6b2d28e7f8..8e29a769b8 100644 --- a/public/app/features/explore/state/explorePane.test.ts +++ b/public/app/features/explore/state/explorePane.test.ts @@ -1,7 +1,7 @@ -import { DataQuery, DefaultTimeZone, EventBusExtended, serializeStateToUrlParam, toUtc } from '@grafana/data'; +import { DataQuery, DefaultTimeZone, EventBusExtended, serializeStateToUrlParam, toUtc } from '@credativ/plutono-data'; import { ExploreId } from 'app/types'; import { refreshExplore } from './explorePane'; -import { setDataSourceSrv } from '@grafana/runtime'; +import { setDataSourceSrv } from '@credativ/plutono-runtime'; import { configureStore } from '../../../store/configureStore'; import { of } from 'rxjs'; diff --git a/public/app/features/explore/state/explorePane.ts b/public/app/features/explore/state/explorePane.ts index 0db25a83fd..7bfa10a446 100644 --- a/public/app/features/explore/state/explorePane.ts +++ b/public/app/features/explore/state/explorePane.ts @@ -30,11 +30,11 @@ import { TimeRange, HistoryItem, DataSourceApi, -} from '@grafana/data'; +} from '@credativ/plutono-data'; // Types import { ThunkResult } from 'app/types'; import { getTimeZone } from 'app/features/profile/state/selectors'; -import { getDataSourceSrv } from '@grafana/runtime'; +import { getDataSourceSrv } from '@credativ/plutono-runtime'; import { getRichHistory } from '../../../core/utils/richHistory'; import { richHistoryUpdatedAction } from './main'; diff --git a/public/app/features/explore/state/history.ts b/public/app/features/explore/state/history.ts index ee57fd8a85..fe053f0c20 100644 --- a/public/app/features/explore/state/history.ts +++ b/public/app/features/explore/state/history.ts @@ -6,7 +6,7 @@ import { } from 'app/core/utils/richHistory'; import { ExploreId, ExploreItemState, ThunkResult } from 'app/types'; import { richHistoryUpdatedAction } from './main'; -import { HistoryItem } from '@grafana/data'; +import { HistoryItem } from '@credativ/plutono-data'; import { AnyAction, createAction } from '@reduxjs/toolkit'; // diff --git a/public/app/features/explore/state/main.test.ts b/public/app/features/explore/state/main.test.ts index e3ff1b1c1e..8aac8e81cd 100644 --- a/public/app/features/explore/state/main.test.ts +++ b/public/app/features/explore/state/main.test.ts @@ -1,4 +1,4 @@ -import { serializeStateToUrlParam } from '@grafana/data/src/utils/url'; +import { serializeStateToUrlParam } from '@credativ/plutono-data/src/utils/url'; import { exploreReducer, navigateToExplore, splitCloseAction } from './main'; import { thunkTester } from 'test/core/thunk/thunkTester'; import { PanelModel } from 'app/features/dashboard/state'; @@ -6,7 +6,7 @@ import { updateLocation } from '../../../core/actions'; import { MockDataSourceApi } from '../../../../test/mocks/datasource_srv'; import { ExploreId, ExploreItemState, ExploreState } from '../../../types'; import { reducerTester } from '../../../../test/core/redux/reducerTester'; -import { ExploreUrlState } from '@grafana/data'; +import { ExploreUrlState } from '@credativ/plutono-data'; const getNavigateToExploreContext = async (openInNewWindow?: (url: string) => void) => { const url = 'http://www.someurl.com'; diff --git a/public/app/features/explore/state/main.ts b/public/app/features/explore/state/main.ts index d8c8432432..c7a4aa9ff9 100644 --- a/public/app/features/explore/state/main.ts +++ b/public/app/features/explore/state/main.ts @@ -1,6 +1,6 @@ import { AnyAction } from 'redux'; -import { DataSourceSrv, getDataSourceSrv } from '@grafana/runtime'; -import { DataQuery, ExploreUrlState, serializeStateToUrlParam, TimeRange, UrlQueryMap } from '@grafana/data'; +import { DataSourceSrv, getDataSourceSrv } from '@credativ/plutono-runtime'; +import { DataQuery, ExploreUrlState, serializeStateToUrlParam, TimeRange, UrlQueryMap } from '@credativ/plutono-data'; import { GetExploreUrlArguments, stopQueryState } from 'app/core/utils/explore'; import { ExploreId, ExploreItemState, ExploreState } from 'app/types/explore'; diff --git a/public/app/features/explore/state/query.test.ts b/public/app/features/explore/state/query.test.ts index 02464c2189..4d7b27bdb7 100644 --- a/public/app/features/explore/state/query.test.ts +++ b/public/app/features/explore/state/query.test.ts @@ -10,7 +10,7 @@ import { } from './query'; import { ExploreId, ExploreItemState } from 'app/types'; import { interval, of } from 'rxjs'; -import { ArrayVector, DataQueryResponse, DefaultTimeZone, MutableDataFrame, RawTimeRange, toUtc } from '@grafana/data'; +import { ArrayVector, DataQueryResponse, DefaultTimeZone, MutableDataFrame, RawTimeRange, toUtc } from '@credativ/plutono-data'; import { thunkTester } from 'test/core/thunk/thunkTester'; import { makeExplorePaneState } from './utils'; import { reducerTester } from '../../../../test/core/redux/reducerTester'; diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts index fdf85d83fa..9e4999b4d0 100644 --- a/public/app/features/explore/state/query.ts +++ b/public/app/features/explore/state/query.ts @@ -9,7 +9,7 @@ import { PanelEvents, QueryFixAction, toLegacyResponseData, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { buildQueryTransaction, diff --git a/public/app/features/explore/state/selectors.test.ts b/public/app/features/explore/state/selectors.test.ts index 86527447cc..8e36e0a1c5 100644 --- a/public/app/features/explore/state/selectors.test.ts +++ b/public/app/features/explore/state/selectors.test.ts @@ -1,5 +1,5 @@ import { deduplicatedRowsSelector } from './selectors'; -import { LogLevel, LogsDedupStrategy } from '@grafana/data'; +import { LogLevel, LogsDedupStrategy } from '@credativ/plutono-data'; import { ExploreItemState } from 'app/types'; const state: any = { diff --git a/public/app/features/explore/state/time.test.ts b/public/app/features/explore/state/time.test.ts index 93aef3f4db..c31f803f3f 100644 --- a/public/app/features/explore/state/time.test.ts +++ b/public/app/features/explore/state/time.test.ts @@ -1,4 +1,4 @@ -import { dateTime, LoadingState } from '@grafana/data'; +import { dateTime, LoadingState } from '@credativ/plutono-data'; import { makeExplorePaneState } from './utils'; import { ExploreId, ExploreItemState } from 'app/types/explore'; diff --git a/public/app/features/explore/state/time.ts b/public/app/features/explore/state/time.ts index e3217008d9..448c621213 100644 --- a/public/app/features/explore/state/time.ts +++ b/public/app/features/explore/state/time.ts @@ -6,8 +6,8 @@ import { RawTimeRange, sortLogsResult, TimeRange, -} from '@grafana/data'; -import { RefreshPicker } from '@grafana/ui'; +} from '@credativ/plutono-data'; +import { RefreshPicker } from '@credativ/plutono-ui'; import { getTimeRange, refreshIntervalToSortOrder, stopQueryState } from 'app/core/utils/explore'; import { ExploreItemState, ThunkResult } from 'app/types'; diff --git a/public/app/features/explore/state/utils.ts b/public/app/features/explore/state/utils.ts index c7373f63b1..07416674d6 100644 --- a/public/app/features/explore/state/utils.ts +++ b/public/app/features/explore/state/utils.ts @@ -7,7 +7,7 @@ import { LoadingState, LogsDedupStrategy, PanelData, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { ExploreItemState } from 'app/types/explore'; import { getDatasourceSrv } from '../../plugins/datasource_srv'; @@ -81,7 +81,7 @@ export async function loadAndInitDatasource( } } - const historyKey = `grafana.explore.history.${instance.meta?.id}`; + const historyKey = `plutono.explore.history.${instance.meta?.id}`; const history = store.getObject(historyKey, []); // Save last-used datasource diff --git a/public/app/features/explore/useLiveTailControls.ts b/public/app/features/explore/useLiveTailControls.ts index b18bd8b840..4b3bd66cd0 100644 --- a/public/app/features/explore/useLiveTailControls.ts +++ b/public/app/features/explore/useLiveTailControls.ts @@ -1,6 +1,6 @@ import React, { useCallback } from 'react'; import { useDispatch } from 'react-redux'; -import { RefreshPicker } from '@grafana/ui'; +import { RefreshPicker } from '@credativ/plutono-ui'; import { changeRefreshInterval } from './state/time'; import { setPausedStateAction, runQueries } from './state/query'; diff --git a/public/app/features/explore/utils/decorators.test.ts b/public/app/features/explore/utils/decorators.test.ts index 088faa979d..602907aead 100644 --- a/public/app/features/explore/utils/decorators.test.ts +++ b/public/app/features/explore/utils/decorators.test.ts @@ -1,4 +1,4 @@ -jest.mock('@grafana/data/src/datetime/formatter', () => ({ +jest.mock('@credativ/plutono-data/src/datetime/formatter', () => ({ dateTimeFormat: () => 'format() jest mocked', dateTimeFormatTimeAgo: (ts: any) => 'fromNow() jest mocked', })); @@ -12,7 +12,7 @@ import { PanelData, TimeRange, toDataFrame, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { decorateWithFrameTypeMetadata, diff --git a/public/app/features/explore/utils/decorators.ts b/public/app/features/explore/utils/decorators.ts index a9bae4d572..7ee0563988 100644 --- a/public/app/features/explore/utils/decorators.ts +++ b/public/app/features/explore/utils/decorators.ts @@ -6,8 +6,8 @@ import { PanelData, sortLogsResult, standardTransformers, -} from '@grafana/data'; -import { config } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { config } from '@credativ/plutono-runtime'; import { groupBy } from 'lodash'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/public/app/features/explore/utils/links.test.ts b/public/app/features/explore/utils/links.test.ts index 30898671cc..f1b53aae25 100644 --- a/public/app/features/explore/utils/links.test.ts +++ b/public/app/features/explore/utils/links.test.ts @@ -8,7 +8,7 @@ import { InterpolateFunction, LinkModel, TimeRange, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { setLinkSrv } from '../../panel/panellinks/link_srv'; describe('getFieldLinksForExplore', () => { diff --git a/public/app/features/explore/utils/links.ts b/public/app/features/explore/utils/links.ts index 18ac3c1f03..c83f4c30ce 100644 --- a/public/app/features/explore/utils/links.ts +++ b/public/app/features/explore/utils/links.ts @@ -8,8 +8,8 @@ import { ScopedVars, DataFrame, getFieldDisplayValuesProxy, -} from '@grafana/data'; -import { config, getTemplateSrv } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { config, getTemplateSrv } from '@credativ/plutono-runtime'; import { SplitOpen } from 'app/types/explore'; import { getLinkSrv } from '../../panel/panellinks/link_srv'; diff --git a/public/app/features/explore/utils/time.ts b/public/app/features/explore/utils/time.ts index f2726ae141..e67c3d3267 100644 --- a/public/app/features/explore/utils/time.ts +++ b/public/app/features/explore/utils/time.ts @@ -1,4 +1,4 @@ -import { isDateTime, RawTimeRange, TimeRange } from '@grafana/data'; +import { isDateTime, RawTimeRange, TimeRange } from '@credativ/plutono-data'; export const toRawTimeRange = (range: TimeRange): RawTimeRange => { let from = range.raw.from; diff --git a/public/app/features/expressions/ExpressionDatasource.ts b/public/app/features/expressions/ExpressionDatasource.ts index d1dd83c10a..78785c52bc 100644 --- a/public/app/features/expressions/ExpressionDatasource.ts +++ b/public/app/features/expressions/ExpressionDatasource.ts @@ -1,7 +1,7 @@ -import { DataSourceInstanceSettings, DataSourcePluginMeta } from '@grafana/data'; +import { DataSourceInstanceSettings, DataSourcePluginMeta } from '@credativ/plutono-data'; import { ExpressionQuery, GELQueryType } from './types'; import { ExpressionQueryEditor } from './ExpressionQueryEditor'; -import { DataSourceWithBackend } from '@grafana/runtime'; +import { DataSourceWithBackend } from '@credativ/plutono-runtime'; /** * This is a singleton instance that just pretends to be a DataSource diff --git a/public/app/features/expressions/ExpressionQueryEditor.tsx b/public/app/features/expressions/ExpressionQueryEditor.tsx index 3111935c3f..da762edcf2 100644 --- a/public/app/features/expressions/ExpressionQueryEditor.tsx +++ b/public/app/features/expressions/ExpressionQueryEditor.tsx @@ -2,8 +2,8 @@ import React, { PureComponent, ChangeEvent } from 'react'; import { css } from 'emotion'; -import { InlineField, InlineFieldRow, Input, Select, TextArea } from '@grafana/ui'; -import { SelectableValue, ReducerID, QueryEditorProps } from '@grafana/data'; +import { InlineField, InlineFieldRow, Input, Select, TextArea } from '@credativ/plutono-ui'; +import { SelectableValue, ReducerID, QueryEditorProps } from '@credativ/plutono-data'; // Types import { ExpressionQuery, GELQueryType } from './types'; diff --git a/public/app/features/expressions/types.ts b/public/app/features/expressions/types.ts index dd36e27597..16732bc596 100644 --- a/public/app/features/expressions/types.ts +++ b/public/app/features/expressions/types.ts @@ -1,4 +1,4 @@ -import { DataQuery } from '@grafana/data'; +import { DataQuery } from '@credativ/plutono-data'; export enum GELQueryType { math = 'math', diff --git a/public/app/features/folders/FolderPermissions.tsx b/public/app/features/folders/FolderPermissions.tsx index f7f5105f9b..40373b2726 100644 --- a/public/app/features/folders/FolderPermissions.tsx +++ b/public/app/features/folders/FolderPermissions.tsx @@ -2,8 +2,8 @@ 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, Icon } from '@grafana/ui'; -import { NavModel } from '@grafana/data'; +import { Tooltip, Icon } from '@credativ/plutono-ui'; +import { NavModel } from '@credativ/plutono-data'; import { SlideDown } from 'app/core/components/Animations/SlideDown'; import { getNavModel } from 'app/core/selectors/navModel'; import { StoreState, FolderState } from 'app/types'; diff --git a/public/app/features/folders/FolderSettingsPage.test.tsx b/public/app/features/folders/FolderSettingsPage.test.tsx index 6f5fe5abb5..5d56944c80 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 { shallow } from 'enzyme'; -import { NavModel } from '@grafana/data'; +import { NavModel } from '@credativ/plutono-data'; import { mockToolkitActionCreator } from 'test/core/redux/mocks'; import { setFolderTitle } from './state/reducers'; diff --git a/public/app/features/folders/FolderSettingsPage.tsx b/public/app/features/folders/FolderSettingsPage.tsx index bbcb360f41..7b98c2302d 100644 --- a/public/app/features/folders/FolderSettingsPage.tsx +++ b/public/app/features/folders/FolderSettingsPage.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { NavModel } from '@grafana/data'; -import { LegacyForms } from '@grafana/ui'; +import { NavModel } from '@credativ/plutono-data'; +import { LegacyForms } from '@credativ/plutono-ui'; const { Input } = LegacyForms; import Page from 'app/core/components/Page/Page'; import appEvents from 'app/core/app_events'; diff --git a/public/app/features/folders/components/NewDashboardsFolder.tsx b/public/app/features/folders/components/NewDashboardsFolder.tsx index c8cc39787a..ff8b903d7d 100644 --- a/public/app/features/folders/components/NewDashboardsFolder.tsx +++ b/public/app/features/folders/components/NewDashboardsFolder.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import { connect, MapDispatchToProps, MapStateToProps } from 'react-redux'; -import { NavModel } from '@grafana/data'; -import { Button, Input, Form, Field } from '@grafana/ui'; +import { NavModel } from '@credativ/plutono-data'; +import { Button, Input, Form, Field } from '@credativ/plutono-ui'; import Page from 'app/core/components/Page/Page'; import { createNewFolder } from '../state/actions'; import { getNavModel } from 'app/core/selectors/navModel'; diff --git a/public/app/features/folders/state/actions.ts b/public/app/features/folders/state/actions.ts index 541ff52f5f..c6a9fc2757 100644 --- a/public/app/features/folders/state/actions.ts +++ b/public/app/features/folders/state/actions.ts @@ -1,5 +1,5 @@ -import { AppEvents, locationUtil } from '@grafana/data'; -import { getBackendSrv } from '@grafana/runtime'; +import { AppEvents, locationUtil } from '@credativ/plutono-data'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { backendSrv } from 'app/core/services/backend_srv'; import { FolderState, ThunkResult } from 'app/types'; import { DashboardAcl, DashboardAclUpdateDTO, NewDashboardAclItem, PermissionLevel } from 'app/types/acl'; diff --git a/public/app/features/folders/state/navModel.ts b/public/app/features/folders/state/navModel.ts index c073442777..09fadefbb1 100644 --- a/public/app/features/folders/state/navModel.ts +++ b/public/app/features/folders/state/navModel.ts @@ -1,5 +1,5 @@ import { FolderDTO } from 'app/types'; -import { NavModelItem, NavModel } from '@grafana/data'; +import { NavModelItem, NavModel } from '@credativ/plutono-data'; export function buildNavModel(folder: FolderDTO): NavModelItem { const model = { diff --git a/public/app/features/inspector/DetailText.tsx b/public/app/features/inspector/DetailText.tsx index 26b55fc597..5a7c773889 100644 --- a/public/app/features/inspector/DetailText.tsx +++ b/public/app/features/inspector/DetailText.tsx @@ -1,9 +1,9 @@ import React, { FC } from 'react'; -import { useStyles } from '@grafana/ui'; -import { GrafanaTheme } from '@grafana/data'; +import { useStyles } from '@credativ/plutono-ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { css } from 'emotion'; -const getStyles = (theme: GrafanaTheme) => css` +const getStyles = (theme: PlutonoTheme) => css` margin: 0; margin-left: ${theme.spacing.md}; font-size: ${theme.typography.size.sm}; diff --git a/public/app/features/inspector/InspectDataTab.test.tsx b/public/app/features/inspector/InspectDataTab.test.tsx index 8e33e9742d..542775973e 100644 --- a/public/app/features/inspector/InspectDataTab.test.tsx +++ b/public/app/features/inspector/InspectDataTab.test.tsx @@ -1,5 +1,5 @@ import React, { ComponentProps } from 'react'; -import { FieldType } from '@grafana/data'; +import { FieldType } from '@credativ/plutono-data'; import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { InspectDataTab } from './InspectDataTab'; diff --git a/public/app/features/inspector/InspectDataTab.tsx b/public/app/features/inspector/InspectDataTab.tsx index eecd0bc5e8..260912acc7 100644 --- a/public/app/features/inspector/InspectDataTab.tsx +++ b/public/app/features/inspector/InspectDataTab.tsx @@ -11,9 +11,9 @@ import { SelectableValue, toCSV, transformDataFrame, -} from '@grafana/data'; -import { Button, Container, Field, HorizontalGroup, Select, Spinner, Switch, Table, VerticalGroup } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; +} from '@credativ/plutono-data'; +import { Button, Container, Field, HorizontalGroup, Select, Spinner, Switch, Table, VerticalGroup } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { getPanelInspectorStyles } from './styles'; import { config } from 'app/core/config'; diff --git a/public/app/features/inspector/InspectErrorTab.tsx b/public/app/features/inspector/InspectErrorTab.tsx index dcb00122cf..1dba69bca3 100644 --- a/public/app/features/inspector/InspectErrorTab.tsx +++ b/public/app/features/inspector/InspectErrorTab.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { DataQueryError } from '@grafana/data'; -import { JSONFormatter } from '@grafana/ui'; +import { DataQueryError } from '@credativ/plutono-data'; +import { JSONFormatter } from '@credativ/plutono-ui'; interface InspectErrorTabProps { error?: DataQueryError; diff --git a/public/app/features/inspector/InspectJSONTab.tsx b/public/app/features/inspector/InspectJSONTab.tsx index f0c469dc41..83b3356002 100644 --- a/public/app/features/inspector/InspectJSONTab.tsx +++ b/public/app/features/inspector/InspectJSONTab.tsx @@ -1,9 +1,9 @@ import React, { PureComponent } from 'react'; import { chain } from 'lodash'; -import { AppEvents, PanelData, SelectableValue } from '@grafana/data'; -import { Button, CodeEditor, Field, Select } from '@grafana/ui'; +import { AppEvents, PanelData, SelectableValue } from '@credativ/plutono-data'; +import { Button, CodeEditor, Field, Select } from '@credativ/plutono-ui'; import AutoSizer from 'react-virtualized-auto-sizer'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { appEvents } from 'app/core/core'; import { DashboardModel, PanelModel } from 'app/features/dashboard/state'; import { getPanelInspectorStyles } from '../inspector/styles'; diff --git a/public/app/features/inspector/InspectMetadataTab.tsx b/public/app/features/inspector/InspectMetadataTab.tsx index a3ab5bda30..95b332974b 100644 --- a/public/app/features/inspector/InspectMetadataTab.tsx +++ b/public/app/features/inspector/InspectMetadataTab.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { DataSourceApi, PanelData } from '@grafana/data'; +import { DataSourceApi, PanelData } from '@credativ/plutono-data'; interface InspectMetadataTabProps { data: PanelData; diff --git a/public/app/features/inspector/InspectStatsTab.tsx b/public/app/features/inspector/InspectStatsTab.tsx index d6508f0e73..5b600674bb 100644 --- a/public/app/features/inspector/InspectStatsTab.tsx +++ b/public/app/features/inspector/InspectStatsTab.tsx @@ -1,5 +1,5 @@ -import { PanelData, QueryResultMetaStat, TimeZone } from '@grafana/data'; -import { selectors } from '@grafana/e2e-selectors'; +import { PanelData, QueryResultMetaStat, TimeZone } from '@credativ/plutono-data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { InspectStatsTable } from './InspectStatsTable'; import React from 'react'; diff --git a/public/app/features/inspector/InspectStatsTable.tsx b/public/app/features/inspector/InspectStatsTable.tsx index 7fff4cf297..a57135761b 100644 --- a/public/app/features/inspector/InspectStatsTable.tsx +++ b/public/app/features/inspector/InspectStatsTable.tsx @@ -3,12 +3,12 @@ import { FieldType, formattedValueToString, getDisplayProcessor, - GrafanaTheme, + PlutonoTheme, QueryResultMetaStat, TimeZone, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { config } from 'app/core/config'; -import { stylesFactory, useTheme } from '@grafana/ui'; +import { stylesFactory, useTheme } from '@credativ/plutono-ui'; import { css } from 'emotion'; interface InspectStatsTableProps { @@ -56,7 +56,7 @@ function formatStat(stat: QueryResultMetaStat, timeZone?: TimeZone): string { return formattedValueToString(display(stat.value)); } -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { wrapper: css` padding-bottom: ${theme.spacing.md}; diff --git a/public/app/features/inspector/InspectSubtitle.tsx b/public/app/features/inspector/InspectSubtitle.tsx index ffd1986c0c..61d74242b7 100644 --- a/public/app/features/inspector/InspectSubtitle.tsx +++ b/public/app/features/inspector/InspectSubtitle.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { css } from 'emotion'; -import { stylesFactory, useTheme, Tab, TabsBar } from '@grafana/ui'; -import { GrafanaTheme, SelectableValue, PanelData, getValueFormat, formattedValueToString } from '@grafana/data'; +import { stylesFactory, useTheme, Tab, TabsBar } from '@credativ/plutono-ui'; +import { PlutonoTheme, SelectableValue, PanelData, getValueFormat, formattedValueToString } from '@credativ/plutono-data'; import { InspectTab } from '../inspector/types'; interface Props { @@ -34,7 +34,7 @@ export const InspectSubtitle: FC = ({ tab, tabs, onSelectTab, data }) => ); }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { tabsBar: css` padding-left: ${theme.spacing.md}; diff --git a/public/app/features/inspector/QueryInspector.tsx b/public/app/features/inspector/QueryInspector.tsx index b51495c5ae..6d368a6ca5 100644 --- a/public/app/features/inspector/QueryInspector.tsx +++ b/public/app/features/inspector/QueryInspector.tsx @@ -1,14 +1,14 @@ import React, { PureComponent } from 'react'; -import { Button, JSONFormatter, LoadingPlaceholder } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; -import { AppEvents, DataFrame } from '@grafana/data'; +import { Button, JSONFormatter, LoadingPlaceholder } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; +import { AppEvents, DataFrame } from '@credativ/plutono-data'; import appEvents from 'app/core/app_events'; import { CopyToClipboard } from 'app/core/components/CopyToClipboard/CopyToClipboard'; import { PanelModel } from 'app/features/dashboard/state'; import { getPanelInspectorStyles } from './styles'; import { supportsDataQuery } from 'app/features/dashboard/components/PanelEditor/utils'; -import { config } from '@grafana/runtime'; +import { config } from '@credativ/plutono-runtime'; import { css } from 'emotion'; import { Subscription } from 'rxjs'; import { backendSrv } from 'app/core/services/backend_srv'; @@ -269,7 +269,7 @@ export class QueryInspector extends PureComponent {

Query inspector

- Query inspector allows you to view raw request and response. To collect this data Grafana needs to issue a + Query inspector allows you to view raw request and response. To collect this data Plutono needs to issue a new query. Hit refresh button below to trigger a new query.

diff --git a/public/app/features/inspector/styles.ts b/public/app/features/inspector/styles.ts index 016bab5689..b44c9a43f6 100644 --- a/public/app/features/inspector/styles.ts +++ b/public/app/features/inspector/styles.ts @@ -1,6 +1,6 @@ import { css } from 'emotion'; import { config } from 'app/core/config'; -import { stylesFactory } from '@grafana/ui'; +import { stylesFactory } from '@credativ/plutono-ui'; export const getPanelInspectorStyles = stylesFactory(() => { return { diff --git a/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx b/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx index 818fb13220..d9b48d46e9 100644 --- a/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx +++ b/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { Button, Field, Input, Modal, useStyles } from '@grafana/ui'; +import { Button, Field, Input, Modal, useStyles } from '@credativ/plutono-ui'; import { FolderPicker } from 'app/core/components/Select/FolderPicker'; import { PanelModel } from '../../../dashboard/state'; import { css } from 'emotion'; diff --git a/public/app/features/library-panels/components/DeleteLibraryPanelModal/DeleteLibraryPanelModal.tsx b/public/app/features/library-panels/components/DeleteLibraryPanelModal/DeleteLibraryPanelModal.tsx index 50b6caf944..eb6863baf3 100644 --- a/public/app/features/library-panels/components/DeleteLibraryPanelModal/DeleteLibraryPanelModal.tsx +++ b/public/app/features/library-panels/components/DeleteLibraryPanelModal/DeleteLibraryPanelModal.tsx @@ -1,6 +1,6 @@ import React, { FC, useEffect, useMemo, useReducer } from 'react'; -import { Button, HorizontalGroup, Modal, useStyles } from '@grafana/ui'; -import { LoadingState } from '@grafana/data'; +import { Button, HorizontalGroup, Modal, useStyles } from '@credativ/plutono-ui'; +import { LoadingState } from '@credativ/plutono-data'; import { LibraryPanelDTO } from '../../types'; import { asyncDispatcher } from '../LibraryPanelsView/actions'; diff --git a/public/app/features/library-panels/components/DeleteLibraryPanelModal/reducer.test.ts b/public/app/features/library-panels/components/DeleteLibraryPanelModal/reducer.test.ts index 78d9265edc..602c870b91 100644 --- a/public/app/features/library-panels/components/DeleteLibraryPanelModal/reducer.test.ts +++ b/public/app/features/library-panels/components/DeleteLibraryPanelModal/reducer.test.ts @@ -5,7 +5,7 @@ import { initialDeleteLibraryPanelModalState, searchCompleted, } from './reducer'; -import { LoadingState } from '@grafana/data'; +import { LoadingState } from '@credativ/plutono-data'; describe('deleteLibraryPanelModalReducer', () => { describe('when created', () => { diff --git a/public/app/features/library-panels/components/DeleteLibraryPanelModal/reducer.ts b/public/app/features/library-panels/components/DeleteLibraryPanelModal/reducer.ts index 091b4f499d..de3cf188ba 100644 --- a/public/app/features/library-panels/components/DeleteLibraryPanelModal/reducer.ts +++ b/public/app/features/library-panels/components/DeleteLibraryPanelModal/reducer.ts @@ -1,5 +1,5 @@ import { DashboardSearchHit } from 'app/features/search/types'; -import { LoadingState } from '@grafana/data'; +import { LoadingState } from '@credativ/plutono-data'; import { AnyAction } from 'redux'; import { createAction } from '@reduxjs/toolkit'; diff --git a/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx b/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx index ff493a10cd..1ea2800aa8 100644 --- a/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx +++ b/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; -import { Card, Icon, IconButton, Tooltip, useStyles } from '@grafana/ui'; +import { Card, Icon, IconButton, Tooltip, useStyles } from '@credativ/plutono-ui'; import { css } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { LibraryPanelDTO } from '../../types'; import { DeleteLibraryPanelModal } from '../DeleteLibraryPanelModal/DeleteLibraryPanelModal'; @@ -80,7 +80,7 @@ export const LibraryPanelCard: React.FC { +const getStyles = (theme: PlutonoTheme) => { return { tooltip: css` display: inline; diff --git a/public/app/features/library-panels/components/LibraryPanelInfo/LibraryPanelInfo.tsx b/public/app/features/library-panels/components/LibraryPanelInfo/LibraryPanelInfo.tsx index d9f0c02832..387085ae89 100644 --- a/public/app/features/library-panels/components/LibraryPanelInfo/LibraryPanelInfo.tsx +++ b/public/app/features/library-panels/components/LibraryPanelInfo/LibraryPanelInfo.tsx @@ -1,5 +1,5 @@ -import { DateTimeInput, GrafanaTheme } from '@grafana/data'; -import { stylesFactory, useStyles } from '@grafana/ui'; +import { DateTimeInput, PlutonoTheme } from '@credativ/plutono-data'; +import { stylesFactory, useStyles } from '@credativ/plutono-ui'; import { OptionsGroup } from 'app/features/dashboard/components/PanelEditor/OptionsGroup'; import { PanelModel } from 'app/features/dashboard/state'; import { css } from 'emotion'; @@ -37,7 +37,7 @@ export const LibraryPanelInformation: React.FC = ({ panel, formatDate }) ); }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { libraryPanelInfo: css` color: ${theme.colors.textSemiWeak}; diff --git a/public/app/features/library-panels/components/LibraryPanelsView/LibraryPanelsView.tsx b/public/app/features/library-panels/components/LibraryPanelsView/LibraryPanelsView.tsx index 2d66230565..12b7855fa7 100644 --- a/public/app/features/library-panels/components/LibraryPanelsView/LibraryPanelsView.tsx +++ b/public/app/features/library-panels/components/LibraryPanelsView/LibraryPanelsView.tsx @@ -1,8 +1,8 @@ import React, { FormEvent, useMemo, useReducer } from 'react'; import { useDebounce } from 'react-use'; import { css, cx } from 'emotion'; -import { Button, Icon, Input, Pagination, stylesFactory, useStyles } from '@grafana/ui'; -import { DateTimeInput, GrafanaTheme, LoadingState } from '@grafana/data'; +import { Button, Icon, Input, Pagination, stylesFactory, useStyles } from '@credativ/plutono-ui'; +import { DateTimeInput, PlutonoTheme, LoadingState } from '@credativ/plutono-data'; import { LibraryPanelCard } from '../LibraryPanelCard/LibraryPanelCard'; import { LibraryPanelDTO } from '../../types'; @@ -100,7 +100,7 @@ export const LibraryPanelsView: React.FC = ({ ); }; -const getPanelViewStyles = stylesFactory((theme: GrafanaTheme) => { +const getPanelViewStyles = stylesFactory((theme: PlutonoTheme) => { return { container: css` display: flex; diff --git a/public/app/features/library-panels/components/LibraryPanelsView/reducer.test.ts b/public/app/features/library-panels/components/LibraryPanelsView/reducer.test.ts index 12b0990eb8..6e57f186ad 100644 --- a/public/app/features/library-panels/components/LibraryPanelsView/reducer.test.ts +++ b/public/app/features/library-panels/components/LibraryPanelsView/reducer.test.ts @@ -1,4 +1,4 @@ -import { LoadingState } from '@grafana/data'; +import { LoadingState } from '@credativ/plutono-data'; import { reducerTester } from '../../../../../test/core/redux/reducerTester'; import { diff --git a/public/app/features/library-panels/components/LibraryPanelsView/reducer.ts b/public/app/features/library-panels/components/LibraryPanelsView/reducer.ts index 0dcf7f84f6..3956e67cf9 100644 --- a/public/app/features/library-panels/components/LibraryPanelsView/reducer.ts +++ b/public/app/features/library-panels/components/LibraryPanelsView/reducer.ts @@ -1,5 +1,5 @@ import { createAction } from '@reduxjs/toolkit'; -import { LoadingState } from '@grafana/data'; +import { LoadingState } from '@credativ/plutono-data'; import { LibraryPanelDTO } from '../../types'; import { AnyAction } from 'redux'; diff --git a/public/app/features/library-panels/components/PanelLibraryOptionsGroup/PanelLibraryOptionsGroup.tsx b/public/app/features/library-panels/components/PanelLibraryOptionsGroup/PanelLibraryOptionsGroup.tsx index bc8489dd2d..655ab786f2 100644 --- a/public/app/features/library-panels/components/PanelLibraryOptionsGroup/PanelLibraryOptionsGroup.tsx +++ b/public/app/features/library-panels/components/PanelLibraryOptionsGroup/PanelLibraryOptionsGroup.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react'; import { css } from 'emotion'; import pick from 'lodash/pick'; -import { GrafanaTheme } from '@grafana/data'; -import { Button, stylesFactory, useStyles } from '@grafana/ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { Button, stylesFactory, useStyles } from '@credativ/plutono-ui'; import { OptionsGroup } from 'app/features/dashboard/components/PanelEditor/OptionsGroup'; import { DashboardModel, PanelModel } from 'app/features/dashboard/state'; @@ -84,7 +84,7 @@ export const PanelLibraryOptionsGroup: React.FC = ({ panel, dashboard }) ); }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { panelLibraryTitle: css` display: flex; diff --git a/public/app/features/library-panels/components/SaveLibraryPanelModal/SaveLibraryPanelModal.tsx b/public/app/features/library-panels/components/SaveLibraryPanelModal/SaveLibraryPanelModal.tsx index 3a6d3a5f13..d42bbf2532 100644 --- a/public/app/features/library-panels/components/SaveLibraryPanelModal/SaveLibraryPanelModal.tsx +++ b/public/app/features/library-panels/components/SaveLibraryPanelModal/SaveLibraryPanelModal.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useState } from 'react'; -import { Button, HorizontalGroup, Icon, Input, Modal, useStyles } from '@grafana/ui'; +import { Button, HorizontalGroup, Icon, Input, Modal, useStyles } from '@credativ/plutono-ui'; import { useAsync, useDebounce } from 'react-use'; import { getBackendSrv } from 'app/core/services/backend_srv'; import { usePanelSave } from '../../utils/usePanelSave'; diff --git a/public/app/features/library-panels/components/UnlinkModal/UnlinkModal.tsx b/public/app/features/library-panels/components/UnlinkModal/UnlinkModal.tsx index ad342d8f83..33d746f4b2 100644 --- a/public/app/features/library-panels/components/UnlinkModal/UnlinkModal.tsx +++ b/public/app/features/library-panels/components/UnlinkModal/UnlinkModal.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ConfirmModal } from '@grafana/ui'; +import { ConfirmModal } from '@credativ/plutono-ui'; interface Props { isOpen: boolean; diff --git a/public/app/features/library-panels/state/api.ts b/public/app/features/library-panels/state/api.ts index 30951e51dd..ad61479e61 100644 --- a/public/app/features/library-panels/state/api.ts +++ b/public/app/features/library-panels/state/api.ts @@ -1,4 +1,4 @@ -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { LibraryPanelDTO, LibraryPanelSearchResult, PanelModelWithLibraryPanel } from '../types'; export interface GetLibraryPanelsOptions { diff --git a/public/app/features/library-panels/styles.ts b/public/app/features/library-panels/styles.ts index ffcbffce1a..3ea2f495e0 100644 --- a/public/app/features/library-panels/styles.ts +++ b/public/app/features/library-panels/styles.ts @@ -1,7 +1,7 @@ import { css } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; -export function getModalStyles(theme: GrafanaTheme) { +export function getModalStyles(theme: PlutonoTheme) { return { myTable: css` max-height: 204px; diff --git a/public/app/features/live/channel.ts b/public/app/features/live/channel.ts index ca153885ba..aa31bcf5cc 100644 --- a/public/app/features/live/channel.ts +++ b/public/app/features/live/channel.ts @@ -7,7 +7,7 @@ import { LiveChannelConnectionState, LiveChannelPresenceStatus, LiveChannelAddress, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import Centrifuge, { JoinLeaveContext, PublicationContext, @@ -19,7 +19,7 @@ import Centrifuge, { import { Subject, of, merge } from 'rxjs'; /** - * Internal class that maps Centrifuge support to GrafanaLive + * Internal class that maps Centrifuge support to PlutonoLive */ export class CentrifugeLiveChannel implements LiveChannel { readonly currentStatus: LiveChannelStatusEvent; diff --git a/public/app/features/live/dashboard/DashboardChangedModal.tsx b/public/app/features/live/dashboard/DashboardChangedModal.tsx index ad803ddc9d..779686bd1b 100644 --- a/public/app/features/live/dashboard/DashboardChangedModal.tsx +++ b/public/app/features/live/dashboard/DashboardChangedModal.tsx @@ -1,10 +1,10 @@ import React, { PureComponent } from 'react'; -import { Modal, stylesFactory } from '@grafana/ui'; +import { Modal, stylesFactory } from '@credativ/plutono-ui'; import { css } from 'emotion'; import { dashboardWatcher } from './dashboardWatcher'; -import { config } from '@grafana/runtime'; +import { config } from '@credativ/plutono-runtime'; import { DashboardEvent, DashboardEventAction } from './types'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; interface Props { event?: DashboardEvent; @@ -43,7 +43,7 @@ export class DashboardChangedModal extends PureComponent { acceptDelete: ActionInfo = { label: 'Discard Local changes', - description: 'view grafana homepage', + description: 'view plutono homepage', action: () => { // Navigate to the root URL document.location.href = config.appUrl; @@ -96,7 +96,7 @@ export class DashboardChangedModal extends PureComponent { } } -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { modal: css` width: 500px; diff --git a/public/app/features/live/dashboard/dashboardWatcher.ts b/public/app/features/live/dashboard/dashboardWatcher.ts index 8e3f71a752..232c5fd796 100644 --- a/public/app/features/live/dashboard/dashboardWatcher.ts +++ b/public/app/features/live/dashboard/dashboardWatcher.ts @@ -1,4 +1,4 @@ -import { getGrafanaLiveSrv, getLegacyAngularInjector } from '@grafana/runtime'; +import { getPlutonoLiveSrv, getLegacyAngularInjector } from '@credativ/plutono-runtime'; import { getDashboardSrv } from '../../dashboard/services/DashboardSrv'; import { appEvents } from 'app/core/core'; import { @@ -10,11 +10,11 @@ import { LiveChannelConnectionState, isLiveChannelStatusEvent, isLiveChannelMessageEvent, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { CoreEvents } from 'app/types'; import { DashboardChangedModal } from './DashboardChangedModal'; import { DashboardEvent, DashboardEventAction } from './types'; -import { CoreGrafanaLiveFeature } from '../scopes'; +import { CorePlutonoLiveFeature } from '../scopes'; import { sessionId } from '../live'; class DashboardWatcher { @@ -43,14 +43,14 @@ class DashboardWatcher { sessionId, uid: this.uid!, action: this.editing ? DashboardEventAction.EditingStarted : DashboardEventAction.EditingCanceled, - message: (window as any).grafanaBootData?.user?.name, + message: (window as any).plutonoBootData?.user?.name, timestamp: Date.now(), }; this.channel!.publish!(msg); } watch(uid: string) { - const live = getGrafanaLiveSrv(); + const live = getPlutonoLiveSrv(); if (!live) { return; } @@ -59,7 +59,7 @@ class DashboardWatcher { if (uid !== this.uid) { this.leave(); this.channel = live.getChannel({ - scope: LiveChannelScope.Grafana, + scope: LiveChannelScope.Plutono, namespace: 'dashboard', path: `uid/${uid}`, }); @@ -162,7 +162,7 @@ class DashboardWatcher { export const dashboardWatcher = new DashboardWatcher(); -export function getDashboardChannelsFeature(): CoreGrafanaLiveFeature { +export function getDashboardChannelsFeature(): CorePlutonoLiveFeature { const dashboardConfig: LiveChannelConfig = { path: '${uid}', description: 'Dashboard change events', diff --git a/public/app/features/live/features.ts b/public/app/features/live/features.ts index 0dd2828348..3de72cabc4 100644 --- a/public/app/features/live/features.ts +++ b/public/app/features/live/features.ts @@ -1,8 +1,8 @@ -import { LiveChannelConfig } from '@grafana/data'; -import { MeasurementCollector } from '@grafana/runtime'; +import { LiveChannelConfig } from '@credativ/plutono-data'; +import { MeasurementCollector } from '@credativ/plutono-runtime'; import { getDashboardChannelsFeature } from './dashboard/dashboardWatcher'; import { LiveMeasurementsSupport } from './measurements/measurementsSupport'; -import { grafanaLiveCoreFeatures } from './scopes'; +import { plutonoLiveCoreFeatures } from './scopes'; export function registerLiveFeatures() { const random2s = new MeasurementCollector(); @@ -22,7 +22,7 @@ export function registerLiveFeatures() { }, ]; - grafanaLiveCoreFeatures.register({ + plutonoLiveCoreFeatures.register({ name: 'testdata', support: { getChannelConfig: (path: string) => { @@ -39,7 +39,7 @@ export function registerLiveFeatures() { canPublish: () => true, }; - grafanaLiveCoreFeatures.register({ + plutonoLiveCoreFeatures.register({ name: 'broadcast', support: { getChannelConfig: (path: string) => { @@ -50,12 +50,12 @@ export function registerLiveFeatures() { description: 'Broadcast will send/receive any JSON object in a channel', }); - grafanaLiveCoreFeatures.register({ + plutonoLiveCoreFeatures.register({ name: 'measurements', support: new LiveMeasurementsSupport(), description: 'These channels listen for measurements and produce DataFrames', }); // dashboard/* - grafanaLiveCoreFeatures.register(getDashboardChannelsFeature()); + plutonoLiveCoreFeatures.register(getDashboardChannelsFeature()); } diff --git a/public/app/features/live/live.ts b/public/app/features/live/live.ts index c00953fbaa..42bf61bdb7 100644 --- a/public/app/features/live/live.ts +++ b/public/app/features/live/live.ts @@ -1,30 +1,30 @@ import Centrifuge from 'centrifuge/dist/centrifuge.protobuf'; -import { GrafanaLiveSrv, setGrafanaLiveSrv, getGrafanaLiveSrv, config } from '@grafana/runtime'; +import { PlutonoLiveSrv, setPlutonoLiveSrv, getPlutonoLiveSrv, config } from '@credativ/plutono-runtime'; import { BehaviorSubject } from 'rxjs'; -import { LiveChannel, LiveChannelScope, LiveChannelAddress } from '@grafana/data'; +import { LiveChannel, LiveChannelScope, LiveChannelAddress } from '@credativ/plutono-data'; import { CentrifugeLiveChannel, getErrorChannel } from './channel'; import { - GrafanaLiveScope, - grafanaLiveCoreFeatures, - GrafanaLiveDataSourceScope, - GrafanaLivePluginScope, + PlutonoLiveScope, + plutonoLiveCoreFeatures, + PlutonoLiveDataSourceScope, + PlutonoLivePluginScope, } from './scopes'; import { registerLiveFeatures } from './features'; export const sessionId = - (window as any)?.grafanaBootData?.user?.id + + (window as any)?.plutonoBootData?.user?.id + '/' + Date.now().toString(16) + '/' + Math.random().toString(36).substring(2, 15); -export class CentrifugeSrv implements GrafanaLiveSrv { +export class CentrifugeSrv implements PlutonoLiveSrv { readonly open = new Map(); readonly centrifuge: Centrifuge; readonly connectionState: BehaviorSubject; readonly connectionBlocker: Promise; - readonly scopes: Record; + readonly scopes: Record; constructor() { // build live url replacing scheme in appUrl. @@ -49,9 +49,9 @@ export class CentrifugeSrv implements GrafanaLiveSrv { }); this.scopes = { - [LiveChannelScope.Grafana]: grafanaLiveCoreFeatures, - [LiveChannelScope.DataSource]: new GrafanaLiveDataSourceScope(), - [LiveChannelScope.Plugin]: new GrafanaLivePluginScope(), + [LiveChannelScope.Plutono]: plutonoLiveCoreFeatures, + [LiveChannelScope.DataSource]: new PlutonoLiveDataSourceScope(), + [LiveChannelScope.Plugin]: new PlutonoLivePluginScope(), }; // Register global listeners @@ -110,7 +110,7 @@ export class CentrifugeSrv implements GrafanaLiveSrv { return channel; } - private async initChannel(scope: GrafanaLiveScope, channel: CentrifugeLiveChannel): Promise { + private async initChannel(scope: PlutonoLiveScope, channel: CentrifugeLiveChannel): Promise { const { addr } = channel; const support = await scope.getChannelSupport(addr.namespace); if (!support) { @@ -150,11 +150,11 @@ export class CentrifugeSrv implements GrafanaLiveSrv { } } -export function getGrafanaLiveCentrifugeSrv() { - return getGrafanaLiveSrv() as CentrifugeSrv; +export function getPlutonoLiveCentrifugeSrv() { + return getPlutonoLiveSrv() as CentrifugeSrv; } -export function initGrafanaLive() { - setGrafanaLiveSrv(new CentrifugeSrv()); +export function initPlutonoLive() { + setPlutonoLiveSrv(new CentrifugeSrv()); registerLiveFeatures(); } diff --git a/public/app/features/live/measurements/measurementsSupport.ts b/public/app/features/live/measurements/measurementsSupport.ts index fe09049923..9f671bb23a 100644 --- a/public/app/features/live/measurements/measurementsSupport.ts +++ b/public/app/features/live/measurements/measurementsSupport.ts @@ -1,5 +1,5 @@ -import { LiveChannelSupport, LiveChannelConfig } from '@grafana/data'; -import { MeasurementCollector } from '@grafana/runtime'; +import { LiveChannelSupport, LiveChannelConfig } from '@credativ/plutono-data'; +import { MeasurementCollector } from '@credativ/plutono-runtime'; interface MeasurementChannel { config: LiveChannelConfig; diff --git a/public/app/features/live/scopes.ts b/public/app/features/live/scopes.ts index 658ef3973a..9db0186187 100644 --- a/public/app/features/live/scopes.ts +++ b/public/app/features/live/scopes.ts @@ -1,9 +1,9 @@ -import { LiveChannelScope, LiveChannelSupport, SelectableValue } from '@grafana/data'; -import { getDataSourceSrv } from '@grafana/runtime'; +import { LiveChannelScope, LiveChannelSupport, SelectableValue } from '@credativ/plutono-data'; +import { getDataSourceSrv } from '@credativ/plutono-runtime'; import { config } from 'app/core/config'; import { loadPlugin } from '../plugins/PluginPage'; -export abstract class GrafanaLiveScope { +export abstract class PlutonoLiveScope { constructor(protected scope: LiveChannelScope) {} /** @@ -17,21 +17,21 @@ export abstract class GrafanaLiveScope { abstract listNamespaces(): Promise>>; } -export interface CoreGrafanaLiveFeature { +export interface CorePlutonoLiveFeature { name: string; support: LiveChannelSupport; description: string; } -class GrafanaLiveCoreScope extends GrafanaLiveScope { +class PlutonoLiveCoreScope extends PlutonoLiveScope { readonly features = new Map(); readonly namespaces: Array> = []; constructor() { - super(LiveChannelScope.Grafana); + super(LiveChannelScope.Plutono); } - register(feature: CoreGrafanaLiveFeature) { + register(feature: CorePlutonoLiveFeature) { this.features.set(feature.name, feature.support); this.namespaces.push({ value: feature.name, @@ -58,9 +58,9 @@ class GrafanaLiveCoreScope extends GrafanaLiveScope { return Promise.resolve(this.namespaces); } } -export const grafanaLiveCoreFeatures = new GrafanaLiveCoreScope(); +export const plutonoLiveCoreFeatures = new PlutonoLiveCoreScope(); -export class GrafanaLiveDataSourceScope extends GrafanaLiveScope { +export class PlutonoLiveDataSourceScope extends PlutonoLiveScope { names?: Array>; constructor() { @@ -106,7 +106,7 @@ export class GrafanaLiveDataSourceScope extends GrafanaLiveScope { } } -export class GrafanaLivePluginScope extends GrafanaLiveScope { +export class PlutonoLivePluginScope extends PlutonoLiveScope { names?: Array>; constructor() { diff --git a/public/app/features/manage-dashboards/DashboardImportPage.tsx b/public/app/features/manage-dashboards/DashboardImportPage.tsx index eef1cdc9d7..995463dc04 100644 --- a/public/app/features/manage-dashboards/DashboardImportPage.tsx +++ b/public/app/features/manage-dashboards/DashboardImportPage.tsx @@ -1,8 +1,8 @@ import React, { FormEvent, PureComponent } from 'react'; import { MapDispatchToProps, MapStateToProps } from 'react-redux'; import { css } from 'emotion'; -import { AppEvents, NavModel } from '@grafana/data'; -import { Button, stylesFactory, Input, TextArea, Field, Form, Legend, FileUpload } from '@grafana/ui'; +import { AppEvents, NavModel } from '@credativ/plutono-data'; +import { Button, stylesFactory, Input, TextArea, Field, Form, Legend, FileUpload } from '@credativ/plutono-ui'; import Page from 'app/core/components/Page/Page'; import { connectWithCleanUp } from 'app/core/components/connectWithCleanUp'; import { ImportDashboardOverview } from './components/ImportDashboardOverview'; @@ -91,7 +91,7 @@ class DashboardImportUnConnected extends PureComponent { placeholder="Grafana.com dashboard url or id" type="text" ref={register({ - required: 'A Grafana dashboard url or id is required', + required: 'A Plutono dashboard url or id is required', validate: validateGcomDashboard, })} addonAfter={} diff --git a/public/app/features/manage-dashboards/SnapshotListPage.tsx b/public/app/features/manage-dashboards/SnapshotListPage.tsx index 571354e0db..d2e9dbf852 100644 --- a/public/app/features/manage-dashboards/SnapshotListPage.tsx +++ b/public/app/features/manage-dashboards/SnapshotListPage.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import { MapStateToProps, connect } from 'react-redux'; -import { NavModel } from '@grafana/data'; +import { NavModel } from '@credativ/plutono-data'; import Page from 'app/core/components/Page/Page'; import { getUrl } from 'app/core/selectors/location'; import { StoreState } from 'app/types'; diff --git a/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx b/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx index 566dcd5bb2..92a0a89557 100644 --- a/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx +++ b/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx @@ -9,7 +9,7 @@ import { Field, InputControl, Legend, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; import { FolderPicker } from 'app/core/components/Select/FolderPicker'; import { DataSourcePicker } from 'app/core/components/Select/DataSourcePicker'; import { DashboardInput, DashboardInputs, DataSourceInput, ImportDashboardDTO } from '../state/reducers'; @@ -75,7 +75,7 @@ export const ImportDashboardForm: FC = ({ diff --git a/public/app/features/manage-dashboards/state/actions.ts b/public/app/features/manage-dashboards/state/actions.ts index 271424a4c6..c5095c17f0 100644 --- a/public/app/features/manage-dashboards/state/actions.ts +++ b/public/app/features/manage-dashboards/state/actions.ts @@ -1,4 +1,4 @@ -import { AppEvents, DataSourceInstanceSettings, locationUtil } from '@grafana/data'; +import { AppEvents, DataSourceInstanceSettings, locationUtil } from '@credativ/plutono-data'; import { getBackendSrv } from 'app/core/services/backend_srv'; import { clearDashboard, @@ -12,7 +12,7 @@ import { updateLocation } from 'app/core/actions'; import { ThunkResult, FolderInfo, DashboardDTO, DashboardDataDTO } from 'app/types'; import { appEvents } from '../../../core/core'; import { dashboardWatcher } from 'app/features/live/dashboard/dashboardWatcher'; -import { getDataSourceSrv } from '@grafana/runtime'; +import { getDataSourceSrv } from '@credativ/plutono-runtime'; export function fetchGcomDashboard(id: string): ThunkResult { return async (dispatch) => { diff --git a/public/app/features/manage-dashboards/state/reducers.ts b/public/app/features/manage-dashboards/state/reducers.ts index cbcb92adfa..6f09ed0f22 100644 --- a/public/app/features/manage-dashboards/state/reducers.ts +++ b/public/app/features/manage-dashboards/state/reducers.ts @@ -1,5 +1,5 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; -import { DataSourceInstanceSettings } from '@grafana/data'; +import { DataSourceInstanceSettings } from '@credativ/plutono-data'; export enum DashboardSource { Gcom = 0, diff --git a/public/app/features/manage-dashboards/state/selectors.ts b/public/app/features/manage-dashboards/state/selectors.ts index 6825f8f567..6da7a5c7fa 100644 --- a/public/app/features/manage-dashboards/state/selectors.ts +++ b/public/app/features/manage-dashboards/state/selectors.ts @@ -1,4 +1,4 @@ -import { NavModel } from '@grafana/data'; +import { NavModel } from '@credativ/plutono-data'; import { StoreState } from 'app/types'; import { getUrl } from 'app/core/selectors/location'; import { getNavModel } from 'app/core/selectors/navModel'; diff --git a/public/app/features/manage-dashboards/utils/validation.ts b/public/app/features/manage-dashboards/utils/validation.ts index 9b2f667964..0b689af640 100644 --- a/public/app/features/manage-dashboards/utils/validation.ts +++ b/public/app/features/manage-dashboards/utils/validation.ts @@ -1,5 +1,5 @@ import validationSrv from '../services/ValidationSrv'; -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; export const validateDashboardJson = (json: string) => { try { diff --git a/public/app/features/org/NewOrgPage.tsx b/public/app/features/org/NewOrgPage.tsx index 915a295f3e..262cc4ed6c 100644 --- a/public/app/features/org/NewOrgPage.tsx +++ b/public/app/features/org/NewOrgPage.tsx @@ -1,12 +1,12 @@ import React, { FC } from 'react'; -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import Page from 'app/core/components/Page/Page'; -import { Button, Input, Field, Form } from '@grafana/ui'; +import { Button, Input, Field, Form } from '@credativ/plutono-ui'; import { getConfig } from 'app/core/config'; import { StoreState } from 'app/types'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { NavModel } from '@grafana/data'; +import { NavModel } from '@credativ/plutono-data'; import { getNavModel } from '../../core/selectors/navModel'; const createOrg = async (newOrg: { name: string }) => { diff --git a/public/app/features/org/OrgDetailsPage.test.tsx b/public/app/features/org/OrgDetailsPage.test.tsx index 7b62b1f83a..5d2008faa6 100644 --- a/public/app/features/org/OrgDetailsPage.test.tsx +++ b/public/app/features/org/OrgDetailsPage.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { NavModel } from '@grafana/data'; +import { NavModel } from '@credativ/plutono-data'; import { OrgDetailsPage, Props } from './OrgDetailsPage'; import { Organization } from '../../types'; diff --git a/public/app/features/org/OrgDetailsPage.tsx b/public/app/features/org/OrgDetailsPage.tsx index 6c4861bd66..9a8f634f92 100644 --- a/public/app/features/org/OrgDetailsPage.tsx +++ b/public/app/features/org/OrgDetailsPage.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { NavModel } from '@grafana/data'; +import { NavModel } from '@credativ/plutono-data'; import Page from 'app/core/components/Page/Page'; import OrgProfile from './OrgProfile'; @@ -10,7 +10,7 @@ import { loadOrganization, updateOrganization } from './state/actions'; import { Organization, StoreState } from 'app/types'; import { getNavModel } from 'app/core/selectors/navModel'; import { setOrganizationName } from './state/reducers'; -import { VerticalGroup } from '@grafana/ui'; +import { VerticalGroup } from '@credativ/plutono-ui'; export interface Props { navModel: NavModel; diff --git a/public/app/features/org/OrgProfile.tsx b/public/app/features/org/OrgProfile.tsx index e69be4342d..8128b5353e 100644 --- a/public/app/features/org/OrgProfile.tsx +++ b/public/app/features/org/OrgProfile.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { Input, Field, FieldSet, Button, Form } from '@grafana/ui'; +import { Input, Field, FieldSet, Button, Form } from '@credativ/plutono-ui'; export interface Props { orgName: string; diff --git a/public/app/features/org/SelectOrgPage.tsx b/public/app/features/org/SelectOrgPage.tsx index d56e5f7c9c..d3b747551a 100644 --- a/public/app/features/org/SelectOrgPage.tsx +++ b/public/app/features/org/SelectOrgPage.tsx @@ -1,13 +1,13 @@ import React, { FC, useState } from 'react'; import Page from 'app/core/components/Page/Page'; -import { getBackendSrv, config } from '@grafana/runtime'; +import { getBackendSrv, config } from '@credativ/plutono-runtime'; import { UserOrg } from 'app/types'; import { useAsync } from 'react-use'; -import { Button, HorizontalGroup } from '@grafana/ui'; +import { Button, HorizontalGroup } from '@credativ/plutono-ui'; const navModel = { main: { - icon: 'grafana', + icon: 'plutono', subTitle: 'Preferences', text: 'Select active organization', }, diff --git a/public/app/features/org/UserInviteForm.tsx b/public/app/features/org/UserInviteForm.tsx index 5b7f5dfd5a..172f0815fb 100644 --- a/public/app/features/org/UserInviteForm.tsx +++ b/public/app/features/org/UserInviteForm.tsx @@ -9,15 +9,15 @@ import { Form, Field, InputControl, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; import { getConfig } from 'app/core/config'; import { OrgRole } from 'app/types'; -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { updateLocation } from 'app/core/actions'; import { connect } from 'react-redux'; import { hot } from 'react-hot-loader'; import { appEvents } from 'app/core/core'; -import { AppEvents, locationUtil } from '@grafana/data'; +import { AppEvents, locationUtil } from '@credativ/plutono-data'; const roles = [ { label: 'Viewer', value: OrgRole.Viewer }, diff --git a/public/app/features/org/UserInvitePage.tsx b/public/app/features/org/UserInvitePage.tsx index 535dbeca7b..12c2df762e 100644 --- a/public/app/features/org/UserInvitePage.tsx +++ b/public/app/features/org/UserInvitePage.tsx @@ -17,7 +17,7 @@ export const UserInvitePage: FC = ({ navModel }) => {

Invite User

- Send invite or add existing Grafana user to the organization + Send invite or add existing Plutono user to the organization {contextSrv.user.orgName}
diff --git a/public/app/features/org/state/actions.ts b/public/app/features/org/state/actions.ts index 776584867c..f627423e23 100644 --- a/public/app/features/org/state/actions.ts +++ b/public/app/features/org/state/actions.ts @@ -1,5 +1,5 @@ import { ThunkResult } from 'app/types'; -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { organizationLoaded } from './reducers'; import { updateConfigurationSubtitle } from 'app/core/actions'; diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts index b04149cdfd..25ffb7e147 100644 --- a/public/app/features/panel/metrics_panel_ctrl.ts +++ b/public/app/features/panel/metrics_panel_ctrl.ts @@ -13,7 +13,7 @@ import { TimeRange, toDataFrameDTO, toLegacyResponseData, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { Unsubscribable } from 'rxjs'; import { PanelModel } from 'app/features/dashboard/state'; import { PanelQueryRunner } from '../query/state/PanelQueryRunner'; diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts index aabbcd6fce..b4978cc487 100644 --- a/public/app/features/panel/panel_ctrl.ts +++ b/public/app/features/panel/panel_ctrl.ts @@ -9,7 +9,7 @@ import { AngularPanelMenuItem, EventBusExtended, EventBusSrv, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { DashboardModel } from '../dashboard/state'; export class PanelCtrl { diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts index 05387765ec..695598b5db 100644 --- a/public/app/features/panel/panel_directive.ts +++ b/public/app/features/panel/panel_directive.ts @@ -1,19 +1,19 @@ import angular from 'angular'; // @ts-ignore import baron from 'baron'; -import { PanelEvents } from '@grafana/data'; +import { PanelEvents } from '@credativ/plutono-data'; import { PanelModel } from '../dashboard/state'; import { PanelCtrl } from './panel_ctrl'; import { Subscription } from 'rxjs'; import { RefreshEvent, RenderEvent } from 'app/types/events'; -const module = angular.module('grafana.directives'); +const module = angular.module('plutono.directives'); const panelTemplate = ` `; -module.directive('grafanaPanel', ($rootScope, $document, $timeout) => { +module.directive('plutonoPanel', ($rootScope, $document, $timeout) => { return { restrict: 'E', template: panelTemplate, diff --git a/public/app/features/panel/panel_editor_tab.ts b/public/app/features/panel/panel_editor_tab.ts index 3a66d8d9f7..a69081a632 100644 --- a/public/app/features/panel/panel_editor_tab.ts +++ b/public/app/features/panel/panel_editor_tab.ts @@ -1,6 +1,6 @@ import angular from 'angular'; -const directiveModule = angular.module('grafana.directives'); +const directiveModule = angular.module('plutono.directives'); const directiveCache: any = {}; /** @ngInject */ diff --git a/public/app/features/panel/panellinks/linkSuppliers.test.ts b/public/app/features/panel/panellinks/linkSuppliers.test.ts index f33f47faa8..ff72b22ad8 100644 --- a/public/app/features/panel/panellinks/linkSuppliers.test.ts +++ b/public/app/features/panel/panellinks/linkSuppliers.test.ts @@ -1,9 +1,9 @@ import { getFieldLinksSupplier } from './linkSuppliers'; -import { applyFieldOverrides, DataFrameView, dateTime, FieldDisplay, toDataFrame } from '@grafana/data'; +import { applyFieldOverrides, DataFrameView, dateTime, FieldDisplay, toDataFrame } from '@credativ/plutono-data'; import { getLinkSrv, LinkService, LinkSrv, setLinkSrv } from './link_srv'; import { TemplateSrv } from '../../templating/template_srv'; import { TimeSrv } from '../../dashboard/services/TimeSrv'; -import { getTheme } from '@grafana/ui'; +import { getTheme } from '@credativ/plutono-ui'; describe('getFieldLinksSupplier', () => { let originalLinkSrv: LinkService; diff --git a/public/app/features/panel/panellinks/linkSuppliers.ts b/public/app/features/panel/panellinks/linkSuppliers.ts index 8f91b82112..d91e6eb5a4 100644 --- a/public/app/features/panel/panellinks/linkSuppliers.ts +++ b/public/app/features/panel/panellinks/linkSuppliers.ts @@ -11,7 +11,7 @@ import { LinkModelSupplier, ScopedVar, ScopedVars, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { getLinkSrv } from './link_srv'; import { config } from 'app/core/config'; diff --git a/public/app/features/panel/panellinks/link_srv.ts b/public/app/features/panel/panellinks/link_srv.ts index a81ec42442..aa6f239953 100644 --- a/public/app/features/panel/panellinks/link_srv.ts +++ b/public/app/features/panel/panellinks/link_srv.ts @@ -23,7 +23,7 @@ import { VariableOrigin, VariableSuggestion, VariableSuggestionsScope, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { getAllVariableValuesForUrl } from '../../variables/getAllVariableValuesForUrl'; const timeRangeVars = [ diff --git a/public/app/features/panel/panellinks/module.ts b/public/app/features/panel/panellinks/module.ts index c510c969ab..a738a297bd 100644 --- a/public/app/features/panel/panellinks/module.ts +++ b/public/app/features/panel/panellinks/module.ts @@ -58,6 +58,6 @@ export class PanelLinksEditorCtrl { } angular - .module('grafana.directives') + .module('plutono.directives') .directive('panelLinksEditor', panelLinksEditor) .controller('PanelLinksEditorCtrl', PanelLinksEditorCtrl); diff --git a/public/app/features/panel/panellinks/specs/link_srv.test.ts b/public/app/features/panel/panellinks/specs/link_srv.test.ts index 0d5690325d..54894bc50e 100644 --- a/public/app/features/panel/panellinks/specs/link_srv.test.ts +++ b/public/app/features/panel/panellinks/specs/link_srv.test.ts @@ -1,5 +1,5 @@ -import { FieldType, locationUtil, toDataFrame, VariableOrigin } from '@grafana/data'; -import { setTemplateSrv } from '@grafana/runtime'; +import { FieldType, locationUtil, toDataFrame, VariableOrigin } from '@credativ/plutono-data'; +import { setTemplateSrv } from '@credativ/plutono-runtime'; import { getDataFrameVars, LinkSrv } from '../link_srv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { TemplateSrv } from 'app/features/templating/template_srv'; @@ -123,11 +123,11 @@ describe('linkSrv', () => { describe('Building links with root_url set', () => { it.each` url | appSubUrl | expected - ${'/d/XXX'} | ${'/grafana'} | ${'/grafana/d/XXX'} - ${'/grafana/d/XXX'} | ${'/grafana'} | ${'/grafana/d/XXX'} - ${'d/whatever'} | ${'/grafana'} | ${'d/whatever'} + ${'/d/XXX'} | ${'/plutono'} | ${'/plutono/d/XXX'} + ${'/plutono/d/XXX'} | ${'/plutono'} | ${'/plutono/d/XXX'} + ${'d/whatever'} | ${'/plutono'} | ${'d/whatever'} ${'/d/XXX'} | ${''} | ${'/d/XXX'} - ${'/grafana/d/XXX'} | ${''} | ${'/grafana/d/XXX'} + ${'/plutono/d/XXX'} | ${''} | ${'/plutono/d/XXX'} ${'d/whatever'} | ${''} | ${'d/whatever'} `( "when link '$url' and config.appSubUrl set to '$appSubUrl' then result should be '$expected'", diff --git a/public/app/features/panel/query_editor_row.ts b/public/app/features/panel/query_editor_row.ts index 325dac6564..b3fa145da6 100644 --- a/public/app/features/panel/query_editor_row.ts +++ b/public/app/features/panel/query_editor_row.ts @@ -1,6 +1,6 @@ import angular from 'angular'; -const module = angular.module('grafana.directives'); +const module = angular.module('plutono.directives'); export class QueryRowCtrl { target: any; diff --git a/public/app/features/playlist/partials/playlists.html b/public/app/features/playlist/partials/playlists.html index fccba3e0f9..526b7cd795 100644 --- a/public/app/features/playlist/partials/playlists.html +++ b/public/app/features/playlist/partials/playlists.html @@ -61,11 +61,11 @@ buttonLink="'playlists/create'" buttonTitle="'Create Playlist'" proTip="'You can use playlists to cycle dashboards on TVs without user control'" - proTipLink="'http://docs.grafana.org/reference/playlist/'" + proTipLink="'http://docs.plutono.org/reference/playlist/'" proTipLinkTitle="'Learn more'" proTipTarget="'_blank'" />
-
+
There are no playlists created yet

Unfortunately you don't have permission to create playlists.

diff --git a/public/app/features/playlist/playlist_edit_ctrl.ts b/public/app/features/playlist/playlist_edit_ctrl.ts index 983babf868..e8d1386cc3 100644 --- a/public/app/features/playlist/playlist_edit_ctrl.ts +++ b/public/app/features/playlist/playlist_edit_ctrl.ts @@ -1,10 +1,10 @@ import _ from 'lodash'; import coreModule from '../../core/core_module'; import { ILocationService, IScope } from 'angular'; -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { NavModelSrv } from 'app/core/nav_model_srv'; import { AppEventEmitter } from 'app/types'; -import { AppEvents } from '@grafana/data'; +import { AppEvents } from '@credativ/plutono-data'; import { promiseToDigest } from '../../core/utils/promiseToDigest'; export interface PlaylistItem { diff --git a/public/app/features/playlist/playlist_routes.ts b/public/app/features/playlist/playlist_routes.ts index 46428ed4b9..f9297252e5 100644 --- a/public/app/features/playlist/playlist_routes.ts +++ b/public/app/features/playlist/playlist_routes.ts @@ -2,7 +2,7 @@ import angular from 'angular'; import { PlaylistSrv } from './playlist_srv'; /** @ngInject */ -function grafanaRoutes($routeProvider: any) { +function plutonoRoutes($routeProvider: any) { $routeProvider .when('/playlists', { templateUrl: 'public/app/features/playlist/partials/playlists.html', @@ -30,4 +30,4 @@ function grafanaRoutes($routeProvider: any) { }); } -angular.module('grafana.routes').config(grafanaRoutes); +angular.module('plutono.routes').config(plutonoRoutes); diff --git a/public/app/features/playlist/playlist_srv.ts b/public/app/features/playlist/playlist_srv.ts index 2f006a0540..4d64456e57 100644 --- a/public/app/features/playlist/playlist_srv.ts +++ b/public/app/features/playlist/playlist_srv.ts @@ -7,8 +7,8 @@ import appEvents from 'app/core/app_events'; import { store } from 'app/store/store'; import { CoreEvents } from 'app/types'; -import { getBackendSrv } from '@grafana/runtime'; -import { locationUtil, urlUtil, rangeUtil } from '@grafana/data'; +import { getBackendSrv } from '@credativ/plutono-runtime'; +import { locationUtil, urlUtil, rangeUtil } from '@credativ/plutono-data'; export const queryParamsToPreserve: { [key: string]: boolean } = { kiosk: true, diff --git a/public/app/features/playlist/playlists_ctrl.ts b/public/app/features/playlist/playlists_ctrl.ts index 7885d1430f..a1acafbe96 100644 --- a/public/app/features/playlist/playlists_ctrl.ts +++ b/public/app/features/playlist/playlists_ctrl.ts @@ -1,8 +1,8 @@ import { IScope } from 'angular'; import _ from 'lodash'; -import { AppEvents } from '@grafana/data'; +import { AppEvents } from '@credativ/plutono-data'; import { OrgRole, AppEventEmitter, CoreEvents } from 'app/types'; -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import coreModule from '../../core/core_module'; import config from '../../core/config'; diff --git a/public/app/features/playlist/specs/playlist_srv.test.ts b/public/app/features/playlist/specs/playlist_srv.test.ts index 8aa95412db..c9cee22553 100644 --- a/public/app/features/playlist/specs/playlist_srv.test.ts +++ b/public/app/features/playlist/specs/playlist_srv.test.ts @@ -5,8 +5,8 @@ import { setStore } from 'app/store/store'; const getMock = jest.fn(); -jest.mock('@grafana/runtime', () => { - const original = jest.requireActual('@grafana/runtime'); +jest.mock('@credativ/plutono-runtime', () => { + const original = jest.requireActual('@credativ/plutono-runtime'); return { ...original, getBackendSrv: () => ({ diff --git a/public/app/features/plugins/AppRootPage.test.tsx b/public/app/features/plugins/AppRootPage.test.tsx index 192ef85388..88935a7443 100644 --- a/public/app/features/plugins/AppRootPage.test.tsx +++ b/public/app/features/plugins/AppRootPage.test.tsx @@ -7,7 +7,7 @@ import AppRootPage from './AppRootPage'; import { getPluginSettings } from './PluginSettingsCache'; import { importAppPlugin } from './plugin_loader'; import { getMockPlugin } from './__mocks__/pluginMocks'; -import { AppPlugin, PluginType, AppRootProps, NavModelItem } from '@grafana/data'; +import { AppPlugin, PluginType, AppRootProps, NavModelItem } from '@credativ/plutono-data'; import { updateLocation } from 'app/core/actions'; import { createRootReducer } from 'app/core/reducers/root'; import { createStore } from 'redux'; diff --git a/public/app/features/plugins/AppRootPage.tsx b/public/app/features/plugins/AppRootPage.tsx index a343c83ae2..fb812daddc 100644 --- a/public/app/features/plugins/AppRootPage.tsx +++ b/public/app/features/plugins/AppRootPage.tsx @@ -4,7 +4,7 @@ import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; // Types import { StoreState } from 'app/types'; -import { AppEvents, AppPlugin, AppPluginMeta, NavModel, PluginType, UrlQueryMap } from '@grafana/data'; +import { AppEvents, AppPlugin, AppPluginMeta, NavModel, PluginType, UrlQueryMap } from '@credativ/plutono-data'; import { createHtmlPortalNode, InPortal, OutPortal, HtmlPortalNode } from 'react-reverse-portal'; import Page from 'app/core/components/Page/Page'; diff --git a/public/app/features/plugins/PluginDashboards.tsx b/public/app/features/plugins/PluginDashboards.tsx index 9c035e7c5b..8d6be3de98 100644 --- a/public/app/features/plugins/PluginDashboards.tsx +++ b/public/app/features/plugins/PluginDashboards.tsx @@ -3,10 +3,10 @@ import React, { PureComponent } from 'react'; import extend from 'lodash/extend'; import { PluginDashboard } from 'app/types'; -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { appEvents } from 'app/core/core'; import DashboardsTable from 'app/features/datasources/DashboardsTable'; -import { AppEvents, PluginMeta, DataSourceApi } from '@grafana/data'; +import { AppEvents, PluginMeta, DataSourceApi } from '@credativ/plutono-data'; interface Props { plugin: PluginMeta; diff --git a/public/app/features/plugins/PluginList.tsx b/public/app/features/plugins/PluginList.tsx index 3a155481c2..28bf9dbcb5 100644 --- a/public/app/features/plugins/PluginList.tsx +++ b/public/app/features/plugins/PluginList.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import PluginListItem from './PluginListItem'; -import { PluginMeta } from '@grafana/data'; -import { selectors } from '@grafana/e2e-selectors'; +import { PluginMeta } from '@credativ/plutono-data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; interface Props { plugins: PluginMeta[]; diff --git a/public/app/features/plugins/PluginListItem.tsx b/public/app/features/plugins/PluginListItem.tsx index f138fec65a..f5555dd5b3 100644 --- a/public/app/features/plugins/PluginListItem.tsx +++ b/public/app/features/plugins/PluginListItem.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; -import { PluginMeta } from '@grafana/data'; +import { PluginMeta } from '@credativ/plutono-data'; import { PluginSignatureBadge } from './PluginSignatureBadge'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; interface Props { plugin: PluginMeta; diff --git a/public/app/features/plugins/PluginListPage.test.tsx b/public/app/features/plugins/PluginListPage.test.tsx index 550a473127..18b8dd6945 100644 --- a/public/app/features/plugins/PluginListPage.test.tsx +++ b/public/app/features/plugins/PluginListPage.test.tsx @@ -1,18 +1,18 @@ import React from 'react'; import { PluginListPage, Props } from './PluginListPage'; -import { NavModel, PluginErrorCode, PluginMeta } from '@grafana/data'; +import { NavModel, PluginErrorCode, PluginMeta } from '@credativ/plutono-data'; import { mockToolkitActionCreator } from 'test/core/redux/mocks'; import { setPluginsSearchQuery } from './state/reducers'; import { render, screen, waitFor } from '@testing-library/react'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { Provider } from 'react-redux'; import { configureStore } from '../../store/configureStore'; import { afterEach } from '../../../test/lib/common'; let errorsReturnMock: any = []; -jest.mock('@grafana/runtime', () => ({ - ...(jest.requireActual('@grafana/runtime') as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...(jest.requireActual('@credativ/plutono-runtime') as object), getBackendSrv: () => ({ get: () => { return errorsReturnMock as any; diff --git a/public/app/features/plugins/PluginListPage.tsx b/public/app/features/plugins/PluginListPage.tsx index 72127deb46..ee9feec472 100644 --- a/public/app/features/plugins/PluginListPage.tsx +++ b/public/app/features/plugins/PluginListPage.tsx @@ -7,11 +7,11 @@ import PluginList from './PluginList'; import { loadPlugins } from './state/actions'; import { getNavModel } from 'app/core/selectors/navModel'; import { getPlugins, getPluginsSearchQuery } from './state/selectors'; -import { NavModel, PluginMeta } from '@grafana/data'; +import { NavModel, PluginMeta } from '@credativ/plutono-data'; import { StoreState } from 'app/types'; import { setPluginsSearchQuery } from './state/reducers'; import { useAsync } from 'react-use'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { PluginsErrorsInfo } from './PluginsErrorsInfo'; export interface Props { @@ -36,7 +36,7 @@ export const PluginListPage: React.FC = ({ }, [loadPlugins]); const linkButton = { - href: 'https://grafana.com/plugins?utm_source=grafana_plugin_list', + href: 'https://grafana.com/plugins', title: 'Find more plugins on Grafana.com', }; @@ -56,7 +56,7 @@ export const PluginListPage: React.FC = ({

Note that unsigned front-end datasource and panel plugins are still usable, but this is - subject to change in the upcoming releases of Grafana + subject to change in the upcoming releases of Plutono

diff --git a/public/app/features/plugins/PluginPage.tsx b/public/app/features/plugins/PluginPage.tsx index f65169e81d..4513311ce0 100644 --- a/public/app/features/plugins/PluginPage.tsx +++ b/public/app/features/plugins/PluginPage.tsx @@ -6,7 +6,7 @@ import find from 'lodash/find'; // Types import { AppPlugin, - GrafanaPlugin, + PlutonoPlugin, NavModel, NavModelItem, PluginDependencies, @@ -17,9 +17,9 @@ import { PluginSignatureStatus, PluginType, UrlQueryMap, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { AppNotificationSeverity, CoreEvents, StoreState } from 'app/types'; -import { Alert, InfoBox, Tooltip } from '@grafana/ui'; +import { Alert, InfoBox, Tooltip } from '@credativ/plutono-ui'; import Page from 'app/core/components/Page/Page'; import { getPluginSettings } from './PluginSettingsCache'; @@ -33,7 +33,7 @@ import { config } from 'app/core/config'; import { ContextSrv } from '../../core/services/context_srv'; import { css } from 'emotion'; import { PluginSignatureBadge } from './PluginSignatureBadge'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; export function getLoadingNav(): NavModel { const node = { @@ -46,7 +46,7 @@ export function getLoadingNav(): NavModel { }; } -export function loadPlugin(pluginId: string): Promise { +export function loadPlugin(pluginId: string): Promise { return getPluginSettings(pluginId).then((info) => { if (info.type === PluginType.app) { return importAppPlugin(info); @@ -67,7 +67,7 @@ export function loadPlugin(pluginId: string): Promise { }); } if (info.type === PluginType.renderer) { - return Promise.resolve({ meta: info } as GrafanaPlugin); + return Promise.resolve({ meta: info } as PlutonoPlugin); } return Promise.reject('Unknown Plugin type: ' + info.type); }); @@ -82,7 +82,7 @@ interface Props { interface State { loading: boolean; - plugin?: GrafanaPlugin; + plugin?: PlutonoPlugin; nav: NavModel; defaultPage: string; // The first configured one or readme } @@ -259,8 +259,8 @@ class PluginPage extends PureComponent {

Dependencies

diff --git a/public/app/features/plugins/plugin_component.ts b/public/app/features/plugins/plugin_component.ts index ef25c825c0..f17535934d 100644 --- a/public/app/features/plugins/plugin_component.ts +++ b/public/app/features/plugins/plugin_component.ts @@ -4,16 +4,16 @@ import _ from 'lodash'; import config from 'app/core/config'; import coreModule from 'app/core/core_module'; -import { DataSourceApi, PanelEvents } from '@grafana/data'; +import { DataSourceApi, PanelEvents } from '@credativ/plutono-data'; import { importPanelPlugin, importDataSourcePlugin, importAppPlugin } from './plugin_loader'; import DatasourceSrv from './datasource_srv'; -import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; +import { PlutonoRootScope } from 'app/routes/PlutonoCtrl'; /** @ngInject */ function pluginDirectiveLoader( $compile: any, datasourceSrv: DatasourceSrv, - $rootScope: GrafanaRootScope, + $rootScope: PlutonoRootScope, $http: any, $templateCache: any, $timeout: any, @@ -99,7 +99,7 @@ function pluginDirectiveLoader( PanelCtrl.templatePromise = getTemplate(PanelCtrl).then((template: any) => { PanelCtrl.templateUrl = null; - PanelCtrl.template = `${template}`; + PanelCtrl.template = `${template}`; return componentInfo; }); diff --git a/public/app/features/plugins/plugin_loader.test.ts b/public/app/features/plugins/plugin_loader.test.ts index 2d36523371..c0c0045faf 100644 --- a/public/app/features/plugins/plugin_loader.test.ts +++ b/public/app/features/plugins/plugin_loader.test.ts @@ -13,8 +13,8 @@ jest.mock('app/core/core', () => { }; }); -import { SystemJS } from '@grafana/runtime'; -import { AppPluginMeta, PluginMetaInfo, PluginType, AppPlugin } from '@grafana/data'; +import { SystemJS } from '@credativ/plutono-runtime'; +import { AppPluginMeta, PluginMetaInfo, PluginType, AppPlugin } from '@credativ/plutono-data'; // Loaded after the `unmock` abve import { importAppPlugin } from './plugin_loader'; diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/plugin_loader.ts index 8b996b1ac4..f4f0da426c 100644 --- a/public/app/features/plugins/plugin_loader.ts +++ b/public/app/features/plugins/plugin_loader.ts @@ -26,18 +26,18 @@ import impressionSrv from 'app/core/services/impression_srv'; import builtInPlugins from './built_in_plugins'; import * as d3 from 'd3'; import * as emotion from 'emotion'; -import * as grafanaData from '@grafana/data'; -import * as grafanaUIraw from '@grafana/ui'; -import * as grafanaRuntime from '@grafana/runtime'; +import * as plutonoData from '@credativ/plutono-data'; +import * as plutonoUIraw from '@credativ/plutono-ui'; +import * as plutonoRuntime from '@credativ/plutono-runtime'; // Help the 6.4 to 6.5 migration -// The base classes were moved from @grafana/ui to @grafana/data +// The base classes were moved from @credativ/plutono-ui to @credativ/plutono-data // This exposes the same classes on both import paths -const grafanaUI = grafanaUIraw as any; -grafanaUI.PanelPlugin = grafanaData.PanelPlugin; -grafanaUI.DataSourcePlugin = grafanaData.DataSourcePlugin; -grafanaUI.AppPlugin = grafanaData.AppPlugin; -grafanaUI.DataSourceApi = grafanaData.DataSourceApi; +const plutonoUI = plutonoUIraw as any; +plutonoUI.PanelPlugin = plutonoData.PanelPlugin; +plutonoUI.DataSourcePlugin = plutonoData.DataSourcePlugin; +plutonoUI.AppPlugin = plutonoData.AppPlugin; +plutonoUI.DataSourceApi = plutonoData.DataSourceApi; // rxjs import * as rxjs from 'rxjs'; @@ -48,9 +48,9 @@ const bust = `?_cache=${Date.now()}`; function locate(load: { address: string }) { return load.address + bust; } -grafanaRuntime.SystemJS.registry.set('plugin-loader', grafanaRuntime.SystemJS.newModule({ locate: locate })); +plutonoRuntime.SystemJS.registry.set('plugin-loader', plutonoRuntime.SystemJS.newModule({ locate: locate })); -grafanaRuntime.SystemJS.config({ +plutonoRuntime.SystemJS.config({ baseURL: 'public', defaultExtension: 'js', packages: { @@ -72,14 +72,14 @@ grafanaRuntime.SystemJS.config({ }); function exposeToPlugin(name: string, component: any) { - grafanaRuntime.SystemJS.registerDynamic(name, [], true, (require: any, exports: any, module: { exports: any }) => { + plutonoRuntime.SystemJS.registerDynamic(name, [], true, (require: any, exports: any, module: { exports: any }) => { module.exports = component; }); } -exposeToPlugin('@grafana/data', grafanaData); -exposeToPlugin('@grafana/ui', grafanaUI); -exposeToPlugin('@grafana/runtime', grafanaRuntime); +exposeToPlugin('@credativ/plutono-data', plutonoData); +exposeToPlugin('@credativ/plutono-ui', plutonoUI); +exposeToPlugin('@credativ/plutono-runtime', plutonoRuntime); exposeToPlugin('lodash', _); exposeToPlugin('moment', moment); exposeToPlugin('jquery', jquery); @@ -116,7 +116,7 @@ exposeToPlugin('app/core/services/backend_srv', { }); exposeToPlugin('app/plugins/sdk', sdk); -exposeToPlugin('app/core/utils/datemath', grafanaData.dateMath); +exposeToPlugin('app/core/utils/datemath', plutonoData.dateMath); exposeToPlugin('app/core/utils/flatten', flatten); exposeToPlugin('app/core/utils/kbn', kbn); exposeToPlugin('app/core/utils/ticks', ticks); @@ -175,10 +175,10 @@ export async function importPluginModule(path: string): Promise { return Promise.resolve(builtIn); } } - return grafanaRuntime.SystemJS.import(path); + return plutonoRuntime.SystemJS.import(path); } -export function importDataSourcePlugin(meta: grafanaData.DataSourcePluginMeta): Promise { +export function importDataSourcePlugin(meta: plutonoData.DataSourcePluginMeta): Promise { return importPluginModule(meta.module).then((pluginExports) => { if (pluginExports.plugin) { const dsPlugin = pluginExports.plugin as GenericDataSourcePlugin; @@ -187,10 +187,10 @@ export function importDataSourcePlugin(meta: grafanaData.DataSourcePluginMeta): } if (pluginExports.Datasource) { - const dsPlugin = new grafanaData.DataSourcePlugin< - grafanaData.DataSourceApi, - grafanaData.DataQuery, - grafanaData.DataSourceJsonData + const dsPlugin = new plutonoData.DataSourcePlugin< + plutonoData.DataSourceApi, + plutonoData.DataQuery, + plutonoData.DataSourceJsonData >(pluginExports.Datasource); dsPlugin.setComponentsFromLegacyExports(pluginExports); dsPlugin.meta = meta; @@ -201,9 +201,9 @@ export function importDataSourcePlugin(meta: grafanaData.DataSourcePluginMeta): }); } -export function importAppPlugin(meta: grafanaData.PluginMeta): Promise { +export function importAppPlugin(meta: plutonoData.PluginMeta): Promise { return importPluginModule(meta.module).then((pluginExports) => { - const plugin = pluginExports.plugin ? (pluginExports.plugin as grafanaData.AppPlugin) : new grafanaData.AppPlugin(); + const plugin = pluginExports.plugin ? (pluginExports.plugin as plutonoData.AppPlugin) : new plutonoData.AppPlugin(); plugin.init(meta); plugin.meta = meta; plugin.setComponentsFromLegacyExports(pluginExports); @@ -215,11 +215,11 @@ import { getPanelPluginNotFound, getPanelPluginLoadError } from '../dashboard/da import { GenericDataSourcePlugin } from '../datasources/settings/PluginSettings'; interface PanelCache { - [key: string]: Promise; + [key: string]: Promise; } const panelCache: PanelCache = {}; -export function importPanelPlugin(id: string): Promise { +export function importPanelPlugin(id: string): Promise { const loaded = panelCache[id]; if (loaded) { @@ -235,9 +235,9 @@ export function importPanelPlugin(id: string): Promise panelCache[id] = importPluginModule(meta.module) .then((pluginExports) => { if (pluginExports.plugin) { - return pluginExports.plugin as grafanaData.PanelPlugin; + return pluginExports.plugin as plutonoData.PanelPlugin; } else if (pluginExports.PanelCtrl) { - const plugin = new grafanaData.PanelPlugin(null); + const plugin = new plutonoData.PanelPlugin(null); plugin.angularPanelCtrl = pluginExports.PanelCtrl; return plugin; } diff --git a/public/app/features/plugins/plugin_page_ctrl.ts b/public/app/features/plugins/plugin_page_ctrl.ts index 78adc42c01..dad613c9cb 100644 --- a/public/app/features/plugins/plugin_page_ctrl.ts +++ b/public/app/features/plugins/plugin_page_ctrl.ts @@ -2,9 +2,9 @@ import angular from 'angular'; import _ from 'lodash'; import { getPluginSettings } from './PluginSettingsCache'; -import { PluginMeta, AppEvents } from '@grafana/data'; +import { PluginMeta, AppEvents } from '@credativ/plutono-data'; import { NavModelSrv } from 'app/core/core'; -import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; +import { PlutonoRootScope } from 'app/routes/PlutonoCtrl'; import { promiseToDigest } from '../../core/utils/promiseToDigest'; export class AppPageCtrl { @@ -14,7 +14,7 @@ export class AppPageCtrl { navModel: any; /** @ngInject */ - constructor(private $routeParams: any, private $rootScope: GrafanaRootScope, private navModelSrv: NavModelSrv) { + constructor(private $routeParams: any, private $rootScope: PlutonoRootScope, private navModelSrv: NavModelSrv) { this.pluginId = $routeParams.pluginId; promiseToDigest($rootScope)( @@ -59,4 +59,4 @@ export class AppPageCtrl { } } -angular.module('grafana.controllers').controller('AppPageCtrl', AppPageCtrl); +angular.module('plutono.controllers').controller('AppPageCtrl', AppPageCtrl); diff --git a/public/app/features/plugins/specs/datasource_srv.test.ts b/public/app/features/plugins/specs/datasource_srv.test.ts index 63e19d13a4..2cb0e0f432 100644 --- a/public/app/features/plugins/specs/datasource_srv.test.ts +++ b/public/app/features/plugins/specs/datasource_srv.test.ts @@ -1,5 +1,5 @@ import { DatasourceSrv } from 'app/features/plugins/datasource_srv'; -import { DataSourceInstanceSettings, DataSourcePlugin } from '@grafana/data'; +import { DataSourceInstanceSettings, DataSourcePlugin } from '@credativ/plutono-data'; // Datasource variable $datasource with current value 'BBB' const templateSrv: any = { @@ -45,10 +45,10 @@ describe('datasource_srv', () => { uid: 'uid-code-mmm', meta: { metrics: true, annotations: true } as any, }, - '-- Grafana --': { - type: 'grafana', - name: '-- Grafana --', - meta: { builtIn: true, metrics: true, id: 'grafana' }, + '-- Plutono --': { + type: 'plutono', + name: '-- Plutono --', + meta: { builtIn: true, metrics: true, id: 'plutono' }, }, '-- Dashboard --': { type: 'dashboard', @@ -234,11 +234,11 @@ describe('datasource_srv', () => { Object { "meta": Object { "builtIn": true, - "id": "grafana", + "id": "plutono", "metrics": true, }, - "name": "-- Grafana --", - "type": "grafana", + "name": "-- Plutono --", + "type": "plutono", }, ] `); diff --git a/public/app/features/plugins/state/actions.ts b/public/app/features/plugins/state/actions.ts index 0be091b14a..b8d078b411 100644 --- a/public/app/features/plugins/state/actions.ts +++ b/public/app/features/plugins/state/actions.ts @@ -1,5 +1,5 @@ -import { getBackendSrv } from '@grafana/runtime'; -import { PanelPlugin } from '@grafana/data'; +import { getBackendSrv } from '@credativ/plutono-runtime'; +import { PanelPlugin } from '@credativ/plutono-data'; import { ThunkResult } from 'app/types'; import { pluginDashboardsLoad, diff --git a/public/app/features/plugins/state/reducers.test.ts b/public/app/features/plugins/state/reducers.test.ts index af055f0677..8408b16b2b 100644 --- a/public/app/features/plugins/state/reducers.test.ts +++ b/public/app/features/plugins/state/reducers.test.ts @@ -8,7 +8,7 @@ import { pluginsReducer, setPluginsSearchQuery, } from './reducers'; -import { PluginMetaInfo, PluginType } from '@grafana/data'; +import { PluginMetaInfo, PluginType } from '@credativ/plutono-data'; describe('pluginsReducer', () => { describe('when pluginsLoaded is dispatched', () => { diff --git a/public/app/features/plugins/state/reducers.ts b/public/app/features/plugins/state/reducers.ts index 3efe068f8d..5f4ae04b93 100644 --- a/public/app/features/plugins/state/reducers.ts +++ b/public/app/features/plugins/state/reducers.ts @@ -1,5 +1,5 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; -import { PluginMeta, PanelPlugin, PluginError } from '@grafana/data'; +import { PluginMeta, PanelPlugin, PluginError } from '@credativ/plutono-data'; import { PluginsState } from 'app/types'; import { PluginDashboard } from '../../../types/plugins'; diff --git a/public/app/features/plugins/variableQueryEditorLoader.tsx b/public/app/features/plugins/variableQueryEditorLoader.tsx index 2c2b6e1479..37ba608104 100644 --- a/public/app/features/plugins/variableQueryEditorLoader.tsx +++ b/public/app/features/plugins/variableQueryEditorLoader.tsx @@ -3,8 +3,8 @@ import { importDataSourcePlugin } from './plugin_loader'; import React from 'react'; import ReactDOM from 'react-dom'; import { LegacyVariableQueryEditor } from '../variables/editor/LegacyVariableQueryEditor'; -import { DataSourcePluginMeta } from '@grafana/data'; -import { TemplateSrv } from '@grafana/runtime'; +import { DataSourcePluginMeta } from '@credativ/plutono-data'; +import { TemplateSrv } from '@credativ/plutono-runtime'; async function loadComponent(meta: DataSourcePluginMeta) { const dsPlugin = await importDataSourcePlugin(meta); diff --git a/public/app/features/plugins/wrappers/AppConfigWrapper.tsx b/public/app/features/plugins/wrappers/AppConfigWrapper.tsx index 8a025c9d86..11797f7434 100644 --- a/public/app/features/plugins/wrappers/AppConfigWrapper.tsx +++ b/public/app/features/plugins/wrappers/AppConfigWrapper.tsx @@ -3,9 +3,9 @@ import React, { PureComponent } from 'react'; import cloneDeep from 'lodash/cloneDeep'; import extend from 'lodash/extend'; -import { Button } from '@grafana/ui'; -import { PluginMeta, AppPlugin, deprecationWarning } from '@grafana/data'; -import { AngularComponent, getAngularLoader, getBackendSrv } from '@grafana/runtime'; +import { Button } from '@credativ/plutono-ui'; +import { PluginMeta, AppPlugin, deprecationWarning } from '@credativ/plutono-data'; +import { AngularComponent, getAngularLoader, getBackendSrv } from '@credativ/plutono-runtime'; import { css } from 'emotion'; diff --git a/public/app/features/profile/ChangePasswordForm.tsx b/public/app/features/profile/ChangePasswordForm.tsx index bf27dba223..d86e0c3a43 100644 --- a/public/app/features/profile/ChangePasswordForm.tsx +++ b/public/app/features/profile/ChangePasswordForm.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import config from 'app/core/config'; import { UserDTO } from 'app/types'; -import { Button, LinkButton, Form, Field, Input, HorizontalGroup } from '@grafana/ui'; +import { Button, LinkButton, Form, Field, Input, HorizontalGroup } from '@credativ/plutono-ui'; import { ChangePasswordFields } from 'app/core/utils/UserProvider'; import { css } from 'emotion'; diff --git a/public/app/features/profile/ChangePasswordPage.tsx b/public/app/features/profile/ChangePasswordPage.tsx index 5c3346123f..912fe63330 100644 --- a/public/app/features/profile/ChangePasswordPage.tsx +++ b/public/app/features/profile/ChangePasswordPage.tsx @@ -1,10 +1,10 @@ import React, { FC } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { config } from '@grafana/runtime'; -import { LoadingPlaceholder } from '@grafana/ui'; +import { config } from '@credativ/plutono-runtime'; +import { LoadingPlaceholder } from '@credativ/plutono-ui'; import { UserDTO, Team, UserOrg, UserSession, StoreState } from 'app/types'; -import { NavModel } from '@grafana/data'; +import { NavModel } from '@credativ/plutono-data'; import { getNavModel } from 'app/core/selectors/navModel'; import { UserProvider, UserAPI, LoadingStates } from 'app/core/utils/UserProvider'; import Page from 'app/core/components/Page/Page'; diff --git a/public/app/features/profile/ProfileCtrl.ts b/public/app/features/profile/ProfileCtrl.ts index 44d6b57a6c..eb59c6f522 100644 --- a/public/app/features/profile/ProfileCtrl.ts +++ b/public/app/features/profile/ProfileCtrl.ts @@ -1,7 +1,7 @@ import { coreModule, NavModelSrv } from 'app/core/core'; -import { dateTimeFormat, dateTimeFormatTimeAgo } from '@grafana/data'; +import { dateTimeFormat, dateTimeFormatTimeAgo } from '@credativ/plutono-data'; import { UserSession } from 'app/types'; -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { promiseToDigest } from 'app/core/utils/promiseToDigest'; import { IScope } from 'angular'; diff --git a/public/app/features/profile/UserOrganizations.tsx b/public/app/features/profile/UserOrganizations.tsx index 901ce469b6..2fe0e53d4b 100644 --- a/public/app/features/profile/UserOrganizations.tsx +++ b/public/app/features/profile/UserOrganizations.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { UserDTO, UserOrg } from 'app/types'; -import { LoadingPlaceholder, Button } from '@grafana/ui'; +import { LoadingPlaceholder, Button } from '@credativ/plutono-ui'; export interface Props { user: UserDTO; diff --git a/public/app/features/profile/UserProfileEdit.tsx b/public/app/features/profile/UserProfileEdit.tsx index 135065856c..8c6672bacb 100644 --- a/public/app/features/profile/UserProfileEdit.tsx +++ b/public/app/features/profile/UserProfileEdit.tsx @@ -1,9 +1,9 @@ import React, { FC } from 'react'; import { connect } from 'react-redux'; import { hot } from 'react-hot-loader'; -import { LoadingPlaceholder } from '@grafana/ui'; -import { config } from '@grafana/runtime'; -import { NavModel } from '@grafana/data'; +import { LoadingPlaceholder } from '@credativ/plutono-ui'; +import { config } from '@credativ/plutono-runtime'; +import { NavModel } from '@credativ/plutono-data'; import { UserProvider, UserAPI, LoadingStates } from 'app/core/utils/UserProvider'; import { getNavModel } from 'app/core/selectors/navModel'; import { UserDTO, Team, UserOrg, UserSession, StoreState } from 'app/types'; diff --git a/public/app/features/profile/UserProfileEditForm.tsx b/public/app/features/profile/UserProfileEditForm.tsx index 71a0b7f600..03090540ba 100644 --- a/public/app/features/profile/UserProfileEditForm.tsx +++ b/public/app/features/profile/UserProfileEditForm.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { Button, Tooltip, Icon, Form, Input, Field, FieldSet } from '@grafana/ui'; +import { Button, Tooltip, Icon, Form, Input, Field, FieldSet } from '@credativ/plutono-ui'; import { UserDTO } from 'app/types'; import config from 'app/core/config'; import { ProfileUpdateFields } from 'app/core/utils/UserProvider'; diff --git a/public/app/features/profile/UserSessions.tsx b/public/app/features/profile/UserSessions.tsx index 4f7c95ec5c..5b4d4d7faa 100644 --- a/public/app/features/profile/UserSessions.tsx +++ b/public/app/features/profile/UserSessions.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { UserDTO, UserSession } from 'app/types'; -import { LoadingPlaceholder, Button, Icon } from '@grafana/ui'; +import { LoadingPlaceholder, Button, Icon } from '@credativ/plutono-ui'; export interface Props { user: UserDTO; diff --git a/public/app/features/profile/UserTeams.tsx b/public/app/features/profile/UserTeams.tsx index 86ee811210..ae05b19e4e 100644 --- a/public/app/features/profile/UserTeams.tsx +++ b/public/app/features/profile/UserTeams.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { Team } from 'app/types'; -import { LoadingPlaceholder } from '@grafana/ui'; +import { LoadingPlaceholder } from '@credativ/plutono-ui'; export interface Props { teams: Team[]; diff --git a/public/app/features/profile/state/reducers.ts b/public/app/features/profile/state/reducers.ts index c4a3572294..f04e0038fe 100644 --- a/public/app/features/profile/state/reducers.ts +++ b/public/app/features/profile/state/reducers.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; import { PayloadAction, createSlice } from '@reduxjs/toolkit'; import { UserState, ThunkResult } from 'app/types'; import config from 'app/core/config'; -import { TimeZone } from '@grafana/data'; +import { TimeZone } from '@credativ/plutono-data'; import { contextSrv } from 'app/core/core'; export const initialState: UserState = { diff --git a/public/app/features/query/components/HelpToggle.tsx b/public/app/features/query/components/HelpToggle.tsx index 4c2078280b..894aaf1ccb 100644 --- a/public/app/features/query/components/HelpToggle.tsx +++ b/public/app/features/query/components/HelpToggle.tsx @@ -1,9 +1,9 @@ -import { GrafanaTheme } from '@grafana/data'; -import { Icon, InfoBox, stylesFactory, useTheme } from '@grafana/ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { Icon, InfoBox, stylesFactory, useTheme } from '@credativ/plutono-ui'; import { css, cx } from 'emotion'; import React, { useState } from 'react'; -const getStyles = stylesFactory((theme: GrafanaTheme) => ({ +const getStyles = stylesFactory((theme: PlutonoTheme) => ({ infoBox: css` margin-top: ${theme.spacing.xs}; `, diff --git a/public/app/features/query/components/QueryEditorRow.test.ts b/public/app/features/query/components/QueryEditorRow.test.ts index 95fed15147..4dee7e1fa4 100644 --- a/public/app/features/query/components/QueryEditorRow.test.ts +++ b/public/app/features/query/components/QueryEditorRow.test.ts @@ -1,4 +1,4 @@ -import { DataQueryRequest, dateTime, LoadingState, PanelData, toDataFrame } from '@grafana/data'; +import { DataQueryRequest, dateTime, LoadingState, PanelData, toDataFrame } from '@credativ/plutono-data'; import { filterPanelDataToQuery } from './QueryEditorRow'; function makePretendRequest(requestId: string, subRequests?: DataQueryRequest[]): DataQueryRequest { diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx index 285d5d249d..67c30f5c9a 100644 --- a/public/app/features/query/components/QueryEditorRow.tsx +++ b/public/app/features/query/components/QueryEditorRow.tsx @@ -4,9 +4,9 @@ import classNames from 'classnames'; import _ from 'lodash'; // Utils & Services import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; -import { AngularComponent, getAngularLoader, getTemplateSrv } from '@grafana/runtime'; +import { AngularComponent, getAngularLoader, getTemplateSrv } from '@credativ/plutono-runtime'; import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv'; -import { ErrorBoundaryAlert, HorizontalGroup, InfoBox } from '@grafana/ui'; +import { ErrorBoundaryAlert, HorizontalGroup, InfoBox } from '@credativ/plutono-ui'; import { DataQuery, DataSourceApi, @@ -18,7 +18,7 @@ import { PanelEvents, TimeRange, toLegacyResponseData, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { QueryEditorRowTitle } from './QueryEditorRowTitle'; import { QueryOperationRow, @@ -26,7 +26,7 @@ import { } from 'app/core/components/QueryOperationRow/QueryOperationRow'; import { QueryOperationAction } from 'app/core/components/QueryOperationRow/QueryOperationAction'; import { DashboardModel } from '../../dashboard/state/DashboardModel'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { PanelModel } from 'app/features/dashboard/state'; interface Props { diff --git a/public/app/features/query/components/QueryEditorRowTitle.tsx b/public/app/features/query/components/QueryEditorRowTitle.tsx index 4776c380c0..73ffe69a29 100644 --- a/public/app/features/query/components/QueryEditorRowTitle.tsx +++ b/public/app/features/query/components/QueryEditorRowTitle.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react'; import { css, cx } from 'emotion'; -import { DataQuery, GrafanaTheme } from '@grafana/data'; -import { FieldValidationMessage, Icon, Input, stylesFactory, useTheme } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; +import { DataQuery, PlutonoTheme } from '@credativ/plutono-data'; +import { FieldValidationMessage, Icon, Input, stylesFactory, useTheme } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; export interface Props { query: DataQuery; @@ -126,7 +126,7 @@ export const QueryEditorRowTitle: React.FC = ({ ); }; -const getQueryEditorRowTitleStyles = stylesFactory((theme: GrafanaTheme) => { +const getQueryEditorRowTitleStyles = stylesFactory((theme: PlutonoTheme) => { return { wrapper: css` display: flex; diff --git a/public/app/features/query/components/QueryEditorRows.tsx b/public/app/features/query/components/QueryEditorRows.tsx index 5eb7dc962e..ce26f2cba6 100644 --- a/public/app/features/query/components/QueryEditorRows.tsx +++ b/public/app/features/query/components/QueryEditorRows.tsx @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; // Types -import { DataQuery, DataSourceInstanceSettings, PanelData } from '@grafana/data'; +import { DataQuery, DataSourceInstanceSettings, PanelData } from '@credativ/plutono-data'; import { QueryEditorRow } from './QueryEditorRow'; import { DragDropContext, Droppable, DropResult } from 'react-beautiful-dnd'; diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx index dc16455544..02cd7f7154 100644 --- a/public/app/features/query/components/QueryGroup.tsx +++ b/public/app/features/query/components/QueryGroup.tsx @@ -2,8 +2,8 @@ import React, { PureComponent } from 'react'; // Components import { DataSourcePicker } from 'app/core/components/Select/DataSourcePicker'; -import { Button, CustomScrollbar, HorizontalGroup, Icon, Modal, stylesFactory, Tooltip } from '@grafana/ui'; -import { getDataSourceSrv } from '@grafana/runtime'; +import { Button, CustomScrollbar, HorizontalGroup, Icon, Modal, stylesFactory, Tooltip } from '@credativ/plutono-ui'; +import { getDataSourceSrv } from '@credativ/plutono-runtime'; import { QueryEditorRows } from './QueryEditorRows'; // Services import { backendSrv } from 'app/core/services/backend_srv'; @@ -16,12 +16,12 @@ import { getDefaultTimeRange, LoadingState, PanelData, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { PluginHelp } from 'app/core/components/PluginHelp/PluginHelp'; import { addQuery } from 'app/core/utils/query'; import { Unsubscribable } from 'rxjs'; import { expressionDatasource, ExpressionDatasourceID } from 'app/features/expressions/ExpressionDatasource'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { PanelQueryRunner } from '../state/PanelQueryRunner'; import { QueryGroupOptionsEditor } from './QueryGroupOptions'; import { DashboardQueryEditor, isSharedDashboardQuery } from 'app/plugins/datasource/dashboard'; diff --git a/public/app/features/query/components/QueryGroupOptions.tsx b/public/app/features/query/components/QueryGroupOptions.tsx index c561faee3c..4c6171b1c4 100644 --- a/public/app/features/query/components/QueryGroupOptions.tsx +++ b/public/app/features/query/components/QueryGroupOptions.tsx @@ -2,10 +2,10 @@ import React, { PureComponent, ChangeEvent, FocusEvent } from 'react'; // Utils -import { rangeUtil, PanelData, DataSourceApi } from '@grafana/data'; +import { rangeUtil, PanelData, DataSourceApi } from '@credativ/plutono-data'; // Components -import { Switch, Input, InlineField, InlineFormLabel, stylesFactory } from '@grafana/ui'; +import { Switch, Input, InlineField, InlineFormLabel, stylesFactory } from '@credativ/plutono-ui'; // Types import { QueryOperationRow } from 'app/core/components/QueryOperationRow/QueryOperationRow'; diff --git a/public/app/features/query/state/PanelQueryRunner.test.ts b/public/app/features/query/state/PanelQueryRunner.test.ts index 7645dd0847..e179af2041 100644 --- a/public/app/features/query/state/PanelQueryRunner.test.ts +++ b/public/app/features/query/state/PanelQueryRunner.test.ts @@ -1,16 +1,16 @@ const applyFieldOverridesMock = jest.fn(); -jest.mock('@grafana/data', () => ({ +jest.mock('@credativ/plutono-data', () => ({ __esModule: true, - ...(jest.requireActual('@grafana/data') as any), + ...(jest.requireActual('@credativ/plutono-data') as any), applyFieldOverrides: applyFieldOverridesMock, })); import { PanelQueryRunner } from './PanelQueryRunner'; -// Importing this way to be able to spy on grafana/data -import * as grafanaData from '@grafana/data'; +// Importing this way to be able to spy on plutono/data +import * as plutonoData from '@credativ/plutono-data'; import { DashboardModel } from '../../dashboard/state/index'; -import { setDataSourceSrv, setEchoSrv } from '@grafana/runtime'; +import { setDataSourceSrv, setEchoSrv } from '@credativ/plutono-runtime'; import { Echo } from '../../../core/services/echo/Echo'; jest.mock('app/core/services/backend_srv'); @@ -40,12 +40,12 @@ interface ScenarioContext { maxDataPoints?: number | null; dsInterval?: string; minInterval?: string; - scopedVars: grafanaData.ScopedVars; + scopedVars: plutonoData.ScopedVars; // Filled in by the Scenario runner - events?: grafanaData.PanelData[]; - res?: grafanaData.PanelData; - queryCalledWith?: grafanaData.DataQueryRequest; + events?: plutonoData.PanelData[]; + res?: plutonoData.PanelData; + queryCalledWith?: plutonoData.DataQueryRequest; runner: PanelQueryRunner; } @@ -54,11 +54,11 @@ type ScenarioFn = (ctx: ScenarioContext) => void; function describeQueryRunnerScenario( description: string, scenarioFn: ScenarioFn, - panelConfig?: grafanaData.DataConfigSource + panelConfig?: plutonoData.DataConfigSource ) { describe(description, () => { let setupFn = () => {}; - const defaultPanelConfig: grafanaData.DataConfigSource = { + const defaultPanelConfig: plutonoData.DataConfigSource = { getFieldOverrideOptions: () => undefined, getTransformations: () => undefined, }; @@ -94,7 +94,7 @@ function describeQueryRunnerScenario( const datasource: any = { name: 'TestDB', interval: ctx.dsInterval, - query: (options: grafanaData.DataQueryRequest) => { + query: (options: plutonoData.DataQueryRequest) => { ctx.queryCalledWith = options; return Promise.resolve(response); }, @@ -107,8 +107,8 @@ function describeQueryRunnerScenario( minInterval: ctx.minInterval, maxDataPoints: ctx.maxDataPoints, timeRange: { - from: grafanaData.dateTime().subtract(1, 'days'), - to: grafanaData.dateTime(), + from: plutonoData.dateTime().subtract(1, 'days'), + to: plutonoData.dateTime(), raw: { from: '1d', to: 'now' }, }, panelId: 1, @@ -117,7 +117,7 @@ function describeQueryRunnerScenario( ctx.runner = new PanelQueryRunner(panelConfig || defaultPanelConfig); ctx.runner.getData({ withTransforms: true, withFieldConfig: true }).subscribe({ - next: (data: grafanaData.PanelData) => { + next: (data: plutonoData.PanelData) => { ctx.res = data; ctx.events?.push(data); }, @@ -217,7 +217,7 @@ describe('PanelQueryRunner', () => { (ctx) => { it('should apply when field override options are set', async () => { ctx.runner.getData({ withTransforms: true, withFieldConfig: true }).subscribe({ - next: (data: grafanaData.PanelData) => { + next: (data: plutonoData.PanelData) => { return data; }, }); @@ -234,7 +234,7 @@ describe('PanelQueryRunner', () => { overrides: [], }, replaceVariables: (v) => v, - theme: {} as grafanaData.GrafanaTheme, + theme: {} as plutonoData.PlutonoTheme, }), getTransformations: () => undefined, } @@ -244,11 +244,11 @@ describe('PanelQueryRunner', () => { 'transformations', (ctx) => { it('should apply when transformations are set', async () => { - const spy = jest.spyOn(grafanaData, 'transformDataFrame'); + const spy = jest.spyOn(plutonoData, 'transformDataFrame'); spy.mockClear(); ctx.runner.getData({ withTransforms: true, withFieldConfig: true }).subscribe({ - next: (data: grafanaData.PanelData) => { + next: (data: plutonoData.PanelData) => { return data; }, }); @@ -259,7 +259,7 @@ describe('PanelQueryRunner', () => { { getFieldOverrideOptions: () => undefined, // @ts-ignore - getTransformations: () => [({} as unknown) as grafanaData.DataTransformerConfig], + getTransformations: () => [({} as unknown) as plutonoData.DataTransformerConfig], } ); @@ -267,10 +267,10 @@ describe('PanelQueryRunner', () => { 'getData', (ctx) => { it('should not apply transformations when transform option is false', async () => { - const spy = jest.spyOn(grafanaData, 'transformDataFrame'); + const spy = jest.spyOn(plutonoData, 'transformDataFrame'); spy.mockClear(); ctx.runner.getData({ withTransforms: false, withFieldConfig: true }).subscribe({ - next: (data: grafanaData.PanelData) => { + next: (data: plutonoData.PanelData) => { return data; }, }); @@ -280,7 +280,7 @@ describe('PanelQueryRunner', () => { it('should not apply field config when applyFieldConfig option is false', async () => { ctx.runner.getData({ withFieldConfig: false, withTransforms: true }).subscribe({ - next: (data: grafanaData.PanelData) => { + next: (data: plutonoData.PanelData) => { return data; }, }); @@ -298,10 +298,10 @@ describe('PanelQueryRunner', () => { overrides: [], }, replaceVariables: (v) => v, - theme: {} as grafanaData.GrafanaTheme, + theme: {} as plutonoData.PlutonoTheme, }), // @ts-ignore - getTransformations: () => [({} as unknown) as grafanaData.DataTransformerConfig], + getTransformations: () => [({} as unknown) as plutonoData.DataTransformerConfig], } ); @@ -309,10 +309,10 @@ describe('PanelQueryRunner', () => { 'getData', (ctx) => { it('should not apply transformations when transform option is false', async () => { - const spy = jest.spyOn(grafanaData, 'transformDataFrame'); + const spy = jest.spyOn(plutonoData, 'transformDataFrame'); spy.mockClear(); ctx.runner.getData({ withTransforms: false, withFieldConfig: true }).subscribe({ - next: (data: grafanaData.PanelData) => { + next: (data: plutonoData.PanelData) => { return data; }, }); @@ -322,7 +322,7 @@ describe('PanelQueryRunner', () => { it('should not apply field config when applyFieldConfig option is false', async () => { ctx.runner.getData({ withFieldConfig: false, withTransforms: true }).subscribe({ - next: (data: grafanaData.PanelData) => { + next: (data: plutonoData.PanelData) => { return data; }, }); @@ -340,7 +340,7 @@ describe('PanelQueryRunner', () => { overrides: [], }, replaceVariables: (v) => v, - theme: {} as grafanaData.GrafanaTheme, + theme: {} as plutonoData.PlutonoTheme, }), // @ts-ignore getTransformations: () => [{}], diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts index 8bc4e5d670..7db612bfc1 100644 --- a/public/app/features/query/state/PanelQueryRunner.ts +++ b/public/app/features/query/state/PanelQueryRunner.ts @@ -4,7 +4,7 @@ import { MonoTypeOperatorFunction, Observable, of, ReplaySubject, Unsubscribable import { map, mergeMap } from 'rxjs/operators'; // Services & Utils -import { getTemplateSrv } from '@grafana/runtime'; +import { getTemplateSrv } from '@credativ/plutono-runtime'; import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; import { preProcessPanelData, runRequest } from './runRequest'; import { isSharedDashboardQuery, runSharedRequest } from '../../../plugins/datasource/dashboard'; @@ -26,7 +26,7 @@ import { TimeRange, TimeZone, transformDataFrame, -} from '@grafana/data'; +} from '@credativ/plutono-data'; export interface QueryRunnerOptions< TQuery extends DataQuery = DataQuery, diff --git a/public/app/features/query/state/queryAnalytics.test.ts b/public/app/features/query/state/queryAnalytics.test.ts index 7af84e4fcb..f48c0ed3cf 100644 --- a/public/app/features/query/state/queryAnalytics.test.ts +++ b/public/app/features/query/state/queryAnalytics.test.ts @@ -1,5 +1,5 @@ -import { MetaAnalyticsEventName, reportMetaAnalytics } from '@grafana/runtime'; -import { CoreApp, DataQueryRequest, DataSourceApi, dateTime, LoadingState, PanelData } from '@grafana/data'; +import { MetaAnalyticsEventName, reportMetaAnalytics } from '@credativ/plutono-runtime'; +import { CoreApp, DataQueryRequest, DataSourceApi, dateTime, LoadingState, PanelData } from '@credativ/plutono-data'; import { emitDataRequestEvent } from './queryAnalytics'; import { DashboardModel } from '../../dashboard/state/DashboardModel'; @@ -25,16 +25,16 @@ jest.mock('app/features/dashboard/services/DashboardSrv', () => ({ }, })); -jest.mock('@grafana/runtime', () => ({ - ...(jest.requireActual('@grafana/runtime') as any), +jest.mock('@credativ/plutono-runtime', () => ({ + ...(jest.requireActual('@credativ/plutono-runtime') as any), reportMetaAnalytics: jest.fn(), })); const mockGetUrlSearchParams = jest.fn(() => { return {}; }); -jest.mock('@grafana/data', () => ({ - ...(jest.requireActual('@grafana/data') as any), +jest.mock('@credativ/plutono-data', () => ({ + ...(jest.requireActual('@credativ/plutono-data') as any), urlUtil: { getUrlSearchParams: () => mockGetUrlSearchParams(), }, diff --git a/public/app/features/query/state/queryAnalytics.ts b/public/app/features/query/state/queryAnalytics.ts index 4ec30cadff..b3b1d68bec 100644 --- a/public/app/features/query/state/queryAnalytics.ts +++ b/public/app/features/query/state/queryAnalytics.ts @@ -1,6 +1,6 @@ import { getDashboardSrv } from '../../dashboard/services/DashboardSrv'; -import { PanelData, LoadingState, DataSourceApi, CoreApp, urlUtil } from '@grafana/data'; -import { reportMetaAnalytics, MetaAnalyticsEventName, DataRequestEventPayload } from '@grafana/runtime'; +import { PanelData, LoadingState, DataSourceApi, CoreApp, urlUtil } from '@credativ/plutono-data'; +import { reportMetaAnalytics, MetaAnalyticsEventName, DataRequestEventPayload } from '@credativ/plutono-runtime'; export function emitDataRequestEvent(datasource: DataSourceApi) { let done = false; diff --git a/public/app/features/query/state/runRequest.test.ts b/public/app/features/query/state/runRequest.test.ts index 981ee3e511..48369e04bb 100644 --- a/public/app/features/query/state/runRequest.test.ts +++ b/public/app/features/query/state/runRequest.test.ts @@ -7,12 +7,12 @@ import { LoadingState, PanelData, DataTopic, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { Observable, Subscriber, Subscription } from 'rxjs'; import { runRequest } from './runRequest'; import { deepFreeze } from '../../../../test/core/redux/reducerTester'; import { DashboardModel } from '../../dashboard/state/DashboardModel'; -import { setEchoSrv } from '@grafana/runtime'; +import { setEchoSrv } from '@credativ/plutono-runtime'; import { Echo } from '../../../core/services/echo/Echo'; jest.mock('app/core/services/backend_srv'); diff --git a/public/app/features/query/state/runRequest.ts b/public/app/features/query/state/runRequest.ts index aa6f87a390..29cd64f900 100644 --- a/public/app/features/query/state/runRequest.ts +++ b/public/app/features/query/state/runRequest.ts @@ -19,8 +19,8 @@ import { PanelData, TimeRange, toDataFrame, -} from '@grafana/data'; -import { toDataQueryError } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { toDataQueryError } from '@credativ/plutono-runtime'; import { emitDataRequestEvent } from './queryAnalytics'; import { expressionDatasource, ExpressionDatasourceID } from 'app/features/expressions/ExpressionDatasource'; import { ExpressionQuery } from 'app/features/expressions/types'; diff --git a/public/app/features/query/state/types.ts b/public/app/features/query/state/types.ts index 009688dc2c..064c55d939 100644 --- a/public/app/features/query/state/types.ts +++ b/public/app/features/query/state/types.ts @@ -1,4 +1,4 @@ -import { EventBusExtended } from '@grafana/data'; +import { EventBusExtended } from '@credativ/plutono-data'; export interface PanelModelForLegacyQueryEditors { events: EventBusExtended; diff --git a/public/app/features/sandbox/TestStuffPage.tsx b/public/app/features/sandbox/TestStuffPage.tsx index 0d5cc1d791..cead1494e6 100644 --- a/public/app/features/sandbox/TestStuffPage.tsx +++ b/public/app/features/sandbox/TestStuffPage.tsx @@ -1,5 +1,5 @@ -import { ApplyFieldOverrideOptions, DataTransformerConfig, dateMath, FieldColorModeId, PanelData } from '@grafana/data'; -import { GraphNG, LegendDisplayMode, Table } from '@grafana/ui'; +import { ApplyFieldOverrideOptions, DataTransformerConfig, dateMath, FieldColorModeId, PanelData } from '@credativ/plutono-data'; +import { GraphNG, LegendDisplayMode, Table } from '@credativ/plutono-ui'; import { config } from 'app/core/config'; import React, { FC, useMemo, useState } from 'react'; import { useObservable } from 'react-use'; diff --git a/public/app/features/search/components/ActionRow.tsx b/public/app/features/search/components/ActionRow.tsx index 507dcd1f01..57c8ed726c 100644 --- a/public/app/features/search/components/ActionRow.tsx +++ b/public/app/features/search/components/ActionRow.tsx @@ -1,7 +1,7 @@ import React, { Dispatch, FC, FormEvent, SetStateAction } from 'react'; import { css } from 'emotion'; -import { HorizontalGroup, RadioButtonGroup, stylesFactory, useTheme, Checkbox } from '@grafana/ui'; -import { GrafanaTheme, SelectableValue } from '@grafana/data'; +import { HorizontalGroup, RadioButtonGroup, stylesFactory, useTheme, Checkbox } from '@credativ/plutono-ui'; +import { PlutonoTheme, SelectableValue } from '@credativ/plutono-data'; import { SortPicker } from 'app/core/components/Select/SortPicker'; import { TagFilter } from 'app/core/components/TagFilter/TagFilter'; import { SearchSrv } from 'app/core/services/search_srv'; @@ -61,7 +61,7 @@ export const ActionRow: FC = ({ ActionRow.displayName = 'ActionRow'; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { actionRow: css` display: none; diff --git a/public/app/features/search/components/ConfirmDeleteModal.tsx b/public/app/features/search/components/ConfirmDeleteModal.tsx index dec9828305..985719755c 100644 --- a/public/app/features/search/components/ConfirmDeleteModal.tsx +++ b/public/app/features/search/components/ConfirmDeleteModal.tsx @@ -1,8 +1,8 @@ import React, { FC } from 'react'; import { css } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; -import { ConfirmModal, stylesFactory, useTheme } from '@grafana/ui'; -import { getLocationSrv } from '@grafana/runtime'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { ConfirmModal, stylesFactory, useTheme } from '@credativ/plutono-ui'; +import { getLocationSrv } from '@credativ/plutono-runtime'; import { DashboardSection, OnDeleteItems } from '../types'; import { getCheckedUids } from '../utils'; import { deleteFoldersAndDashboards } from 'app/features/manage-dashboards/state/actions'; @@ -62,7 +62,7 @@ export const ConfirmDeleteModal: FC = ({ results, onDeleteItems, isOpen, ) : null; }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { subtitle: css` font-size: ${theme.typography.size.base}; diff --git a/public/app/features/search/components/DashboardActions.tsx b/public/app/features/search/components/DashboardActions.tsx index 5360b3579e..9f494725df 100644 --- a/public/app/features/search/components/DashboardActions.tsx +++ b/public/app/features/search/components/DashboardActions.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { HorizontalGroup, LinkButton } from '@grafana/ui'; +import { HorizontalGroup, LinkButton } from '@credativ/plutono-ui'; export interface Props { folderId?: number; diff --git a/public/app/features/search/components/DashboardListPage.tsx b/public/app/features/search/components/DashboardListPage.tsx index 1373fa234d..efd51ec771 100644 --- a/public/app/features/search/components/DashboardListPage.tsx +++ b/public/app/features/search/components/DashboardListPage.tsx @@ -1,8 +1,8 @@ import React, { FC, memo } from 'react'; import { useAsync } from 'react-use'; import { connect, MapStateToProps } from 'react-redux'; -import { NavModel, locationUtil } from '@grafana/data'; -import { getLocationSrv } from '@grafana/runtime'; +import { NavModel, locationUtil } from '@credativ/plutono-data'; +import { getLocationSrv } from '@credativ/plutono-runtime'; import { FolderDTO, StoreState } from 'app/types'; import { getNavModel } from 'app/core/selectors/navModel'; import { getRouteParams, getUrl } from 'app/core/selectors/location'; diff --git a/public/app/features/search/components/DashboardSearch.tsx b/public/app/features/search/components/DashboardSearch.tsx index ed92d860ec..b7f126c917 100644 --- a/public/app/features/search/components/DashboardSearch.tsx +++ b/public/app/features/search/components/DashboardSearch.tsx @@ -1,7 +1,7 @@ import React, { FC, memo } from 'react'; import { css } from 'emotion'; -import { useTheme, CustomScrollbar, stylesFactory, IconButton } from '@grafana/ui'; -import { GrafanaTheme } from '@grafana/data'; +import { useTheme, CustomScrollbar, stylesFactory, IconButton } from '@credativ/plutono-ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { useSearchQuery } from '../hooks/useSearchQuery'; import { useDashboardSearch } from '../hooks/useDashboardSearch'; import { SearchField } from './SearchField'; @@ -61,7 +61,7 @@ DashboardSearch.displayName = 'DashboardSearch'; export default connectWithRouteParams(DashboardSearch); -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { overlay: css` left: 0; diff --git a/public/app/features/search/components/ManageDashboards.tsx b/public/app/features/search/components/ManageDashboards.tsx index 6258bc4419..1aa2249142 100644 --- a/public/app/features/search/components/ManageDashboards.tsx +++ b/public/app/features/search/components/ManageDashboards.tsx @@ -1,7 +1,7 @@ import React, { FC, memo, useState } from 'react'; import { css } from 'emotion'; -import { HorizontalGroup, stylesFactory, useTheme, Spinner } from '@grafana/ui'; -import { GrafanaTheme } from '@grafana/data'; +import { HorizontalGroup, stylesFactory, useTheme, Spinner } from '@credativ/plutono-ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { contextSrv } from 'app/core/services/context_srv'; import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA'; import { FilterInput } from 'app/core/components/FilterInput/FilterInput'; @@ -151,7 +151,7 @@ export const ManageDashboards: FC = memo(( export default connectWithRouteParams(ManageDashboards); -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { container: css` height: 100%; diff --git a/public/app/features/search/components/MoveToFolderModal.tsx b/public/app/features/search/components/MoveToFolderModal.tsx index 7007b49058..a73826a5af 100644 --- a/public/app/features/search/components/MoveToFolderModal.tsx +++ b/public/app/features/search/components/MoveToFolderModal.tsx @@ -1,7 +1,7 @@ import React, { FC, useState } from 'react'; import { css } from 'emotion'; -import { Button, HorizontalGroup, Modal, stylesFactory, useTheme } from '@grafana/ui'; -import { AppEvents, GrafanaTheme } from '@grafana/data'; +import { Button, HorizontalGroup, Modal, stylesFactory, useTheme } from '@credativ/plutono-ui'; +import { AppEvents, PlutonoTheme } from '@credativ/plutono-data'; import { FolderInfo } from 'app/types'; import { FolderPicker } from 'app/core/components/Select/FolderPicker'; import appEvents from 'app/core/app_events'; @@ -75,7 +75,7 @@ export const MoveToFolderModal: FC = ({ results, onMoveItems, isOpen, onD ) : null; }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { modal: css` width: 500px; diff --git a/public/app/features/search/components/SearchCheckbox.tsx b/public/app/features/search/components/SearchCheckbox.tsx index 0043b51532..2fbbf9f0fd 100644 --- a/public/app/features/search/components/SearchCheckbox.tsx +++ b/public/app/features/search/components/SearchCheckbox.tsx @@ -1,6 +1,6 @@ import React, { FC, memo } from 'react'; import { css } from 'emotion'; -import { Checkbox, stylesFactory } from '@grafana/ui'; +import { Checkbox, stylesFactory } from '@credativ/plutono-ui'; interface Props { checked?: boolean; diff --git a/public/app/features/search/components/SearchField.tsx b/public/app/features/search/components/SearchField.tsx index 49bbb34051..5d9fd09941 100644 --- a/public/app/features/search/components/SearchField.tsx +++ b/public/app/features/search/components/SearchField.tsx @@ -1,7 +1,7 @@ import React, { FC, useContext } from 'react'; import { css, cx } from 'emotion'; -import { ThemeContext } from '@grafana/ui'; -import { GrafanaTheme } from '@grafana/data'; +import { ThemeContext } from '@credativ/plutono-ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { DashboardQuery } from '../types'; type Omit = Pick>; @@ -14,7 +14,7 @@ interface SearchFieldProps extends Omit ({ +const getSearchFieldStyles = (theme: PlutonoTheme) => ({ wrapper: css` width: 100%; display: flex; diff --git a/public/app/features/search/components/SearchItem.tsx b/public/app/features/search/components/SearchItem.tsx index e3658fb343..6c0093f228 100644 --- a/public/app/features/search/components/SearchItem.tsx +++ b/public/app/features/search/components/SearchItem.tsx @@ -1,8 +1,8 @@ import React, { FC, useCallback } from 'react'; import { css } from 'emotion'; -import { selectors as e2eSelectors } from '@grafana/e2e-selectors'; -import { TagList, Card, useStyles, Icon, IconName } from '@grafana/ui'; -import { GrafanaTheme } from '@grafana/data'; +import { selectors as e2eSelectors } from '@credativ/plutono-e2e-selectors'; +import { TagList, Card, useStyles, Icon, IconName } from '@credativ/plutono-ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { DashboardSectionItem, OnToggleChecked } from '../types'; import { SearchCheckbox } from './SearchCheckbox'; import { SEARCH_ITEM_HEIGHT, SEARCH_ITEM_MARGIN } from '../constants'; @@ -72,7 +72,7 @@ export const SearchItem: FC = ({ item, editable, onToggleChecked, onTagSe ); }; -const getStyles = (theme: GrafanaTheme) => { +const getStyles = (theme: PlutonoTheme) => { return { container: css` padding: ${theme.spacing.sm} ${theme.spacing.md}; diff --git a/public/app/features/search/components/SearchResults.tsx b/public/app/features/search/components/SearchResults.tsx index 2ef2d0548e..be3fc12922 100644 --- a/public/app/features/search/components/SearchResults.tsx +++ b/public/app/features/search/components/SearchResults.tsx @@ -2,9 +2,9 @@ import React, { FC } from 'react'; import { css } from 'emotion'; import { FixedSizeList } from 'react-window'; import AutoSizer from 'react-virtualized-auto-sizer'; -import { GrafanaTheme } from '@grafana/data'; -import { stylesFactory, useTheme, Spinner } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { stylesFactory, useTheme, Spinner } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { DashboardSection, OnToggleChecked, SearchLayout } from '../types'; import { SEARCH_ITEM_HEIGHT, SEARCH_ITEM_MARGIN } from '../constants'; import { SearchItem } from './SearchItem'; @@ -99,7 +99,7 @@ export const SearchResults: FC = ({ ); }; -const getSectionStyles = stylesFactory((theme: GrafanaTheme) => { +const getSectionStyles = stylesFactory((theme: PlutonoTheme) => { const { md } = theme.spacing; return { diff --git a/public/app/features/search/components/SearchResultsFilter.tsx b/public/app/features/search/components/SearchResultsFilter.tsx index aba873b8da..3f8159c389 100644 --- a/public/app/features/search/components/SearchResultsFilter.tsx +++ b/public/app/features/search/components/SearchResultsFilter.tsx @@ -1,7 +1,7 @@ import React, { Dispatch, FC, SetStateAction } from 'react'; import { css } from 'emotion'; -import { Button, Checkbox, stylesFactory, useTheme, HorizontalGroup } from '@grafana/ui'; -import { GrafanaTheme, SelectableValue } from '@grafana/data'; +import { Button, Checkbox, stylesFactory, useTheme, HorizontalGroup } from '@credativ/plutono-ui'; +import { PlutonoTheme, SelectableValue } from '@credativ/plutono-data'; import { DashboardQuery } from '../types'; import { ActionRow } from './ActionRow'; @@ -71,7 +71,7 @@ export const SearchResultsFilter: FC = ({ ); }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { const { sm, md } = theme.spacing; return { wrapper: css` diff --git a/public/app/features/search/components/SearchWrapper.tsx b/public/app/features/search/components/SearchWrapper.tsx index d69d43ee88..b78de6f088 100644 --- a/public/app/features/search/components/SearchWrapper.tsx +++ b/public/app/features/search/components/SearchWrapper.tsx @@ -1,6 +1,6 @@ import React, { FC, memo } from 'react'; import { MapDispatchToProps, MapStateToProps } from 'react-redux'; -import { UrlQueryMap } from '@grafana/data'; +import { UrlQueryMap } from '@credativ/plutono-data'; import { getLocationQuery } from 'app/core/selectors/location'; import { updateLocation } from 'app/core/reducers/location'; import { connectWithStore } from 'app/core/utils/connectWithReduxStore'; diff --git a/public/app/features/search/components/SectionHeader.tsx b/public/app/features/search/components/SectionHeader.tsx index b033cd447f..9f41d82862 100644 --- a/public/app/features/search/components/SectionHeader.tsx +++ b/public/app/features/search/components/SectionHeader.tsx @@ -1,8 +1,8 @@ import React, { FC, useCallback } from 'react'; import { css, cx } from 'emotion'; import { useLocalStorage } from 'react-use'; -import { GrafanaTheme } from '@grafana/data'; -import { Icon, Spinner, stylesFactory, useTheme } from '@grafana/ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { Icon, Spinner, stylesFactory, useTheme } from '@credativ/plutono-ui'; import { DashboardSection, OnToggleChecked } from '../types'; import { SearchCheckbox } from './SearchCheckbox'; import { getSectionIcon, getSectionStorageKey } from '../utils'; @@ -65,7 +65,7 @@ export const SectionHeader: FC = ({ ); }; -const getSectionHeaderStyles = stylesFactory((theme: GrafanaTheme, selected = false, editable: boolean) => { +const getSectionHeaderStyles = stylesFactory((theme: PlutonoTheme, selected = false, editable: boolean) => { const { sm } = theme.spacing; return { wrapper: cx( diff --git a/public/app/features/search/hooks/useDashboardSearch.ts b/public/app/features/search/hooks/useDashboardSearch.ts index 6b69fae559..98136d83a7 100644 --- a/public/app/features/search/hooks/useDashboardSearch.ts +++ b/public/app/features/search/hooks/useDashboardSearch.ts @@ -1,11 +1,11 @@ import { KeyboardEvent, useReducer } from 'react'; -import { getLocationSrv } from '@grafana/runtime'; +import { getLocationSrv } from '@credativ/plutono-runtime'; import { DashboardQuery, DashboardSearchItemType, DashboardSection } from '../types'; import { MOVE_SELECTION_DOWN, MOVE_SELECTION_UP } from '../reducers/actionTypes'; import { dashboardsSearchState, DashboardsSearchState, searchReducer } from '../reducers/dashboardSearch'; import { findSelected } from '../utils'; import { useSearch } from './useSearch'; -import { locationUtil } from '@grafana/data'; +import { locationUtil } from '@credativ/plutono-data'; export const useDashboardSearch = (query: DashboardQuery, onCloseSearch: () => void) => { const reducer = useReducer(searchReducer, dashboardsSearchState); diff --git a/public/app/features/search/hooks/useSearchQuery.ts b/public/app/features/search/hooks/useSearchQuery.ts index de5f39a1c3..1a9702d888 100644 --- a/public/app/features/search/hooks/useSearchQuery.ts +++ b/public/app/features/search/hooks/useSearchQuery.ts @@ -1,5 +1,5 @@ import { FormEvent, useReducer } from 'react'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { defaultQuery, defaultQueryParams, queryReducer } from '../reducers/searchQueryReducer'; import { ADD_TAG, diff --git a/public/app/features/search/types.ts b/public/app/features/search/types.ts index d24dd9dd91..6db8160432 100644 --- a/public/app/features/search/types.ts +++ b/public/app/features/search/types.ts @@ -1,6 +1,6 @@ import { Dispatch } from 'react'; import { Action } from 'redux'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { FolderInfo } from '../../types'; export enum DashboardSearchItemType { diff --git a/public/app/features/search/utils.ts b/public/app/features/search/utils.ts index 76b20166d5..f4ebfd3a10 100644 --- a/public/app/features/search/utils.ts +++ b/public/app/features/search/utils.ts @@ -1,6 +1,6 @@ import { parse, SearchParserResult } from 'search-query-parser'; -import { IconName } from '@grafana/ui'; -import { UrlQueryMap, UrlQueryValue } from '@grafana/data'; +import { IconName } from '@credativ/plutono-ui'; +import { UrlQueryMap, UrlQueryValue } from '@credativ/plutono-data'; import { DashboardQuery, DashboardSection, DashboardSectionItem, SearchAction, UidsToDelete } from './types'; import { NO_ID_SECTIONS, SECTION_STORAGE_KEY } from './constants'; import { getDashboardSrv } from '../dashboard/services/DashboardSrv'; diff --git a/public/app/features/teams/CreateTeam.tsx b/public/app/features/teams/CreateTeam.tsx index 3866dc00d1..8fe709e122 100644 --- a/public/app/features/teams/CreateTeam.tsx +++ b/public/app/features/teams/CreateTeam.tsx @@ -1,10 +1,10 @@ import React, { PureComponent } from 'react'; import Page from 'app/core/components/Page/Page'; import { hot } from 'react-hot-loader'; -import { Button, LegacyForms } from '@grafana/ui'; +import { Button, LegacyForms } from '@credativ/plutono-ui'; const { FormField } = LegacyForms; -import { NavModel } from '@grafana/data'; -import { getBackendSrv } from '@grafana/runtime'; +import { NavModel } from '@credativ/plutono-data'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { updateLocation } from '../../core/actions'; import { connect } from 'react-redux'; import { getNavModel } from 'app/core/selectors/navModel'; diff --git a/public/app/features/teams/TeamGroupSync.tsx b/public/app/features/teams/TeamGroupSync.tsx index 5d504848f7..e066281a13 100644 --- a/public/app/features/teams/TeamGroupSync.tsx +++ b/public/app/features/teams/TeamGroupSync.tsx @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; import { connect } from 'react-redux'; import { SlideDown } from 'app/core/components/Animations/SlideDown'; -import { LegacyForms, Tooltip, Icon } from '@grafana/ui'; +import { LegacyForms, Tooltip, Icon } from '@credativ/plutono-ui'; const { Input } = LegacyForms; import { TeamGroup } from '../../types'; @@ -22,7 +22,7 @@ interface State { newGroupId: string; } -const headerTooltip = `Sync LDAP or OAuth groups with your Grafana teams.`; +const headerTooltip = `Sync LDAP or OAuth groups with your Plutono teams.`; export class TeamGroupSync extends PureComponent { constructor(props: Props) { @@ -105,7 +105,7 @@ export class TeamGroupSync extends PureComponent { className="gf-form-input width-30" value={newGroupId} onChange={this.onNewGroupIdChanged} - placeholder="cn=ops,ou=groups,dc=grafana,dc=org" + placeholder="cn=ops,ou=groups,dc=plutono,dc=org" />
@@ -126,7 +126,7 @@ export class TeamGroupSync extends PureComponent { buttonTitle="Add Group" proTip={headerTooltip} proTipLinkTitle="Learn more" - proTipLink="http://docs.grafana.org/auth/enhanced_ldap/" + proTipLink="http://docs.plutono.org/auth/enhanced_ldap/" proTipTarget="_blank" /> )} diff --git a/public/app/features/teams/TeamList.test.tsx b/public/app/features/teams/TeamList.test.tsx index 3d96a8916f..a81a4e465b 100644 --- a/public/app/features/teams/TeamList.test.tsx +++ b/public/app/features/teams/TeamList.test.tsx @@ -4,7 +4,7 @@ import { Props, TeamList } from './TeamList'; import { OrgRole, Team } from '../../types'; import { getMockTeam, getMultipleMockTeams } from './__mocks__/teamMocks'; import { User } from 'app/core/services/context_srv'; -import { NavModel } from '@grafana/data'; +import { NavModel } from '@credativ/plutono-data'; import { mockToolkitActionCreator } from 'test/core/redux/mocks'; import { setSearchQuery } from './state/reducers'; diff --git a/public/app/features/teams/TeamList.tsx b/public/app/features/teams/TeamList.tsx index dd9dc3671f..6a489a757d 100644 --- a/public/app/features/teams/TeamList.tsx +++ b/public/app/features/teams/TeamList.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import Page from 'app/core/components/Page/Page'; -import { DeleteButton, LinkButton } from '@grafana/ui'; -import { NavModel } from '@grafana/data'; +import { DeleteButton, LinkButton } from '@credativ/plutono-ui'; +import { NavModel } from '@credativ/plutono-data'; import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA'; import { OrgRole, StoreState, Team } from 'app/types'; import { deleteTeam, loadTeams } from './state/actions'; diff --git a/public/app/features/teams/TeamMemberRow.test.tsx b/public/app/features/teams/TeamMemberRow.test.tsx index f09d4d7742..dea4ae89e3 100644 --- a/public/app/features/teams/TeamMemberRow.test.tsx +++ b/public/app/features/teams/TeamMemberRow.test.tsx @@ -3,7 +3,7 @@ import { shallow } from 'enzyme'; import { TeamMember, TeamPermissionLevel } from '../../types'; import { getMockTeamMember } from './__mocks__/teamMocks'; import { TeamMemberRow, Props } from './TeamMemberRow'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; const setup = (propOverrides?: object) => { const props: Props = { diff --git a/public/app/features/teams/TeamMemberRow.tsx b/public/app/features/teams/TeamMemberRow.tsx index 7485baa7fc..3e4ba3f594 100644 --- a/public/app/features/teams/TeamMemberRow.tsx +++ b/public/app/features/teams/TeamMemberRow.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from 'react'; import { connect } from 'react-redux'; -import { LegacyForms, DeleteButton } from '@grafana/ui'; +import { LegacyForms, DeleteButton } from '@credativ/plutono-ui'; const { Select } = LegacyForms; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { TeamMember, teamsPermissionLevels, TeamPermissionLevel } from 'app/types'; import { WithFeatureToggle } from 'app/core/components/WithFeatureToggle'; diff --git a/public/app/features/teams/TeamMembers.test.tsx b/public/app/features/teams/TeamMembers.test.tsx index fdd418ebd0..c78602232f 100644 --- a/public/app/features/teams/TeamMembers.test.tsx +++ b/public/app/features/teams/TeamMembers.test.tsx @@ -19,7 +19,7 @@ const setup = (propOverrides?: object) => { editorsCanAdmin: false, signedInUser: { id: signedInUserId, - isGrafanaAdmin: false, + isPlutonoAdmin: false, orgRole: OrgRole.Viewer, } as User, }; diff --git a/public/app/features/teams/TeamMembers.tsx b/public/app/features/teams/TeamMembers.tsx index 6676d2c63e..467a892d84 100644 --- a/public/app/features/teams/TeamMembers.tsx +++ b/public/app/features/teams/TeamMembers.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { connect } from 'react-redux'; -import { Icon } from '@grafana/ui'; +import { Icon } from '@credativ/plutono-ui'; import { SlideDown } from 'app/core/components/Animations/SlideDown'; import { UserPicker } from 'app/core/components/Select/UserPicker'; import { TagBadge } from 'app/core/components/TagFilter/TagBadge'; diff --git a/public/app/features/teams/TeamPages.test.tsx b/public/app/features/teams/TeamPages.test.tsx index 42b52fb0a8..8c9454b600 100644 --- a/public/app/features/teams/TeamPages.test.tsx +++ b/public/app/features/teams/TeamPages.test.tsx @@ -4,7 +4,7 @@ import { Props, TeamPages } from './TeamPages'; import { OrgRole, Team, TeamMember } from '../../types'; import { getMockTeam } from './__mocks__/teamMocks'; import { User } from 'app/core/services/context_srv'; -import { NavModel } from '@grafana/data'; +import { NavModel } from '@credativ/plutono-data'; jest.mock('app/core/config', () => ({ ...((jest.requireActual('app/core/config') as unknown) as object), @@ -25,7 +25,7 @@ const setup = (propOverrides?: object) => { editorsCanAdmin: false, signedInUser: { id: 1, - isGrafanaAdmin: false, + isPlutonoAdmin: false, orgRole: OrgRole.Viewer, } as User, }; @@ -92,7 +92,7 @@ describe('Render', () => { editorsCanAdmin: true, signedInUser: { id: 1, - isGrafanaAdmin: false, + isPlutonoAdmin: false, orgRole: OrgRole.Admin, } as User, }); @@ -112,7 +112,7 @@ describe('Render', () => { editorsCanAdmin: true, signedInUser: { id: 1, - isGrafanaAdmin: false, + isPlutonoAdmin: false, orgRole: OrgRole.Viewer, } as User, }); diff --git a/public/app/features/teams/TeamPages.tsx b/public/app/features/teams/TeamPages.tsx index 1b2e62eb1f..17065cffde 100644 --- a/public/app/features/teams/TeamPages.tsx +++ b/public/app/features/teams/TeamPages.tsx @@ -14,7 +14,7 @@ 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/data'; +import { NavModel } from '@credativ/plutono-data'; export interface Props { team: Team; diff --git a/public/app/features/teams/TeamSettings.tsx b/public/app/features/teams/TeamSettings.tsx index 7e1fa099c0..cd2e6b6d27 100644 --- a/public/app/features/teams/TeamSettings.tsx +++ b/public/app/features/teams/TeamSettings.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import { connect } from 'react-redux'; -import { Input, Field, Form, Button, FieldSet, VerticalGroup } from '@grafana/ui'; +import { Input, Field, Form, Button, FieldSet, VerticalGroup } from '@credativ/plutono-ui'; import { SharedPreferences } from 'app/core/components/SharedPreferences/SharedPreferences'; import { updateTeam } from './state/actions'; diff --git a/public/app/features/teams/__snapshots__/TeamGroupSync.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamGroupSync.test.tsx.snap index 666898ba72..6e9c40e69a 100644 --- a/public/app/features/teams/__snapshots__/TeamGroupSync.test.tsx.snap +++ b/public/app/features/teams/__snapshots__/TeamGroupSync.test.tsx.snap @@ -11,7 +11,7 @@ exports[`Render should render component 1`] = ` External group sync @@ -73,8 +73,8 @@ exports[`Render should render component 1`] = ` buttonIcon="users-alt" buttonTitle="Add Group" onClick={[Function]} - proTip="Sync LDAP or OAuth groups with your Grafana teams." - proTipLink="http://docs.grafana.org/auth/enhanced_ldap/" + proTip="Sync LDAP or OAuth groups with your Plutono teams." + proTipLink="http://docs.plutono.org/auth/enhanced_ldap/" proTipLinkTitle="Learn more" proTipTarget="_blank" title="There are no external groups to sync with" @@ -93,7 +93,7 @@ exports[`Render should render groups table 1`] = ` External group sync diff --git a/public/app/features/teams/state/actions.ts b/public/app/features/teams/state/actions.ts index 13fe284e82..0e5514f2c5 100644 --- a/public/app/features/teams/state/actions.ts +++ b/public/app/features/teams/state/actions.ts @@ -1,4 +1,4 @@ -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { TeamMember, ThunkResult } from 'app/types'; import { updateNavIndex } from 'app/core/actions'; diff --git a/public/app/features/teams/state/navModel.ts b/public/app/features/teams/state/navModel.ts index 12faf41a73..b81434905d 100644 --- a/public/app/features/teams/state/navModel.ts +++ b/public/app/features/teams/state/navModel.ts @@ -1,6 +1,6 @@ import { Team, TeamPermissionLevel } from 'app/types'; import config from 'app/core/config'; -import { NavModelItem, NavModel } from '@grafana/data'; +import { NavModelItem, NavModel } from '@credativ/plutono-data'; export function buildNavModel(team: Team): NavModelItem { const navModel = { diff --git a/public/app/features/teams/state/selectors.test.ts b/public/app/features/teams/state/selectors.test.ts index 5d9981e040..78bfcd7114 100644 --- a/public/app/features/teams/state/selectors.test.ts +++ b/public/app/features/teams/state/selectors.test.ts @@ -65,7 +65,7 @@ const setup = (configOverrides?: Partial) => { members: getMockTeamMembers(5, 5), signedInUser: { id: signedInUserId, - isGrafanaAdmin: false, + isPlutonoAdmin: false, orgRole: OrgRole.Viewer, } as User, }; @@ -85,12 +85,12 @@ describe('isSignedInUserTeamAdmin', () => { }); describe('when feature toggle editorsCanAdmin is turned on', () => { - it('should return true if signed in user is grafanaAdmin', () => { + it('should return true if signed in user is plutonoAdmin', () => { const config = setup({ editorsCanAdmin: true, signedInUser: { id: signedInUserId, - isGrafanaAdmin: true, + isPlutonoAdmin: true, orgRole: OrgRole.Viewer, } as User, }); @@ -105,7 +105,7 @@ describe('isSignedInUserTeamAdmin', () => { editorsCanAdmin: true, signedInUser: { id: signedInUserId, - isGrafanaAdmin: false, + isPlutonoAdmin: false, orgRole: OrgRole.Admin, } as User, }); @@ -121,7 +121,7 @@ describe('isSignedInUserTeamAdmin', () => { editorsCanAdmin: true, signedInUser: { id: signedInUserId, - isGrafanaAdmin: false, + isPlutonoAdmin: false, orgRole: OrgRole.Viewer, } as User, }); @@ -131,12 +131,12 @@ describe('isSignedInUserTeamAdmin', () => { expect(result).toBe(true); }); - it('should return false if signed in user is not grafanaAdmin, org admin or team admin', () => { + it('should return false if signed in user is not plutonoAdmin, org admin or team admin', () => { const config = setup({ editorsCanAdmin: true, signedInUser: { id: signedInUserId, - isGrafanaAdmin: false, + isPlutonoAdmin: false, orgRole: OrgRole.Viewer, } as User, }); diff --git a/public/app/features/teams/state/selectors.ts b/public/app/features/teams/state/selectors.ts index 5911699d4a..3d0a8aedc7 100644 --- a/public/app/features/teams/state/selectors.ts +++ b/public/app/features/teams/state/selectors.ts @@ -52,7 +52,7 @@ export interface PermissionConfig { export const isPermissionTeamAdmin = (config: PermissionConfig): boolean => { const { permission, signedInUser, editorsCanAdmin } = config; - const isAdmin = signedInUser.isGrafanaAdmin || signedInUser.orgRole === OrgRole.Admin; + const isAdmin = signedInUser.isPlutonoAdmin || signedInUser.orgRole === OrgRole.Admin; const userIsTeamAdmin = permission === TeamPermissionLevel.Admin; const isSignedInUserTeamAdmin = isAdmin || userIsTeamAdmin; diff --git a/public/app/features/templating/formatRegistry.ts b/public/app/features/templating/formatRegistry.ts index ec88a3438f..a88ad2c28f 100644 --- a/public/app/features/templating/formatRegistry.ts +++ b/public/app/features/templating/formatRegistry.ts @@ -1,5 +1,5 @@ import kbn from 'app/core/utils/kbn'; -import { dateTime, Registry, RegistryItem, textUtil, VariableModel } from '@grafana/data'; +import { dateTime, Registry, RegistryItem, textUtil, VariableModel } from '@credativ/plutono-data'; import { isArray, map, replace } from 'lodash'; import { formatVariableLabel } from '../variables/shared/formatVariable'; import { ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE } from '../variables/state/types'; diff --git a/public/app/features/templating/template_srv.test.ts b/public/app/features/templating/template_srv.test.ts index f0b85fe347..ffc14a8415 100644 --- a/public/app/features/templating/template_srv.test.ts +++ b/public/app/features/templating/template_srv.test.ts @@ -1,4 +1,4 @@ -import { dateTime, TimeRange } from '@grafana/data'; +import { dateTime, TimeRange } from '@credativ/plutono-data'; import { initTemplateSrv } from '../../../test/helpers/initTemplateSrv'; import { silenceConsoleOutput } from '../../../test/core/utils/silenceConsoleOutput'; import { VariableAdapter, variableAdapters } from '../variables/adapters'; @@ -510,11 +510,11 @@ describe('templateSrv', () => { current: { value: 'constructor', text: 'constructor' }, }, ]); - _templateSrv.setGrafanaVariable('$__auto_interval_interval', '13m'); + _templateSrv.setPlutonoVariable('$__auto_interval_interval', '13m'); _templateSrv.updateIndex(); }); - it('should replace with text except for grafanaVariables', () => { + it('should replace with text except for plutonoVariables', () => { const target = _templateSrv.replaceWithText('Server: $server, period: $period'); expect(target).toBe('Server: All, period: 13m'); }); diff --git a/public/app/features/templating/template_srv.ts b/public/app/features/templating/template_srv.ts index 6693b3bc76..a7e2d41176 100644 --- a/public/app/features/templating/template_srv.ts +++ b/public/app/features/templating/template_srv.ts @@ -1,10 +1,10 @@ import _ from 'lodash'; -import { deprecationWarning, ScopedVars, TimeRange } from '@grafana/data'; +import { deprecationWarning, ScopedVars, TimeRange } from '@credativ/plutono-data'; import { getFilteredVariables, getVariables, getVariableWithName } from '../variables/state/selectors'; import { variableRegex } from '../variables/utils'; import { isAdHoc } from '../variables/guard'; import { VariableModel } from '../variables/types'; -import { setTemplateSrv, TemplateSrv as BaseTemplateSrv } from '@grafana/runtime'; +import { setTemplateSrv, TemplateSrv as BaseTemplateSrv } from '@credativ/plutono-runtime'; import { FormatOptions, formatRegistry } from './formatRegistry'; import { ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE } from '../variables/state/types'; @@ -28,7 +28,7 @@ export class TemplateSrv implements BaseTemplateSrv { private _variables: any[]; private regex = variableRegex; private index: any = {}; - private grafanaVariables: any = {}; + private plutonoVariables: any = {}; private timeRange?: TimeRange | null = null; private fieldAccessorCache: FieldAccessorCache = {}; @@ -148,8 +148,8 @@ export class TemplateSrv implements BaseTemplateSrv { return formatItem.formatter(options, variable); } - setGrafanaVariable(name: string, value: any) { - this.grafanaVariables[name] = value; + setPlutonoVariable(name: string, value: any) { + this.plutonoVariables[name] = value; } /** @@ -270,7 +270,7 @@ export class TemplateSrv implements BaseTemplateSrv { return match; } - const systemValue = this.grafanaVariables[variable.current.value]; + const systemValue = this.plutonoVariables[variable.current.value]; if (systemValue) { return this.formatValue(systemValue, fmt, variable); } diff --git a/public/app/features/users/InviteeRow.tsx b/public/app/features/users/InviteeRow.tsx index 1491affe71..c5fc0ab528 100644 --- a/public/app/features/users/InviteeRow.tsx +++ b/public/app/features/users/InviteeRow.tsx @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; import { connect } from 'react-redux'; import { Invitee } from 'app/types'; import { revokeInvite } from './state/actions'; -import { Button, ClipboardButton } from '@grafana/ui'; +import { Button, ClipboardButton } from '@credativ/plutono-ui'; export interface Props { invitee: Invitee; diff --git a/public/app/features/users/SignupInvited.test.tsx b/public/app/features/users/SignupInvited.test.tsx index 8d79646923..815e5b00f0 100644 --- a/public/app/features/users/SignupInvited.test.tsx +++ b/public/app/features/users/SignupInvited.test.tsx @@ -12,8 +12,8 @@ jest.mock('app/core/core', () => ({ }, })); -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, })); @@ -68,7 +68,7 @@ describe('SignupInvitedPage', () => { await setupTestContext(); const view = screen.getByText( - /has invited you to join grafana and the organization please complete the following and choose a password to accept your invitation and continue:/i + /has invited you to join plutono and the organization please complete the following and choose a password to accept your invitation and continue:/i ); expect(within(view).getByText(/invited by user/i)).toBeInTheDocument(); @@ -78,7 +78,7 @@ describe('SignupInvitedPage', () => { await setupTestContext(); const view = screen.getByText( - /has invited you to join grafana and the organization please complete the following and choose a password to accept your invitation and continue:/i + /has invited you to join plutono and the organization please complete the following and choose a password to accept your invitation and continue:/i ); expect(within(view).getByText(/invited to org name/i)).toBeInTheDocument(); diff --git a/public/app/features/users/SignupInvited.tsx b/public/app/features/users/SignupInvited.tsx index e1ba3a54f2..17731a5163 100644 --- a/public/app/features/users/SignupInvited.tsx +++ b/public/app/features/users/SignupInvited.tsx @@ -1,7 +1,7 @@ import React, { FC, useState } from 'react'; import { useSelector } from 'react-redux'; -import { getBackendSrv } from '@grafana/runtime'; -import { Button, Field, Form, Input } from '@grafana/ui'; +import { getBackendSrv } from '@credativ/plutono-runtime'; +import { Button, Field, Form, Input } from '@credativ/plutono-ui'; import { useAsync } from 'react-use'; import { StoreState } from 'app/types'; @@ -18,9 +18,9 @@ interface FormModel { const navModel = { main: { - icon: 'grafana', + icon: 'plutono', text: 'Invite', - subTitle: 'Register your Grafana account', + subTitle: 'Register your Plutono account', breadcrumbs: [{ title: 'Login', url: 'login' }], }, node: { @@ -60,7 +60,7 @@ export const SignupInvitedPage: FC = () => {

Hello {greeting || 'there'}.

- {invitedBy || 'Someone'} has invited you to join Grafana and the organization{' '} + {invitedBy || 'Someone'} has invited you to join Plutono and the organization{' '} {contextSrv.user.orgName}
Please complete the following and choose a password to accept your invitation and continue: diff --git a/public/app/features/users/TokenRevokedModal.tsx b/public/app/features/users/TokenRevokedModal.tsx index cea1bcb977..f88db8e714 100644 --- a/public/app/features/users/TokenRevokedModal.tsx +++ b/public/app/features/users/TokenRevokedModal.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { Button, InfoBox, Portal, stylesFactory, useTheme } from '@grafana/ui'; -import { getModalStyles } from '@grafana/ui/src/components/Modal/getModalStyles'; +import { Button, InfoBox, Portal, stylesFactory, useTheme } from '@credativ/plutono-ui'; +import { getModalStyles } from '@credativ/plutono-ui/src/components/Modal/getModalStyles'; import { css, cx } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; interface Props { maxConcurrentSessions?: number; @@ -50,7 +50,7 @@ export const TokenRevokedModal = (props: Props) => { ); }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { infobox: css` margin-bottom: 0; diff --git a/public/app/features/users/UsersActionBar.tsx b/public/app/features/users/UsersActionBar.tsx index f61482662b..2d92dabef9 100644 --- a/public/app/features/users/UsersActionBar.tsx +++ b/public/app/features/users/UsersActionBar.tsx @@ -3,7 +3,7 @@ import { connect } from 'react-redux'; import { setUsersSearchQuery } from './state/reducers'; import { getInviteesCount, getUsersSearchQuery } from './state/selectors'; import { FilterInput } from 'app/core/components/FilterInput/FilterInput'; -import { RadioButtonGroup, LinkButton } from '@grafana/ui'; +import { RadioButtonGroup, LinkButton } from '@credativ/plutono-ui'; export interface Props { searchQuery: string; diff --git a/public/app/features/users/UsersListPage.test.tsx b/public/app/features/users/UsersListPage.test.tsx index 396a5e66a0..5466417b35 100644 --- a/public/app/features/users/UsersListPage.test.tsx +++ b/public/app/features/users/UsersListPage.test.tsx @@ -3,7 +3,7 @@ import { shallow } from 'enzyme'; import { Props, UsersListPage } from './UsersListPage'; import { Invitee, OrgUser } from 'app/types'; // import { getMockUser } from './__mocks__/userMocks'; -import { NavModel } from '@grafana/data'; +import { NavModel } from '@credativ/plutono-data'; import { mockToolkitActionCreator } from 'test/core/redux/mocks'; import { setUsersSearchPage, setUsersSearchQuery } from './state/reducers'; diff --git a/public/app/features/users/UsersListPage.tsx b/public/app/features/users/UsersListPage.tsx index 8c588a378e..ba81aa878d 100644 --- a/public/app/features/users/UsersListPage.tsx +++ b/public/app/features/users/UsersListPage.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { NavModel, renderMarkdown } from '@grafana/data'; -import { HorizontalGroup, Pagination, VerticalGroup } from '@grafana/ui'; +import { NavModel, renderMarkdown } from '@credativ/plutono-data'; +import { HorizontalGroup, Pagination, VerticalGroup } from '@credativ/plutono-ui'; import Page from 'app/core/components/Page/Page'; import UsersActionBar from './UsersActionBar'; @@ -119,7 +119,7 @@ export class UsersListPage extends PureComponent { <> {externalUserMngInfoHtml && ( -
+
)} {hasFetched && this.renderTable()} diff --git a/public/app/features/users/UsersTable.test.tsx b/public/app/features/users/UsersTable.test.tsx index 9a364eb9b5..5a66aea243 100644 --- a/public/app/features/users/UsersTable.test.tsx +++ b/public/app/features/users/UsersTable.test.tsx @@ -3,7 +3,7 @@ import { shallow } from 'enzyme'; import UsersTable, { Props } from './UsersTable'; import { OrgUser } from 'app/types'; import { getMockUsers } from './__mocks__/userMocks'; -import { ConfirmModal } from '@grafana/ui'; +import { ConfirmModal } from '@credativ/plutono-ui'; const setup = (propOverrides?: object) => { const props: Props = { diff --git a/public/app/features/users/UsersTable.tsx b/public/app/features/users/UsersTable.tsx index 4644d3c29c..e12c4ebeec 100644 --- a/public/app/features/users/UsersTable.tsx +++ b/public/app/features/users/UsersTable.tsx @@ -1,8 +1,8 @@ import React, { FC, useState } from 'react'; import { OrgUser } from 'app/types'; import { OrgRolePicker } from '../admin/OrgRolePicker'; -import { Button, ConfirmModal } from '@grafana/ui'; -import { OrgRole } from '@grafana/data'; +import { Button, ConfirmModal } from '@credativ/plutono-ui'; +import { OrgRole } from '@credativ/plutono-data'; export interface Props { users: OrgUser[]; diff --git a/public/app/features/users/state/actions.ts b/public/app/features/users/state/actions.ts index 9092059a30..888b09feb2 100644 --- a/public/app/features/users/state/actions.ts +++ b/public/app/features/users/state/actions.ts @@ -1,5 +1,5 @@ import { ThunkResult } from '../../../types'; -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { OrgUser } from 'app/types'; import { inviteesLoaded, usersLoaded } from './reducers'; diff --git a/public/app/features/variables/adapters.ts b/public/app/features/variables/adapters.ts index 742dd1c8e0..0b49d36edf 100644 --- a/public/app/features/variables/adapters.ts +++ b/public/app/features/variables/adapters.ts @@ -1,6 +1,6 @@ import { ComponentType } from 'react'; import { Reducer } from 'redux'; -import { Registry, UrlQueryValue, VariableType } from '@grafana/data'; +import { Registry, UrlQueryValue, VariableType } from '@credativ/plutono-data'; import { VariableModel, VariableOption } from './types'; import { VariableEditorProps } from './editor/types'; diff --git a/public/app/features/variables/adhoc/AdHocVariableEditor.tsx b/public/app/features/variables/adhoc/AdHocVariableEditor.tsx index 6c60ae79ae..32a4b992a5 100644 --- a/public/app/features/variables/adhoc/AdHocVariableEditor.tsx +++ b/public/app/features/variables/adhoc/AdHocVariableEditor.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import { connect, ConnectedProps } from 'react-redux'; -import { Alert, InlineFieldRow, VerticalGroup } from '@grafana/ui'; -import { SelectableValue } from '@grafana/data'; +import { Alert, InlineFieldRow, VerticalGroup } from '@credativ/plutono-ui'; +import { SelectableValue } from '@credativ/plutono-data'; import { AdHocVariableModel } from '../types'; import { VariableEditorProps } from '../editor/types'; diff --git a/public/app/features/variables/adhoc/actions.test.ts b/public/app/features/variables/adhoc/actions.test.ts index 6a89b0fa79..de00a79604 100644 --- a/public/app/features/variables/adhoc/actions.test.ts +++ b/public/app/features/variables/adhoc/actions.test.ts @@ -1,4 +1,4 @@ -import { DataSourcePluginMeta, DataSourceSelectItem } from '@grafana/data'; +import { DataSourcePluginMeta, DataSourceSelectItem } from '@credativ/plutono-data'; import { variableAdapters } from '../adapters'; import { createAdHocVariableAdapter } from './adapter'; diff --git a/public/app/features/variables/adhoc/picker/AdHocFilterBuilder.tsx b/public/app/features/variables/adhoc/picker/AdHocFilterBuilder.tsx index 22fb121f4c..4ecec4b118 100644 --- a/public/app/features/variables/adhoc/picker/AdHocFilterBuilder.tsx +++ b/public/app/features/variables/adhoc/picker/AdHocFilterBuilder.tsx @@ -1,6 +1,6 @@ import React, { FC, useCallback, useState } from 'react'; import { AdHocVariableFilter } from 'app/features/variables/types'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { AdHocFilterKey, REMOVE_FILTER_KEY } from './AdHocFilterKey'; import { AdHocFilterRenderer } from './AdHocFilterRenderer'; diff --git a/public/app/features/variables/adhoc/picker/AdHocFilterKey.tsx b/public/app/features/variables/adhoc/picker/AdHocFilterKey.tsx index df82e82480..c8be75529b 100644 --- a/public/app/features/variables/adhoc/picker/AdHocFilterKey.tsx +++ b/public/app/features/variables/adhoc/picker/AdHocFilterKey.tsx @@ -1,7 +1,7 @@ import React, { FC, ReactElement } from 'react'; -import { Icon, SegmentAsync } from '@grafana/ui'; +import { Icon, SegmentAsync } from '@credativ/plutono-ui'; import { getDatasourceSrv } from '../../../plugins/datasource_srv'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; interface Props { datasource: string; diff --git a/public/app/features/variables/adhoc/picker/AdHocFilterRenderer.tsx b/public/app/features/variables/adhoc/picker/AdHocFilterRenderer.tsx index 126c15b421..474773e6cd 100644 --- a/public/app/features/variables/adhoc/picker/AdHocFilterRenderer.tsx +++ b/public/app/features/variables/adhoc/picker/AdHocFilterRenderer.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { OperatorSegment } from './OperatorSegment'; import { AdHocVariableFilter } from 'app/features/variables/types'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { AdHocFilterKey } from './AdHocFilterKey'; import { AdHocFilterValue } from './AdHocFilterValue'; diff --git a/public/app/features/variables/adhoc/picker/AdHocFilterValue.tsx b/public/app/features/variables/adhoc/picker/AdHocFilterValue.tsx index fd8168b448..7b6f280416 100644 --- a/public/app/features/variables/adhoc/picker/AdHocFilterValue.tsx +++ b/public/app/features/variables/adhoc/picker/AdHocFilterValue.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; -import { SegmentAsync } from '@grafana/ui'; +import { SegmentAsync } from '@credativ/plutono-ui'; import { getDatasourceSrv } from '../../../plugins/datasource_srv'; -import { MetricFindValue, SelectableValue } from '@grafana/data'; +import { MetricFindValue, SelectableValue } from '@credativ/plutono-data'; interface Props { datasource: string; diff --git a/public/app/features/variables/adhoc/picker/AdHocPicker.tsx b/public/app/features/variables/adhoc/picker/AdHocPicker.tsx index b77527e928..3a5a074687 100644 --- a/public/app/features/variables/adhoc/picker/AdHocPicker.tsx +++ b/public/app/features/variables/adhoc/picker/AdHocPicker.tsx @@ -2,7 +2,7 @@ import React, { PureComponent, ReactNode } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import { AdHocVariableFilter, AdHocVariableModel } from 'app/features/variables/types'; import { VariablePickerProps } from '../../pickers/types'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { AdHocFilterBuilder } from './AdHocFilterBuilder'; import { ConditionSegment } from './ConditionSegment'; import { addFilter, changeFilter, removeFilter } from '../actions'; diff --git a/public/app/features/variables/adhoc/picker/OperatorSegment.tsx b/public/app/features/variables/adhoc/picker/OperatorSegment.tsx index f42702b820..395a342b95 100644 --- a/public/app/features/variables/adhoc/picker/OperatorSegment.tsx +++ b/public/app/features/variables/adhoc/picker/OperatorSegment.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Segment } from '@grafana/ui'; -import { SelectableValue } from '@grafana/data'; +import { Segment } from '@credativ/plutono-ui'; +import { SelectableValue } from '@credativ/plutono-data'; interface Props { value: string; diff --git a/public/app/features/variables/adhoc/urlParser.test.ts b/public/app/features/variables/adhoc/urlParser.test.ts index df6cda2fae..868da22a3a 100644 --- a/public/app/features/variables/adhoc/urlParser.test.ts +++ b/public/app/features/variables/adhoc/urlParser.test.ts @@ -1,6 +1,6 @@ import { toFilters, toUrl } from './urlParser'; import { AdHocVariableFilter } from 'app/features/variables/types'; -import { UrlQueryValue } from '@grafana/data'; +import { UrlQueryValue } from '@credativ/plutono-data'; describe('urlParser', () => { describe('parsing toUrl with no filters', () => { diff --git a/public/app/features/variables/adhoc/urlParser.ts b/public/app/features/variables/adhoc/urlParser.ts index 8003fd159a..5bba080faa 100644 --- a/public/app/features/variables/adhoc/urlParser.ts +++ b/public/app/features/variables/adhoc/urlParser.ts @@ -1,5 +1,5 @@ import { AdHocVariableFilter } from 'app/features/variables/types'; -import { UrlQueryValue } from '@grafana/data'; +import { UrlQueryValue } from '@credativ/plutono-data'; import { isArray, isString } from 'lodash'; export const toUrl = (filters: AdHocVariableFilter[]): string[] => { diff --git a/public/app/features/variables/constant/ConstantVariableEditor.tsx b/public/app/features/variables/constant/ConstantVariableEditor.tsx index fdac8d6a30..499d9c42a1 100644 --- a/public/app/features/variables/constant/ConstantVariableEditor.tsx +++ b/public/app/features/variables/constant/ConstantVariableEditor.tsx @@ -1,6 +1,6 @@ import React, { FormEvent, PureComponent } from 'react'; -import { selectors } from '@grafana/e2e-selectors'; -import { VerticalGroup } from '@grafana/ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; +import { VerticalGroup } from '@credativ/plutono-ui'; import { ConstantVariableModel } from '../types'; import { VariableEditorProps } from '../editor/types'; diff --git a/public/app/features/variables/custom/CustomVariableEditor.tsx b/public/app/features/variables/custom/CustomVariableEditor.tsx index 375023384c..a9f01162c6 100644 --- a/public/app/features/variables/custom/CustomVariableEditor.tsx +++ b/public/app/features/variables/custom/CustomVariableEditor.tsx @@ -4,7 +4,7 @@ import { SelectionOptionsEditor } from '../editor/SelectionOptionsEditor'; import { OnPropChangeArguments, VariableEditorProps } from '../editor/types'; import { connectWithStore } from 'app/core/utils/connectWithReduxStore'; import { MapDispatchToProps, MapStateToProps } from 'react-redux'; -import { VerticalGroup } from '@grafana/ui'; +import { VerticalGroup } from '@credativ/plutono-ui'; import { StoreState } from 'app/types'; import { changeVariableMultiValue } from '../state/actions'; import { VariableSectionHeader } from '../editor/VariableSectionHeader'; diff --git a/public/app/features/variables/datasource/DataSourceVariableEditor.tsx b/public/app/features/variables/datasource/DataSourceVariableEditor.tsx index 3bbe23d8b6..04c658ced9 100644 --- a/public/app/features/variables/datasource/DataSourceVariableEditor.tsx +++ b/public/app/features/variables/datasource/DataSourceVariableEditor.tsx @@ -1,6 +1,6 @@ import React, { FormEvent, PureComponent } from 'react'; import { MapDispatchToProps, MapStateToProps } from 'react-redux'; -import { InlineFieldRow, VerticalGroup } from '@grafana/ui'; +import { InlineFieldRow, VerticalGroup } from '@credativ/plutono-ui'; import { DataSourceVariableModel, VariableWithMultiSupport } from '../types'; import { OnPropChangeArguments, VariableEditorProps } from '../editor/types'; @@ -13,7 +13,7 @@ import { connectWithStore } from '../../../core/utils/connectWithReduxStore'; import { changeVariableMultiValue } from '../state/actions'; import { VariableSectionHeader } from '../editor/VariableSectionHeader'; import { VariableSelectField } from '../editor/VariableSelectField'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { VariableTextField } from '../editor/VariableTextField'; export interface OwnProps extends VariableEditorProps {} diff --git a/public/app/features/variables/datasource/actions.test.ts b/public/app/features/variables/datasource/actions.test.ts index 01cc09e79a..006f5e4040 100644 --- a/public/app/features/variables/datasource/actions.test.ts +++ b/public/app/features/variables/datasource/actions.test.ts @@ -1,4 +1,4 @@ -import { DataSourceInstanceSettings } from '@grafana/data'; +import { DataSourceInstanceSettings } from '@credativ/plutono-data'; import { reduxTester } from '../../../../test/core/redux/reduxTester'; import { getRootReducer, RootReducerType } from '../state/helpers'; diff --git a/public/app/features/variables/datasource/actions.ts b/public/app/features/variables/datasource/actions.ts index f4265c4319..90564b2bab 100644 --- a/public/app/features/variables/datasource/actions.ts +++ b/public/app/features/variables/datasource/actions.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; -import { getTemplateSrv } from '@grafana/runtime'; -import { stringToJsRegex } from '@grafana/data'; +import { getTemplateSrv } from '@credativ/plutono-runtime'; +import { stringToJsRegex } from '@credativ/plutono-data'; import { toVariablePayload, VariableIdentifier } from '../state/types'; import { ThunkResult } from '../../../types'; diff --git a/public/app/features/variables/datasource/reducer.test.ts b/public/app/features/variables/datasource/reducer.test.ts index e8fd3f8967..95407e26f2 100644 --- a/public/app/features/variables/datasource/reducer.test.ts +++ b/public/app/features/variables/datasource/reducer.test.ts @@ -1,4 +1,4 @@ -import { DataSourceInstanceSettings } from '@grafana/data'; +import { DataSourceInstanceSettings } from '@credativ/plutono-data'; import { reducerTester } from '../../../../test/core/redux/reducerTester'; import { VariablesState } from '../state/variablesReducer'; diff --git a/public/app/features/variables/datasource/reducer.ts b/public/app/features/variables/datasource/reducer.ts index 82fc20e137..2fe40190f1 100644 --- a/public/app/features/variables/datasource/reducer.ts +++ b/public/app/features/variables/datasource/reducer.ts @@ -1,5 +1,5 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; -import { DataSourceInstanceSettings } from '@grafana/data'; +import { DataSourceInstanceSettings } from '@credativ/plutono-data'; import { DataSourceVariableModel, initialVariableModelState, VariableOption, VariableRefresh } from '../types'; import { ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE, getInstanceState, VariablePayload } from '../state/types'; diff --git a/public/app/features/variables/editor/LegacyVariableQueryEditor.tsx b/public/app/features/variables/editor/LegacyVariableQueryEditor.tsx index ea31655608..603edf393f 100644 --- a/public/app/features/variables/editor/LegacyVariableQueryEditor.tsx +++ b/public/app/features/variables/editor/LegacyVariableQueryEditor.tsx @@ -1,13 +1,13 @@ import React, { FC, useCallback, useState } from 'react'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { VariableQueryProps } from 'app/types/plugins'; import { VariableTextAreaField } from './VariableTextAreaField'; -import { useStyles } from '@grafana/ui'; -import { GrafanaTheme } from '@grafana/data'; +import { useStyles } from '@credativ/plutono-ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { css } from 'emotion'; -export const LEGACY_VARIABLE_QUERY_EDITOR_NAME = 'Grafana-LegacyVariableQueryEditor'; +export const LEGACY_VARIABLE_QUERY_EDITOR_NAME = 'Plutono-LegacyVariableQueryEditor'; export const LegacyVariableQueryEditor: FC = ({ onChange, query }) => { const styles = useStyles(getStyles); @@ -43,7 +43,7 @@ export const LegacyVariableQueryEditor: FC = ({ onChange, qu ); }; -function getStyles(theme: GrafanaTheme) { +function getStyles(theme: PlutonoTheme) { return { container: css` margin-bottom: ${theme.spacing.xs}; diff --git a/public/app/features/variables/editor/SelectionOptionsEditor.tsx b/public/app/features/variables/editor/SelectionOptionsEditor.tsx index dc3952ebff..78e13d808f 100644 --- a/public/app/features/variables/editor/SelectionOptionsEditor.tsx +++ b/public/app/features/variables/editor/SelectionOptionsEditor.tsx @@ -1,6 +1,6 @@ import React, { ChangeEvent, FormEvent, FunctionComponent, useCallback } from 'react'; -import { InlineFieldRow, VerticalGroup } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; +import { InlineFieldRow, VerticalGroup } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { VariableWithMultiSupport } from '../types'; import { VariableEditorProps } from './types'; diff --git a/public/app/features/variables/editor/VariableEditorContainer.tsx b/public/app/features/variables/editor/VariableEditorContainer.tsx index 39c730fcdd..c8da745fa6 100644 --- a/public/app/features/variables/editor/VariableEditorContainer.tsx +++ b/public/app/features/variables/editor/VariableEditorContainer.tsx @@ -1,6 +1,6 @@ import React, { MouseEvent, PureComponent } from 'react'; -import { Icon } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; +import { Icon } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { toVariableIdentifier, toVariablePayload, VariableIdentifier } from '../state/types'; import { StoreState } from '../../../types'; diff --git a/public/app/features/variables/editor/VariableEditorEditor.tsx b/public/app/features/variables/editor/VariableEditorEditor.tsx index 857c01bed0..6c3a3b10cf 100644 --- a/public/app/features/variables/editor/VariableEditorEditor.tsx +++ b/public/app/features/variables/editor/VariableEditorEditor.tsx @@ -1,8 +1,8 @@ import React, { FormEvent, PureComponent } from 'react'; import isEqual from 'lodash/isEqual'; -import { AppEvents, LoadingState, SelectableValue, VariableType } from '@grafana/data'; -import { Button, Icon, InlineFieldRow, VerticalGroup } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; +import { AppEvents, LoadingState, SelectableValue, VariableType } from '@credativ/plutono-data'; +import { Button, Icon, InlineFieldRow, VerticalGroup } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { variableAdapters } from '../adapters'; import { toVariableIdentifier, toVariablePayload, VariableIdentifier } from '../state/types'; diff --git a/public/app/features/variables/editor/VariableEditorList.tsx b/public/app/features/variables/editor/VariableEditorList.tsx index cad8ef02b6..a031af1597 100644 --- a/public/app/features/variables/editor/VariableEditorList.tsx +++ b/public/app/features/variables/editor/VariableEditorList.tsx @@ -1,8 +1,8 @@ import React, { FC, MouseEvent, PureComponent } from 'react'; import { css } from 'emotion'; -import { Icon, IconButton, useStyles } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; -import { GrafanaTheme } from '@grafana/data'; +import { Icon, IconButton, useStyles } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; +import { PlutonoTheme } from '@credativ/plutono-data'; import EmptyListCTA from '../../../core/components/EmptyListCTA/EmptyListCTA'; import { QueryVariableModel, VariableModel } from '../types'; @@ -66,7 +66,7 @@ export class VariableEditorList extends PureComponent { or sensor names in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard. Check out the - + Templating documentation for more information. @@ -222,7 +222,7 @@ const VariableCheckIndicator: FC = ({ passed }) => ); }; -const getStyles = (theme: GrafanaTheme) => ({ +const getStyles = (theme: PlutonoTheme) => ({ iconPassed: css` color: ${theme.palette.greenBase}; `, diff --git a/public/app/features/variables/editor/VariableHideSelect.tsx b/public/app/features/variables/editor/VariableHideSelect.tsx index 753fae12d0..973973d8e2 100644 --- a/public/app/features/variables/editor/VariableHideSelect.tsx +++ b/public/app/features/variables/editor/VariableHideSelect.tsx @@ -1,6 +1,6 @@ import React, { PropsWithChildren, useMemo } from 'react'; -import { SelectableValue, VariableType } from '@grafana/data'; -import { selectors } from '@grafana/e2e-selectors'; +import { SelectableValue, VariableType } from '@credativ/plutono-data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { VariableSelectField } from '../editor/VariableSelectField'; import { VariableHide } from '../types'; diff --git a/public/app/features/variables/editor/VariableSectionHeader.tsx b/public/app/features/variables/editor/VariableSectionHeader.tsx index e0e5252df8..1756322501 100644 --- a/public/app/features/variables/editor/VariableSectionHeader.tsx +++ b/public/app/features/variables/editor/VariableSectionHeader.tsx @@ -1,6 +1,6 @@ import React, { PropsWithChildren, ReactElement } from 'react'; -import { useStyles } from '@grafana/ui'; -import { GrafanaTheme } from '@grafana/data'; +import { useStyles } from '@credativ/plutono-ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { css } from 'emotion'; interface VariableSectionHeaderProps { @@ -13,7 +13,7 @@ export function VariableSectionHeader({ name }: PropsWithChildren{name}; } -function getStyles(theme: GrafanaTheme) { +function getStyles(theme: PlutonoTheme) { return { sectionHeading: css` label: sectionHeading; diff --git a/public/app/features/variables/editor/VariableSelectField.tsx b/public/app/features/variables/editor/VariableSelectField.tsx index 684c875cba..e35245cf47 100644 --- a/public/app/features/variables/editor/VariableSelectField.tsx +++ b/public/app/features/variables/editor/VariableSelectField.tsx @@ -1,6 +1,6 @@ import React, { PropsWithChildren, ReactElement } from 'react'; -import { InlineFormLabel, Select, useStyles } from '@grafana/ui'; -import { GrafanaTheme, SelectableValue } from '@grafana/data'; +import { InlineFormLabel, Select, useStyles } from '@credativ/plutono-ui'; +import { PlutonoTheme, SelectableValue } from '@credativ/plutono-data'; import { css } from 'emotion'; interface VariableSelectFieldProps { @@ -44,7 +44,7 @@ export function VariableSelectField({ ); } -function getStyles(theme: GrafanaTheme) { +function getStyles(theme: PlutonoTheme) { return { selectContainer: css` margin-right: ${theme.spacing.xs}; diff --git a/public/app/features/variables/editor/VariableSwitchField.tsx b/public/app/features/variables/editor/VariableSwitchField.tsx index f4db5fa442..6a765c91b9 100644 --- a/public/app/features/variables/editor/VariableSwitchField.tsx +++ b/public/app/features/variables/editor/VariableSwitchField.tsx @@ -1,5 +1,5 @@ import React, { ChangeEvent, PropsWithChildren, ReactElement } from 'react'; -import { InlineField, InlineSwitch } from '@grafana/ui'; +import { InlineField, InlineSwitch } from '@credativ/plutono-ui'; interface VariableSwitchFieldProps { value: boolean; name: string; diff --git a/public/app/features/variables/editor/VariableTextAreaField.tsx b/public/app/features/variables/editor/VariableTextAreaField.tsx index ebdc9ea89d..7b11973667 100644 --- a/public/app/features/variables/editor/VariableTextAreaField.tsx +++ b/public/app/features/variables/editor/VariableTextAreaField.tsx @@ -1,6 +1,6 @@ import React, { FormEvent, PropsWithChildren, ReactElement, useCallback } from 'react'; -import { InlineField, TextArea, useStyles } from '@grafana/ui'; -import { GrafanaTheme } from '@grafana/data'; +import { InlineField, TextArea, useStyles } from '@credativ/plutono-ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { css } from 'emotion'; interface VariableTextAreaFieldProps { @@ -54,7 +54,7 @@ export function VariableTextAreaField({ ); } -function getStyles(theme: GrafanaTheme) { +function getStyles(theme: PlutonoTheme) { return { textarea: css` white-space: pre-wrap; diff --git a/public/app/features/variables/editor/VariableTextField.tsx b/public/app/features/variables/editor/VariableTextField.tsx index 2a8888f1c5..01e8b46bf7 100644 --- a/public/app/features/variables/editor/VariableTextField.tsx +++ b/public/app/features/variables/editor/VariableTextField.tsx @@ -1,5 +1,5 @@ import React, { FormEvent, PropsWithChildren, ReactElement } from 'react'; -import { InlineField, Input, PopoverContent } from '@grafana/ui'; +import { InlineField, Input, PopoverContent } from '@credativ/plutono-ui'; interface VariableTextFieldProps { value: string; diff --git a/public/app/features/variables/editor/VariableTypeSelect.tsx b/public/app/features/variables/editor/VariableTypeSelect.tsx index 30e2c288bc..a0dbb9a93b 100644 --- a/public/app/features/variables/editor/VariableTypeSelect.tsx +++ b/public/app/features/variables/editor/VariableTypeSelect.tsx @@ -1,6 +1,6 @@ import React, { PropsWithChildren, useMemo } from 'react'; -import { SelectableValue, VariableType } from '@grafana/data'; -import { selectors } from '@grafana/e2e-selectors'; +import { SelectableValue, VariableType } from '@credativ/plutono-data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { VariableSelectField } from '../editor/VariableSelectField'; import { getVariableTypes } from '../utils'; diff --git a/public/app/features/variables/editor/VariableValuesPreview.tsx b/public/app/features/variables/editor/VariableValuesPreview.tsx index aa4f3c70f0..a6e986c90d 100644 --- a/public/app/features/variables/editor/VariableValuesPreview.tsx +++ b/public/app/features/variables/editor/VariableValuesPreview.tsx @@ -1,8 +1,8 @@ import React, { MouseEvent, useCallback, useEffect, useState } from 'react'; import { VariableOption, VariableWithOptions } from '../types'; -import { selectors } from '@grafana/e2e-selectors'; -import { Button, InlineFieldRow, InlineLabel, useStyles, VerticalGroup } from '@grafana/ui'; -import { GrafanaTheme } from '@grafana/data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; +import { Button, InlineFieldRow, InlineLabel, useStyles, VerticalGroup } from '@credativ/plutono-ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { css } from 'emotion'; export interface VariableValuesPreviewProps { @@ -57,7 +57,7 @@ export const VariableValuesPreview: React.FunctionComponent { let errorText = null; if (!newName.match(/^(?!__).*$/)) { - errorText = "Template names cannot begin with '__', that's reserved for Grafana's global variables"; + errorText = "Template names cannot begin with '__', that's reserved for Plutono's global variables"; } if (!newName.match(/^\w+$/)) { diff --git a/public/app/features/variables/editor/getVariableQueryEditor.test.tsx b/public/app/features/variables/editor/getVariableQueryEditor.test.tsx index 3eab35ea80..31b41c0719 100644 --- a/public/app/features/variables/editor/getVariableQueryEditor.test.tsx +++ b/public/app/features/variables/editor/getVariableQueryEditor.test.tsx @@ -1,4 +1,4 @@ -import { VariableSupportType } from '@grafana/data'; +import { VariableSupportType } from '@credativ/plutono-data'; import { getVariableQueryEditor, StandardVariableQueryEditor } from './getVariableQueryEditor'; import { LegacyVariableQueryEditor } from './LegacyVariableQueryEditor'; diff --git a/public/app/features/variables/editor/getVariableQueryEditor.tsx b/public/app/features/variables/editor/getVariableQueryEditor.tsx index 5824530e5d..342f698040 100644 --- a/public/app/features/variables/editor/getVariableQueryEditor.tsx +++ b/public/app/features/variables/editor/getVariableQueryEditor.tsx @@ -1,6 +1,6 @@ import React, { useCallback } from 'react'; -import { DataQuery, DataSourceApi, DataSourceJsonData, QueryEditorProps, StandardVariableQuery } from '@grafana/data'; -import { getTemplateSrv } from '@grafana/runtime'; +import { DataQuery, DataSourceApi, DataSourceJsonData, QueryEditorProps, StandardVariableQuery } from '@credativ/plutono-data'; +import { getTemplateSrv } from '@credativ/plutono-runtime'; import { LegacyVariableQueryEditor } from './LegacyVariableQueryEditor'; import { diff --git a/public/app/features/variables/getAllVariableValuesForUrl.test.ts b/public/app/features/variables/getAllVariableValuesForUrl.test.ts index 9778bd5ee2..d0e729f219 100644 --- a/public/app/features/variables/getAllVariableValuesForUrl.test.ts +++ b/public/app/features/variables/getAllVariableValuesForUrl.test.ts @@ -1,4 +1,4 @@ -import { setTemplateSrv } from '@grafana/runtime'; +import { setTemplateSrv } from '@credativ/plutono-runtime'; import { variableAdapters } from './adapters'; import { createQueryVariableAdapter } from './query/adapter'; import { getAllVariableValuesForUrl } from './getAllVariableValuesForUrl'; diff --git a/public/app/features/variables/getAllVariableValuesForUrl.ts b/public/app/features/variables/getAllVariableValuesForUrl.ts index 8abb33b9ff..692a609e7b 100644 --- a/public/app/features/variables/getAllVariableValuesForUrl.ts +++ b/public/app/features/variables/getAllVariableValuesForUrl.ts @@ -1,5 +1,5 @@ -import { ScopedVars } from '@grafana/data'; -import { getTemplateSrv } from '@grafana/runtime'; +import { ScopedVars } from '@credativ/plutono-data'; +import { getTemplateSrv } from '@credativ/plutono-runtime'; import { variableAdapters } from './adapters'; export function getAllVariableValuesForUrl(scopedVars?: ScopedVars) { diff --git a/public/app/features/variables/guard.test.ts b/public/app/features/variables/guard.test.ts index 081ee056be..5583c1ac5b 100644 --- a/public/app/features/variables/guard.test.ts +++ b/public/app/features/variables/guard.test.ts @@ -8,7 +8,7 @@ import { } from './guard'; import { LegacyVariableQueryEditor } from './editor/LegacyVariableQueryEditor'; import { StandardVariableQueryEditor } from './editor/getVariableQueryEditor'; -import { VariableSupportType } from '@grafana/data'; +import { VariableSupportType } from '@credativ/plutono-data'; describe('type guards', () => { describe('hasLegacyVariableSupport', () => { diff --git a/public/app/features/variables/guard.ts b/public/app/features/variables/guard.ts index 19b2e28169..3e25ba737d 100644 --- a/public/app/features/variables/guard.ts +++ b/public/app/features/variables/guard.ts @@ -13,7 +13,7 @@ import { StandardVariableSupport, VariableModel, VariableSupportType, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { AdHocVariableModel, diff --git a/public/app/features/variables/inspect/NetworkGraphModal.tsx b/public/app/features/variables/inspect/NetworkGraphModal.tsx index 36a1ba21b5..aa583b0ab8 100644 --- a/public/app/features/variables/inspect/NetworkGraphModal.tsx +++ b/public/app/features/variables/inspect/NetworkGraphModal.tsx @@ -1,6 +1,6 @@ import { GraphEdge, GraphNode } from './utils'; import React, { useCallback, useState } from 'react'; -import { Modal } from '@grafana/ui'; +import { Modal } from '@credativ/plutono-ui'; import { NetworkGraph, Props as NetWorkGraphProps } from './NetworkGraph'; interface NetworkGraphModalApi { diff --git a/public/app/features/variables/inspect/VariableUsagesButton.tsx b/public/app/features/variables/inspect/VariableUsagesButton.tsx index 50cfdb33ed..15682a8941 100644 --- a/public/app/features/variables/inspect/VariableUsagesButton.tsx +++ b/public/app/features/variables/inspect/VariableUsagesButton.tsx @@ -1,5 +1,5 @@ import React, { FC, useMemo } from 'react'; -import { IconButton } from '@grafana/ui'; +import { IconButton } from '@credativ/plutono-ui'; import { UsagesToNetwork } from './utils'; import { NetworkGraphModal } from './NetworkGraphModal'; diff --git a/public/app/features/variables/inspect/VariablesDependenciesButton.tsx b/public/app/features/variables/inspect/VariablesDependenciesButton.tsx index 1b3155e246..d036adf02f 100644 --- a/public/app/features/variables/inspect/VariablesDependenciesButton.tsx +++ b/public/app/features/variables/inspect/VariablesDependenciesButton.tsx @@ -1,7 +1,7 @@ import React, { FC, useMemo } from 'react'; import { Provider } from 'react-redux'; // @ts-ignore -import { Button } from '@grafana/ui'; +import { Button } from '@credativ/plutono-ui'; import { createDependencyEdges, createDependencyNodes, filterNodesWithDependencies } from './utils'; import { store } from '../../../store/store'; import { VariableModel } from '../types'; diff --git a/public/app/features/variables/inspect/VariablesUnknownButton.tsx b/public/app/features/variables/inspect/VariablesUnknownButton.tsx index 596d40268c..d73e351eb1 100644 --- a/public/app/features/variables/inspect/VariablesUnknownButton.tsx +++ b/public/app/features/variables/inspect/VariablesUnknownButton.tsx @@ -1,5 +1,5 @@ import React, { FC, useMemo } from 'react'; -import { IconButton } from '@grafana/ui'; +import { IconButton } from '@credativ/plutono-ui'; import { UsagesToNetwork } from './utils'; import { NetworkGraphModal } from './NetworkGraphModal'; diff --git a/public/app/features/variables/inspect/VariablesUnknownTable.tsx b/public/app/features/variables/inspect/VariablesUnknownTable.tsx index 2ce2591e04..654d8c653e 100644 --- a/public/app/features/variables/inspect/VariablesUnknownTable.tsx +++ b/public/app/features/variables/inspect/VariablesUnknownTable.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { css } from 'emotion'; -import { Icon, Tooltip, useStyles } from '@grafana/ui'; -import { GrafanaTheme } from '@grafana/data'; +import { Icon, Tooltip, useStyles } from '@credativ/plutono-ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { UsagesToNetwork } from './utils'; import { VariablesUnknownButton } from './VariablesUnknownButton'; @@ -53,7 +53,7 @@ export const VariablesUnknownTable: FC = ({ usages }) => { ); }; -const getStyles = (theme: GrafanaTheme) => ({ +const getStyles = (theme: PlutonoTheme) => ({ container: css` margin-top: ${theme.spacing.xl}; padding-top: ${theme.spacing.xl}; diff --git a/public/app/features/variables/interval/IntervalVariableEditor.tsx b/public/app/features/variables/interval/IntervalVariableEditor.tsx index 9bb81f29f7..43eb956e0c 100644 --- a/public/app/features/variables/interval/IntervalVariableEditor.tsx +++ b/public/app/features/variables/interval/IntervalVariableEditor.tsx @@ -1,5 +1,5 @@ import React, { ChangeEvent, FormEvent, PureComponent } from 'react'; -import { InlineFieldRow, VerticalGroup } from '@grafana/ui'; +import { InlineFieldRow, VerticalGroup } from '@credativ/plutono-ui'; import { IntervalVariableModel } from '../types'; import { VariableEditorProps } from '../editor/types'; @@ -7,7 +7,7 @@ import { VariableSectionHeader } from '../editor/VariableSectionHeader'; import { VariableTextField } from '../editor/VariableTextField'; import { VariableSwitchField } from '../editor/VariableSwitchField'; import { VariableSelectField } from '../editor/VariableSelectField'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; export interface Props extends VariableEditorProps {} diff --git a/public/app/features/variables/interval/actions.test.ts b/public/app/features/variables/interval/actions.test.ts index 242ca54036..55b87c199b 100644 --- a/public/app/features/variables/interval/actions.test.ts +++ b/public/app/features/variables/interval/actions.test.ts @@ -11,7 +11,7 @@ import { } from '../state/sharedReducer'; import { variableAdapters } from '../adapters'; import { createIntervalVariableAdapter } from './adapter'; -import { dateTime } from '@grafana/data'; +import { dateTime } from '@credativ/plutono-data'; import { getTimeSrv, setTimeSrv, TimeSrv } from '../../dashboard/services/TimeSrv'; import { TemplateSrv } from '../../templating/template_srv'; import { intervalBuilder } from '../shared/testing/builders'; @@ -116,7 +116,7 @@ describe('interval actions', () => { } as unknown) as TimeSrv; }, templateSrv: ({ - setGrafanaVariable: jest.fn(), + setPlutonoVariable: jest.fn(), } as unknown) as TemplateSrv, }; @@ -129,7 +129,7 @@ describe('interval actions', () => { expect(dependencies.calculateInterval).toHaveBeenCalledTimes(0); expect(dependencies.getTimeSrv().timeRange).toHaveBeenCalledTimes(0); - expect(dependencies.templateSrv.setGrafanaVariable).toHaveBeenCalledTimes(0); + expect(dependencies.templateSrv.setPlutonoVariable).toHaveBeenCalledTimes(0); }); }); @@ -151,7 +151,7 @@ describe('interval actions', () => { to: '2001-01-02', }, }); - const setGrafanaVariableMock = jest.fn(); + const setPlutonoVariableMock = jest.fn(); const dependencies: UpdateAutoValueDependencies = { calculateInterval: jest.fn().mockReturnValue({ interval: '10s' }), getTimeSrv: () => { @@ -160,7 +160,7 @@ describe('interval actions', () => { } as unknown) as TimeSrv; }, templateSrv: ({ - setGrafanaVariable: setGrafanaVariableMock, + setPlutonoVariable: setPlutonoVariableMock, } as unknown) as TemplateSrv, }; @@ -185,11 +185,11 @@ describe('interval actions', () => { '13s' ); expect(timeRangeMock).toHaveBeenCalledTimes(1); - expect(setGrafanaVariableMock).toHaveBeenCalledTimes(2); - expect(setGrafanaVariableMock.mock.calls[0][0]).toBe('$__auto_interval_intervalName'); - expect(setGrafanaVariableMock.mock.calls[0][1]).toBe('10s'); - expect(setGrafanaVariableMock.mock.calls[1][0]).toBe('$__auto_interval'); - expect(setGrafanaVariableMock.mock.calls[1][1]).toBe('10s'); + expect(setPlutonoVariableMock).toHaveBeenCalledTimes(2); + expect(setPlutonoVariableMock.mock.calls[0][0]).toBe('$__auto_interval_intervalName'); + expect(setPlutonoVariableMock.mock.calls[0][1]).toBe('10s'); + expect(setPlutonoVariableMock.mock.calls[1][0]).toBe('$__auto_interval'); + expect(setPlutonoVariableMock.mock.calls[1][1]).toBe('10s'); }); }); }); diff --git a/public/app/features/variables/interval/actions.ts b/public/app/features/variables/interval/actions.ts index f2f89777a4..98e422f803 100644 --- a/public/app/features/variables/interval/actions.ts +++ b/public/app/features/variables/interval/actions.ts @@ -1,4 +1,4 @@ -import { rangeUtil } from '@grafana/data'; +import { rangeUtil } from '@credativ/plutono-data'; import { toVariablePayload, VariableIdentifier } from '../state/types'; import { ThunkResult } from '../../../types'; @@ -38,8 +38,8 @@ export const updateAutoValue = ( variableInState.auto_count, variableInState.auto_min ); - dependencies.templateSrv.setGrafanaVariable('$__auto_interval_' + variableInState.name, res.interval); + dependencies.templateSrv.setPlutonoVariable('$__auto_interval_' + variableInState.name, res.interval); // for backward compatibility, to be removed eventually - dependencies.templateSrv.setGrafanaVariable('$__auto_interval', res.interval); + dependencies.templateSrv.setPlutonoVariable('$__auto_interval', res.interval); } }; diff --git a/public/app/features/variables/pickers/OptionsPicker/OptionPicker.test.tsx b/public/app/features/variables/pickers/OptionsPicker/OptionPicker.test.tsx index ccab19b57f..f683601eb0 100644 --- a/public/app/features/variables/pickers/OptionsPicker/OptionPicker.test.tsx +++ b/public/app/features/variables/pickers/OptionsPicker/OptionPicker.test.tsx @@ -2,8 +2,8 @@ import React from 'react'; import { Provider } from 'react-redux'; import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { selectors } from '@grafana/e2e-selectors'; -import { LoadingState } from '@grafana/data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; +import { LoadingState } from '@credativ/plutono-data'; import { VariablePickerProps } from '../types'; import { QueryVariableModel } from '../../types'; diff --git a/public/app/features/variables/pickers/OptionsPicker/OptionsPicker.tsx b/public/app/features/variables/pickers/OptionsPicker/OptionsPicker.tsx index e3019c7ba0..ce8706afc9 100644 --- a/public/app/features/variables/pickers/OptionsPicker/OptionsPicker.tsx +++ b/public/app/features/variables/pickers/OptionsPicker/OptionsPicker.tsx @@ -1,7 +1,7 @@ import React, { ComponentType, PureComponent } from 'react'; import { connect, ConnectedProps } from 'react-redux'; -import { ClickOutsideWrapper } from '@grafana/ui'; -import { LoadingState } from '@grafana/data'; +import { ClickOutsideWrapper } from '@credativ/plutono-ui'; +import { LoadingState } from '@credativ/plutono-data'; import { StoreState } from 'app/types'; import { VariableInput } from '../shared/VariableInput'; diff --git a/public/app/features/variables/pickers/OptionsPicker/actions.test.ts b/public/app/features/variables/pickers/OptionsPicker/actions.test.ts index d893118b44..674af3e8d8 100644 --- a/public/app/features/variables/pickers/OptionsPicker/actions.test.ts +++ b/public/app/features/variables/pickers/OptionsPicker/actions.test.ts @@ -31,8 +31,8 @@ const datasource = { metricFindQuery: jest.fn(() => Promise.resolve([])), }; -jest.mock('@grafana/runtime', () => { - const original = jest.requireActual('@grafana/runtime'); +jest.mock('@credativ/plutono-runtime', () => { + const original = jest.requireActual('@credativ/plutono-runtime'); return { ...original, diff --git a/public/app/features/variables/pickers/OptionsPicker/actions.ts b/public/app/features/variables/pickers/OptionsPicker/actions.ts index 6fcd2f192e..0fe61b9ec8 100644 --- a/public/app/features/variables/pickers/OptionsPicker/actions.ts +++ b/public/app/features/variables/pickers/OptionsPicker/actions.ts @@ -23,7 +23,7 @@ import { updateOptionsFromSearch, updateSearchQuery, } from './reducer'; -import { getDataSourceSrv } from '@grafana/runtime'; +import { getDataSourceSrv } from '@credativ/plutono-runtime'; import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { changeVariableProp, setCurrentVariableValue } from '../../state/sharedReducer'; import { toVariablePayload, VariableIdentifier } from '../../state/types'; diff --git a/public/app/features/variables/pickers/PickerRenderer.tsx b/public/app/features/variables/pickers/PickerRenderer.tsx index 2c67d3c4c5..deb5442b96 100644 --- a/public/app/features/variables/pickers/PickerRenderer.tsx +++ b/public/app/features/variables/pickers/PickerRenderer.tsx @@ -1,8 +1,8 @@ import React, { FunctionComponent, PropsWithChildren, ReactElement, useMemo } from 'react'; import { VariableHide, VariableModel } from '../types'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { variableAdapters } from '../adapters'; -import { Tooltip } from '@grafana/ui'; +import { Tooltip } from '@credativ/plutono-ui'; interface Props { variable: VariableModel; diff --git a/public/app/features/variables/pickers/shared/VariableLink.tsx b/public/app/features/variables/pickers/shared/VariableLink.tsx index 5fb1b4b171..1de67bc31b 100644 --- a/public/app/features/variables/pickers/shared/VariableLink.tsx +++ b/public/app/features/variables/pickers/shared/VariableLink.tsx @@ -1,8 +1,8 @@ import React, { FC, MouseEvent, useCallback } from 'react'; import { css } from 'emotion'; -import { getTagColorsFromName, Icon, Tooltip, useStyles } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; -import { GrafanaTheme } from '@grafana/data'; +import { getTagColorsFromName, Icon, Tooltip, useStyles } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { VariableTag } from '../../types'; @@ -88,7 +88,7 @@ const LoadingIndicator: FC> = ({ onCancel }) => { ); }; -const getStyles = (theme: GrafanaTheme) => ({ +const getStyles = (theme: PlutonoTheme) => ({ container: css` max-width: 500px; padding-right: 10px; diff --git a/public/app/features/variables/pickers/shared/VariableOptions.tsx b/public/app/features/variables/pickers/shared/VariableOptions.tsx index 5573aed39b..6c7d27fef2 100644 --- a/public/app/features/variables/pickers/shared/VariableOptions.tsx +++ b/public/app/features/variables/pickers/shared/VariableOptions.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; -import { getTagColorsFromName, Icon, Tooltip } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; +import { getTagColorsFromName, Icon, Tooltip } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; import { VariableOption, VariableTag } from '../../types'; diff --git a/public/app/features/variables/query/QueryVariableEditor.test.tsx b/public/app/features/variables/query/QueryVariableEditor.test.tsx index f190caad2d..ffa38819d2 100644 --- a/public/app/features/variables/query/QueryVariableEditor.test.tsx +++ b/public/app/features/variables/query/QueryVariableEditor.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { DataSourceApi } from '@grafana/data'; +import { DataSourceApi } from '@credativ/plutono-data'; import { Props, QueryVariableEditorUnConnected } from './QueryVariableEditor'; import { initialQueryVariableModelState } from './reducer'; @@ -9,7 +9,7 @@ import { initialVariableEditorState } from '../editor/reducer'; import { describe, expect } from '../../../../test/lib/common'; import { NEW_VARIABLE_ID } from '../state/types'; import { LegacyVariableQueryEditor } from '../editor/LegacyVariableQueryEditor'; -import { setDataSourceSrv } from '@grafana/runtime'; +import { setDataSourceSrv } from '@credativ/plutono-runtime'; const setupTestContext = (options: Partial) => { const defaults: Props = { diff --git a/public/app/features/variables/query/QueryVariableEditor.tsx b/public/app/features/variables/query/QueryVariableEditor.tsx index 6650fa9149..3b4259e265 100644 --- a/public/app/features/variables/query/QueryVariableEditor.tsx +++ b/public/app/features/variables/query/QueryVariableEditor.tsx @@ -1,10 +1,10 @@ import React, { ChangeEvent, FormEvent, PureComponent } from 'react'; import { css } from 'emotion'; import { MapDispatchToProps, MapStateToProps } from 'react-redux'; -import { InlineField, InlineFieldRow, VerticalGroup } from '@grafana/ui'; -import { selectors } from '@grafana/e2e-selectors'; -import { getTemplateSrv } from '@grafana/runtime'; -import { DataSourceInstanceSettings, LoadingState, SelectableValue } from '@grafana/data'; +import { InlineField, InlineFieldRow, VerticalGroup } from '@credativ/plutono-ui'; +import { selectors } from '@credativ/plutono-e2e-selectors'; +import { getTemplateSrv } from '@credativ/plutono-runtime'; +import { DataSourceInstanceSettings, LoadingState, SelectableValue } from '@credativ/plutono-data'; import { SelectionOptionsEditor } from '../editor/SelectionOptionsEditor'; import { QueryVariableModel, VariableRefresh, VariableSort, VariableWithMultiSupport } from '../types'; @@ -240,7 +240,7 @@ export class QueryVariableEditorUnConnected extends PureComponent
Value group tags
- Experimental feature, will be deprecated in Grafana v8. + Experimental feature, will be deprecated in Plutono v8. = { datasource: { diff --git a/public/app/features/variables/query/actions.ts b/public/app/features/variables/query/actions.ts index 22e24c2fb6..9c7fb44428 100644 --- a/public/app/features/variables/query/actions.ts +++ b/public/app/features/variables/query/actions.ts @@ -1,4 +1,4 @@ -import { toDataQueryError, getDataSourceSrv } from '@grafana/runtime'; +import { toDataQueryError, getDataSourceSrv } from '@credativ/plutono-runtime'; import { updateOptions } from '../state/actions'; import { QueryVariableModel } from '../types'; import { ThunkResult } from '../../../types'; diff --git a/public/app/features/variables/query/operators.test.ts b/public/app/features/variables/query/operators.test.ts index 91f1377540..1998d1bd42 100644 --- a/public/app/features/variables/query/operators.test.ts +++ b/public/app/features/variables/query/operators.test.ts @@ -1,6 +1,6 @@ import { of } from 'rxjs'; import { queryBuilder } from '../shared/testing/builders'; -import { FieldType, toDataFrame } from '@grafana/data'; +import { FieldType, toDataFrame } from '@credativ/plutono-data'; import { initialQueryVariableModelState, updateVariableOptions, updateVariableTags } from './reducer'; import { toVariablePayload } from '../state/types'; import { VariableRefresh } from '../types'; diff --git a/public/app/features/variables/query/operators.ts b/public/app/features/variables/query/operators.ts index 825a651e30..c8e75d7cdd 100644 --- a/public/app/features/variables/query/operators.ts +++ b/public/app/features/variables/query/operators.ts @@ -5,7 +5,7 @@ import { QueryVariableModel } from '../types'; import { ThunkDispatch } from '../../../types'; import { toVariableIdentifier, toVariablePayload } from '../state/types'; import { validateVariableSelectionState } from '../state/actions'; -import { DataSourceApi, FieldType, getFieldDisplayName, isDataFrame, MetricFindValue, PanelData } from '@grafana/data'; +import { DataSourceApi, FieldType, getFieldDisplayName, isDataFrame, MetricFindValue, PanelData } from '@credativ/plutono-data'; import { updateVariableOptions, updateVariableTags } from './reducer'; import { getTimeSrv, TimeSrv } from '../../dashboard/services/TimeSrv'; import { getLegacyQueryOptions, getTemplatedRegex } from '../utils'; diff --git a/public/app/features/variables/query/queryRunners.test.ts b/public/app/features/variables/query/queryRunners.test.ts index bef2104d21..7e022e4ea2 100644 --- a/public/app/features/variables/query/queryRunners.test.ts +++ b/public/app/features/variables/query/queryRunners.test.ts @@ -1,5 +1,5 @@ import { QueryRunners } from './queryRunners'; -import { getDefaultTimeRange, VariableSupportType } from '@grafana/data'; +import { getDefaultTimeRange, VariableSupportType } from '@credativ/plutono-data'; import { VariableRefresh } from '../types'; import { of } from 'rxjs'; diff --git a/public/app/features/variables/query/queryRunners.ts b/public/app/features/variables/query/queryRunners.ts index d51cda15e0..2576954de9 100644 --- a/public/app/features/variables/query/queryRunners.ts +++ b/public/app/features/variables/query/queryRunners.ts @@ -8,7 +8,7 @@ import { LoadingState, PanelData, VariableSupportType, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { QueryVariableModel } from '../types'; import { diff --git a/public/app/features/variables/query/reducer.test.ts b/public/app/features/variables/query/reducer.test.ts index fd061ddba3..a970777312 100644 --- a/public/app/features/variables/query/reducer.test.ts +++ b/public/app/features/variables/query/reducer.test.ts @@ -12,7 +12,7 @@ import { VariablesState } from '../state/variablesReducer'; import { getVariableTestContext } from '../state/helpers'; import { toVariablePayload } from '../state/types'; import { createQueryVariableAdapter } from './adapter'; -import { MetricFindValue } from '@grafana/data'; +import { MetricFindValue } from '@credativ/plutono-data'; describe('queryVariableReducer', () => { const adapter = createQueryVariableAdapter(); diff --git a/public/app/features/variables/query/reducer.ts b/public/app/features/variables/query/reducer.ts index ac3c1d2111..a30e3d1176 100644 --- a/public/app/features/variables/query/reducer.ts +++ b/public/app/features/variables/query/reducer.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; import _ from 'lodash'; -import { DataSourceApi, MetricFindValue, stringToJsRegex } from '@grafana/data'; +import { DataSourceApi, MetricFindValue, stringToJsRegex } from '@credativ/plutono-data'; import { initialVariableModelState, diff --git a/public/app/features/variables/query/variableQueryObserver.test.ts b/public/app/features/variables/query/variableQueryObserver.test.ts index 7b2e41fc8c..de8f15a5dd 100644 --- a/public/app/features/variables/query/variableQueryObserver.test.ts +++ b/public/app/features/variables/query/variableQueryObserver.test.ts @@ -1,5 +1,5 @@ import { variableQueryObserver } from './variableQueryObserver'; -import { LoadingState } from '@grafana/data'; +import { LoadingState } from '@credativ/plutono-data'; import { VariableIdentifier } from '../state/types'; import { UpdateOptionsResults } from './VariableQueryRunner'; diff --git a/public/app/features/variables/query/variableQueryObserver.ts b/public/app/features/variables/query/variableQueryObserver.ts index 9ad39a14f2..45ef3d91ad 100644 --- a/public/app/features/variables/query/variableQueryObserver.ts +++ b/public/app/features/variables/query/variableQueryObserver.ts @@ -1,5 +1,5 @@ import { Observer, Subscription } from 'rxjs'; -import { LoadingState } from '@grafana/data'; +import { LoadingState } from '@credativ/plutono-data'; import { UpdateOptionsResults } from './VariableQueryRunner'; diff --git a/public/app/features/variables/shared/formatVariable.ts b/public/app/features/variables/shared/formatVariable.ts index 162313eefe..fdebd63dcb 100644 --- a/public/app/features/variables/shared/formatVariable.ts +++ b/public/app/features/variables/shared/formatVariable.ts @@ -1,4 +1,4 @@ -import { VariableModel } from '@grafana/data'; +import { VariableModel } from '@credativ/plutono-data'; import { VariableWithOptions } from '../types'; export const formatVariableLabel = (variable: VariableModel) => { diff --git a/public/app/features/variables/shared/testing/helpers.ts b/public/app/features/variables/shared/testing/helpers.ts index bf8df912e7..23653baf56 100644 --- a/public/app/features/variables/shared/testing/helpers.ts +++ b/public/app/features/variables/shared/testing/helpers.ts @@ -1,4 +1,4 @@ -import { DataSourceInstanceSettings, DataSourceJsonData, DataSourcePluginMeta } from '@grafana/data'; +import { DataSourceInstanceSettings, DataSourceJsonData, DataSourcePluginMeta } from '@credativ/plutono-data'; export function getDataSourceInstanceSetting(name: string, meta: DataSourcePluginMeta): DataSourceInstanceSettings { return { diff --git a/public/app/features/variables/state/actions.test.ts b/public/app/features/variables/state/actions.test.ts index 10d5d55680..280ef74fab 100644 --- a/public/app/features/variables/state/actions.test.ts +++ b/public/app/features/variables/state/actions.test.ts @@ -66,7 +66,7 @@ import { expect } from '../../../../test/lib/common'; import { ConstantVariableModel, VariableRefresh } from '../types'; import { updateVariableOptions } from '../query/reducer'; import { setVariableQueryRunner, VariableQueryRunner } from '../query/VariableQueryRunner'; -import { setDataSourceSrv } from '@grafana/runtime'; +import { setDataSourceSrv } from '@credativ/plutono-runtime'; import { LocationState } from 'app/types'; variableAdapters.setInit(() => [ @@ -458,7 +458,7 @@ describe('shared actions', () => { .thenDispatchedActionsShouldEqual( changeVariableNameFailed({ newName: '__newName', - errorText: "Template names cannot begin with '__', that's reserved for Grafana's global variables", + errorText: "Template names cannot begin with '__', that's reserved for Plutono's global variables", }) ); }); diff --git a/public/app/features/variables/state/actions.ts b/public/app/features/variables/state/actions.ts index 81f1c76008..3b4ccd524c 100644 --- a/public/app/features/variables/state/actions.ts +++ b/public/app/features/variables/state/actions.ts @@ -1,6 +1,6 @@ import angular from 'angular'; import castArray from 'lodash/castArray'; -import { DataQuery, LoadingState, TimeRange, UrlQueryMap, UrlQueryValue } from '@grafana/data'; +import { DataQuery, LoadingState, TimeRange, UrlQueryMap, UrlQueryValue } from '@credativ/plutono-data'; import { DashboardVariableModel, diff --git a/public/app/features/variables/state/helpers.ts b/public/app/features/variables/state/helpers.ts index 618aca42c3..f6eaf92f30 100644 --- a/public/app/features/variables/state/helpers.ts +++ b/public/app/features/variables/state/helpers.ts @@ -1,5 +1,5 @@ import { combineReducers } from '@reduxjs/toolkit'; -import { LoadingState } from '@grafana/data'; +import { LoadingState } from '@credativ/plutono-data'; import { NEW_VARIABLE_ID } from './types'; import { VariableHide, VariableModel } from '../types'; diff --git a/public/app/features/variables/state/onTimeRangeUpdated.test.ts b/public/app/features/variables/state/onTimeRangeUpdated.test.ts index e006a69be1..7338001a27 100644 --- a/public/app/features/variables/state/onTimeRangeUpdated.test.ts +++ b/public/app/features/variables/state/onTimeRangeUpdated.test.ts @@ -1,4 +1,4 @@ -import { dateTime, TimeRange } from '@grafana/data'; +import { dateTime, TimeRange } from '@credativ/plutono-data'; import { TemplateSrv } from '../../templating/template_srv'; import { onTimeRangeUpdated, OnTimeRangeUpdatedDependencies, setOptionAsCurrent } from './actions'; diff --git a/public/app/features/variables/state/processVariable.test.ts b/public/app/features/variables/state/processVariable.test.ts index 9f0c14ab83..35e88f15ed 100644 --- a/public/app/features/variables/state/processVariable.test.ts +++ b/public/app/features/variables/state/processVariable.test.ts @@ -1,4 +1,4 @@ -import { UrlQueryMap } from '@grafana/data'; +import { UrlQueryMap } from '@credativ/plutono-data'; import { getTemplatingRootReducer } from './helpers'; import { variableAdapters } from '../adapters'; @@ -14,7 +14,7 @@ import { updateVariableOptions } from '../query/reducer'; import { customBuilder, queryBuilder } from '../shared/testing/builders'; import { variablesInitTransaction } from './transactionReducer'; import { setVariableQueryRunner, VariableQueryRunner } from '../query/VariableQueryRunner'; -import { setDataSourceSrv } from '@grafana/runtime'; +import { setDataSourceSrv } from '@credativ/plutono-runtime'; jest.mock('app/features/dashboard/services/TimeSrv', () => ({ getTimeSrv: jest.fn().mockReturnValue({ diff --git a/public/app/features/variables/state/reducers.test.ts b/public/app/features/variables/state/reducers.test.ts index dc79d7f740..308c4825bf 100644 --- a/public/app/features/variables/state/reducers.test.ts +++ b/public/app/features/variables/state/reducers.test.ts @@ -4,7 +4,7 @@ import { VariableAdapter, variableAdapters } from '../adapters'; import { createAction } from '@reduxjs/toolkit'; import { cleanVariables, variablesReducer, VariablesState } from './variablesReducer'; import { toVariablePayload, VariablePayload } from './types'; -import { VariableType } from '@grafana/data'; +import { VariableType } from '@credativ/plutono-data'; const variableAdapter: VariableAdapter = { id: ('mock' as unknown) as VariableType, diff --git a/public/app/features/variables/state/sharedReducer.test.ts b/public/app/features/variables/state/sharedReducer.test.ts index 2fabef1848..35c834fd01 100644 --- a/public/app/features/variables/state/sharedReducer.test.ts +++ b/public/app/features/variables/state/sharedReducer.test.ts @@ -1,5 +1,5 @@ import cloneDeep from 'lodash/cloneDeep'; -import { LoadingState, VariableType } from '@grafana/data'; +import { LoadingState, VariableType } from '@credativ/plutono-data'; import { reducerTester } from '../../../../test/core/redux/reducerTester'; import { diff --git a/public/app/features/variables/state/sharedReducer.ts b/public/app/features/variables/state/sharedReducer.ts index a31eafe2a3..0577a4a4f7 100644 --- a/public/app/features/variables/state/sharedReducer.ts +++ b/public/app/features/variables/state/sharedReducer.ts @@ -2,7 +2,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; import cloneDeep from 'lodash/cloneDeep'; import { default as lodashDefaults } from 'lodash/defaults'; -import { LoadingState, VariableType } from '@grafana/data'; +import { LoadingState, VariableType } from '@credativ/plutono-data'; import { VariableModel, VariableOption, VariableWithOptions } from '../types'; import { AddVariable, getInstanceState, VariablePayload } from './types'; import { variableAdapters } from '../adapters'; diff --git a/public/app/features/variables/state/types.ts b/public/app/features/variables/state/types.ts index 71fd896200..7e4e281d2a 100644 --- a/public/app/features/variables/state/types.ts +++ b/public/app/features/variables/state/types.ts @@ -1,6 +1,6 @@ import { VariableModel } from '../types'; import { VariablesState } from './variablesReducer'; -import { VariableType } from '@grafana/data'; +import { VariableType } from '@credativ/plutono-data'; export const NEW_VARIABLE_ID = '00000000-0000-0000-0000-000000000000'; export const ALL_VARIABLE_TEXT = 'All'; diff --git a/public/app/features/variables/state/upgradeLegacyQueries.test.ts b/public/app/features/variables/state/upgradeLegacyQueries.test.ts index 57d3f3d0f7..0f6863ba7a 100644 --- a/public/app/features/variables/state/upgradeLegacyQueries.test.ts +++ b/public/app/features/variables/state/upgradeLegacyQueries.test.ts @@ -1,5 +1,5 @@ import { customBuilder, queryBuilder } from '../shared/testing/builders'; -import { VariableSupportType } from '@grafana/data'; +import { VariableSupportType } from '@credativ/plutono-data'; import { toVariableIdentifier } from './types'; import { upgradeLegacyQueries } from './actions'; import { changeVariableProp } from './sharedReducer'; diff --git a/public/app/features/variables/system/adapter.ts b/public/app/features/variables/system/adapter.ts index be90e23dd8..0224c6a2f8 100644 --- a/public/app/features/variables/system/adapter.ts +++ b/public/app/features/variables/system/adapter.ts @@ -1,5 +1,5 @@ import { ComponentType } from 'react'; -import { LoadingState } from '@grafana/data'; +import { LoadingState } from '@credativ/plutono-data'; import { initialVariableModelState, SystemVariable, VariableHide } from '../types'; import { VariableAdapter } from '../adapters'; diff --git a/public/app/features/variables/textbox/TextBoxVariableEditor.tsx b/public/app/features/variables/textbox/TextBoxVariableEditor.tsx index 89e775f1e0..3685821227 100644 --- a/public/app/features/variables/textbox/TextBoxVariableEditor.tsx +++ b/public/app/features/variables/textbox/TextBoxVariableEditor.tsx @@ -1,11 +1,11 @@ import React, { FormEvent, ReactElement, useCallback } from 'react'; -import { VerticalGroup } from '@grafana/ui'; +import { VerticalGroup } from '@credativ/plutono-ui'; import { TextBoxVariableModel } from '../types'; import { VariableEditorProps } from '../editor/types'; import { VariableSectionHeader } from '../editor/VariableSectionHeader'; import { VariableTextField } from '../editor/VariableTextField'; -import { selectors } from '@grafana/e2e-selectors'; +import { selectors } from '@credativ/plutono-e2e-selectors'; export interface Props extends VariableEditorProps {} diff --git a/public/app/features/variables/textbox/TextBoxVariablePicker.tsx b/public/app/features/variables/textbox/TextBoxVariablePicker.tsx index efb3b90726..449bc7438d 100644 --- a/public/app/features/variables/textbox/TextBoxVariablePicker.tsx +++ b/public/app/features/variables/textbox/TextBoxVariablePicker.tsx @@ -4,7 +4,7 @@ import { TextBoxVariableModel } from '../types'; import { toVariablePayload } from '../state/types'; import { changeVariableProp } from '../state/sharedReducer'; import { VariablePickerProps } from '../pickers/types'; -import { Input } from '@grafana/ui'; +import { Input } from '@credativ/plutono-ui'; import { variableAdapters } from '../adapters'; import { useDispatch } from 'react-redux'; diff --git a/public/app/features/variables/textbox/actions.ts b/public/app/features/variables/textbox/actions.ts index 2874305aca..b4d27de4a1 100644 --- a/public/app/features/variables/textbox/actions.ts +++ b/public/app/features/variables/textbox/actions.ts @@ -5,7 +5,7 @@ import { variableAdapters } from '../adapters'; import { createTextBoxOptions } from './reducer'; import { toVariableIdentifier, toVariablePayload, VariableIdentifier } from '../state/types'; import { setOptionFromUrl } from '../state/actions'; -import { UrlQueryValue } from '@grafana/data'; +import { UrlQueryValue } from '@credativ/plutono-data'; import { changeVariableProp } from '../state/sharedReducer'; export const updateTextBoxVariableOptions = (identifier: VariableIdentifier): ThunkResult => { diff --git a/public/app/features/variables/types.ts b/public/app/features/variables/types.ts index 2e3c916f62..f1558f4224 100644 --- a/public/app/features/variables/types.ts +++ b/public/app/features/variables/types.ts @@ -6,7 +6,7 @@ import { QueryEditorProps, VariableModel as BaseVariableModel, VariableType, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { NEW_VARIABLE_ID } from './state/types'; import { VariableQueryProps } from '../../types'; diff --git a/public/app/features/variables/utils.ts b/public/app/features/variables/utils.ts index 25eef23104..f42270363c 100644 --- a/public/app/features/variables/utils.ts +++ b/public/app/features/variables/utils.ts @@ -1,6 +1,6 @@ import isString from 'lodash/isString'; -import { ScopedVars, VariableType } from '@grafana/data'; -import { getTemplateSrv } from '@grafana/runtime'; +import { ScopedVars, VariableType } from '@credativ/plutono-data'; +import { getTemplateSrv } from '@credativ/plutono-runtime'; import { ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE } from './state/types'; import { QueryVariableModel, VariableModel, VariableRefresh } from './types'; diff --git a/public/app/partials/signup_invited.html b/public/app/partials/signup_invited.html index cb2c87585d..3cfd4e14ae 100644 --- a/public/app/partials/signup_invited.html +++ b/public/app/partials/signup_invited.html @@ -4,7 +4,7 @@

Hello {{greeting}}.

- {{invitedBy}} has invited you to join Grafana and the organization {{contextSrv.user.orgName}}
Please complete the following and choose a password to accept your invitation and continue: + {{invitedBy}} has invited you to join Plutono and the organization {{contextSrv.user.orgName}}
Please complete the following and choose a password to accept your invitation and continue:
diff --git a/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts b/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts index cbcd2a5152..067b70e863 100644 --- a/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts +++ b/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts @@ -2,7 +2,7 @@ import isString from 'lodash/isString'; import { alignmentPeriods, MetricKind, selectors, ValueTypes } from './constants'; import CloudMonitoringDatasource from './datasource'; import { CloudMonitoringVariableQuery, MetricFindQueryTypes } from './types'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { extractServicesFromMetricDescriptors, getAggregationOptionsByMetric, diff --git a/public/app/plugins/datasource/cloud-monitoring/README.md b/public/app/plugins/datasource/cloud-monitoring/README.md index cd07b8ef37..176bb27604 100644 --- a/public/app/plugins/datasource/cloud-monitoring/README.md +++ b/public/app/plugins/datasource/cloud-monitoring/README.md @@ -1,6 +1,6 @@ # Google Cloud Monitoring Data Source - Native Plugin (formerly named Stackdriver) -Grafana ships with built-in support for Google Cloud Monitoring. You just have to add it as a data source and you will be ready to build dashboards for your Cloud Monitoring metrics. +Plutono ships with built-in support for Google Cloud Monitoring. You just have to add it as a data source and you will be ready to build dashboards for your Cloud Monitoring metrics. Read more about it here: diff --git a/public/app/plugins/datasource/cloud-monitoring/api.test.ts b/public/app/plugins/datasource/cloud-monitoring/api.test.ts index 992413d09c..bc1335a89b 100644 --- a/public/app/plugins/datasource/cloud-monitoring/api.test.ts +++ b/public/app/plugins/datasource/cloud-monitoring/api.test.ts @@ -4,8 +4,8 @@ import Api from './api'; import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__ import { createFetchResponse } from 'test/helpers/createFetchResponse'; -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, })); diff --git a/public/app/plugins/datasource/cloud-monitoring/api.ts b/public/app/plugins/datasource/cloud-monitoring/api.ts index 87ba4fdff0..ddcececef4 100644 --- a/public/app/plugins/datasource/cloud-monitoring/api.ts +++ b/public/app/plugins/datasource/cloud-monitoring/api.ts @@ -1,7 +1,7 @@ import { Observable, of } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; -import { SelectableValue } from '@grafana/data'; -import { FetchResponse, getBackendSrv } from '@grafana/runtime'; +import { SelectableValue } from '@credativ/plutono-data'; +import { FetchResponse, getBackendSrv } from '@credativ/plutono-runtime'; import appEvents from 'app/core/app_events'; import { CoreEvents } from 'app/types'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Aggregations.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Aggregations.test.tsx index a6a9d1ad85..0c53d4f0d1 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/Aggregations.test.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/Aggregations.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { render, screen } from '@testing-library/react'; import { shallow } from 'enzyme'; -import { Segment } from '@grafana/ui'; +import { Segment } from '@credativ/plutono-ui'; import { Aggregations, Props } from './Aggregations'; import { ValueTypes, MetricKind } from '../constants'; import { TemplateSrvStub } from 'test/specs/helpers'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Aggregations.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Aggregations.tsx index 0a94d9b865..851ec131e1 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/Aggregations.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/Aggregations.tsx @@ -1,8 +1,8 @@ import React, { FC, useState, useMemo } from 'react'; import _ from 'lodash'; -import { SelectableValue } from '@grafana/data'; -import { Segment, Icon } from '@grafana/ui'; +import { SelectableValue } from '@credativ/plutono-data'; +import { Segment, Icon } from '@credativ/plutono-ui'; import { getAggregationOptionsByMetric } from '../functions'; import { ValueTypes, MetricKind } from '../constants'; import { MetricDescriptor } from '../types'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/AlignmentPeriods.tsx b/public/app/plugins/datasource/cloud-monitoring/components/AlignmentPeriods.tsx index 256e3654d9..bbbaffcd32 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/AlignmentPeriods.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/AlignmentPeriods.tsx @@ -1,9 +1,9 @@ import React, { FC } from 'react'; import _ from 'lodash'; -import { TemplateSrv } from '@grafana/runtime'; -import { SelectableValue, rangeUtil } from '@grafana/data'; -import { Segment } from '@grafana/ui'; +import { TemplateSrv } from '@credativ/plutono-runtime'; +import { SelectableValue, rangeUtil } from '@credativ/plutono-data'; +import { Segment } from '@credativ/plutono-ui'; import { alignmentPeriods, alignOptions } from '../constants'; export interface Props { diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Alignments.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Alignments.tsx index 7c3fdcfe80..7cd7dca20a 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/Alignments.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/Alignments.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; -import { SelectableValue } from '@grafana/data'; -import { Segment } from '@grafana/ui'; +import { SelectableValue } from '@credativ/plutono-data'; +import { Segment } from '@credativ/plutono-ui'; export interface Props { onChange: (perSeriesAligner: string) => void; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.tsx index cd9531cc87..9ca6683339 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { LegacyForms } from '@grafana/ui'; -import { TemplateSrv } from '@grafana/runtime'; -import { SelectableValue } from '@grafana/data'; +import { LegacyForms } from '@credativ/plutono-ui'; +import { TemplateSrv } from '@credativ/plutono-runtime'; +import { SelectableValue } from '@credativ/plutono-data'; import CloudMonitoringDatasource from '../datasource'; import { AnnotationsHelp, LabelFilter, Metrics, Project } from './'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/AnnotationsHelp.tsx b/public/app/plugins/datasource/cloud-monitoring/components/AnnotationsHelp.tsx index befba24c1b..effc832ec5 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/AnnotationsHelp.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/AnnotationsHelp.tsx @@ -2,7 +2,7 @@ import React, { FC } from 'react'; export const AnnotationsHelp: FC = () => { return ( -
+
Annotation Query Format

diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Fields.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Fields.tsx index a9a4756eb1..daf588ffc7 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/Fields.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/Fields.tsx @@ -1,6 +1,6 @@ import React, { InputHTMLAttributes, FunctionComponent } from 'react'; -import { InlineFormLabel, Select, InlineField } from '@grafana/ui'; -import { SelectableValue } from '@grafana/data'; +import { InlineFormLabel, Select, InlineField } from '@credativ/plutono-ui'; +import { SelectableValue } from '@credativ/plutono-data'; export interface Props extends InputHTMLAttributes { label: string; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/GroupBys.tsx b/public/app/plugins/datasource/cloud-monitoring/components/GroupBys.tsx index e1e361b61f..db5b6fe250 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/GroupBys.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/GroupBys.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from 'react'; -import { SelectableValue } from '@grafana/data'; -import { Segment, Icon } from '@grafana/ui'; +import { SelectableValue } from '@credativ/plutono-data'; +import { Segment, Icon } from '@credativ/plutono-ui'; import { labelsToGroupedOptions } from '../functions'; import { systemLabels } from '../constants'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Help.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Help.tsx index 915a4fa768..ff99988460 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/Help.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/Help.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { MetricDescriptor } from '../types'; -import { Icon } from '@grafana/ui'; +import { Icon } from '@credativ/plutono-ui'; export interface Props { rawQuery: string; @@ -68,7 +68,7 @@ export class Help extends React.Component { )} {displayHelp && ( -

+
Alias Patterns
Format the legend keys any way you want by using alias patterns. Format the legend keys any way you want by using alias patterns. @@ -109,7 +109,7 @@ export class Help extends React.Component {
  • {`${'{{bucket}}'}`} = bucket boundary for distribution metrics when using a heatmap in - Grafana + Plutono
  • {`${'{{project}}'}`} = The project name that was specified in the query editor diff --git a/public/app/plugins/datasource/cloud-monitoring/components/LabelFilter.tsx b/public/app/plugins/datasource/cloud-monitoring/components/LabelFilter.tsx index 5db1f88a1c..4c7ad918cb 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/LabelFilter.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/LabelFilter.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent, Fragment } from 'react'; import _ from 'lodash'; -import { SelectableValue } from '@grafana/data'; -import { Segment, Icon } from '@grafana/ui'; +import { SelectableValue } from '@credativ/plutono-data'; +import { Segment, Icon } from '@credativ/plutono-ui'; import { labelsToGroupedOptions, filtersToStringArray, stringArrayToFilters, toOption } from '../functions'; import { Filter } from '../types'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/MQLQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/MQLQueryEditor.tsx index a992c2733e..02ea4b10a4 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/MQLQueryEditor.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/MQLQueryEditor.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { TextArea } from '@grafana/ui'; +import { TextArea } from '@credativ/plutono-ui'; export interface Props { onChange: (query: string) => void; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx index 0447c4d46a..47dbfdcbda 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx @@ -3,7 +3,7 @@ import { Project, VisualMetricQueryEditor, AliasBy } from '.'; import { MetricQuery, MetricDescriptor, EditorMode } from '../types'; import { getAlignmentPickerData } from '../functions'; import CloudMonitoringDatasource from '../datasource'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { MQLQueryEditor } from './MQLQueryEditor'; export interface Props { diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Metrics.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Metrics.tsx index f376e2be77..f51ba8cb53 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/Metrics.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/Metrics.tsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from 'react'; import _ from 'lodash'; -import { TemplateSrv } from '@grafana/runtime'; -import { SelectableValue } from '@grafana/data'; +import { TemplateSrv } from '@credativ/plutono-runtime'; +import { SelectableValue } from '@credativ/plutono-data'; import CloudMonitoringDatasource from '../datasource'; -import { Segment } from '@grafana/ui'; +import { Segment } from '@credativ/plutono-ui'; import { MetricDescriptor } from '../types'; export interface Props { diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Project.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Project.tsx index 6e437d446e..916ec2dc2b 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/Project.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/Project.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { SelectableValue } from '@grafana/data'; -import { SegmentAsync } from '@grafana/ui'; +import { SelectableValue } from '@credativ/plutono-data'; +import { SegmentAsync } from '@credativ/plutono-ui'; import CloudMonitoringDatasource from '../datasource'; export interface Props { diff --git a/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx index 9f62af4299..8fdcb6bfdb 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from 'react'; import appEvents from 'app/core/app_events'; import { CoreEvents } from 'app/types'; -import { ExploreQueryFieldProps, SelectableValue } from '@grafana/data'; -import { Segment } from '@grafana/ui'; +import { ExploreQueryFieldProps, SelectableValue } from '@credativ/plutono-data'; +import { Segment } from '@credativ/plutono-ui'; import { Help, MetricQueryEditor, SLOQueryEditor } from './'; import { CloudMonitoringQuery, MetricQuery, QueryType, SLOQuery, queryTypes, EditorMode } from '../types'; import { defaultQuery } from './MetricQueryEditor'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/QueryType.tsx b/public/app/plugins/datasource/cloud-monitoring/components/QueryType.tsx index eaa56e4095..91b92ad60d 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/QueryType.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/QueryType.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from 'react'; import _ from 'lodash'; -import { SelectableValue } from '@grafana/data'; -import { Segment } from '@grafana/ui'; +import { SelectableValue } from '@credativ/plutono-data'; +import { Segment } from '@credativ/plutono-ui'; import { QueryType, queryTypes } from '../types'; export interface Props { diff --git a/public/app/plugins/datasource/cloud-monitoring/components/SLOQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/SLOQueryEditor.tsx index d4238b5286..0f6a074992 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/SLOQueryEditor.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/SLOQueryEditor.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { Segment, SegmentAsync } from '@grafana/ui'; -import { SelectableValue } from '@grafana/data'; +import { Segment, SegmentAsync } from '@credativ/plutono-ui'; +import { SelectableValue } from '@credativ/plutono-data'; import { selectors } from '../constants'; import { Project, AlignmentPeriods, AliasBy, QueryInlineField } from '.'; import { SLOQuery } from '../types'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.test.tsx index 00d8ea9c7f..6517b537f6 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.test.tsx @@ -4,15 +4,15 @@ import renderer from 'react-test-renderer'; import { CloudMonitoringVariableQueryEditor, Props } from './VariableQueryEditor'; import { CloudMonitoringVariableQuery, MetricFindQueryTypes } from '../types'; import CloudMonitoringDatasource from '../datasource'; -import { VariableModel } from '@grafana/data'; +import { VariableModel } from '@credativ/plutono-data'; jest.mock('../functions', () => ({ getMetricTypes: (): any => ({ metricTypes: [], selectedMetricType: '' }), extractServicesFromMetricDescriptors: (): any[] => [], })); -jest.mock('@grafana/runtime', () => { - const original = jest.requireActual('@grafana/runtime'); +jest.mock('@credativ/plutono-runtime', () => { + const original = jest.requireActual('@credativ/plutono-runtime'); return { ...original, getTemplateSrv: () => ({ diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx index 9cb564fb57..399fbc1bdc 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; -import { getTemplateSrv } from '@grafana/runtime'; -import { QueryEditorProps } from '@grafana/data'; +import { getTemplateSrv } from '@credativ/plutono-runtime'; +import { QueryEditorProps } from '@credativ/plutono-data'; import { VariableQueryField } from './'; import { extractServicesFromMetricDescriptors, getLabelKeys, getMetricTypes } from '../functions'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx index e4ae1a3e46..507b346b3b 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx @@ -3,7 +3,7 @@ import { Aggregations, Metrics, LabelFilter, GroupBys, Alignments, AlignmentPeri import { MetricQuery, MetricDescriptor } from '../types'; import { getAlignmentPickerData } from '../functions'; import CloudMonitoringDatasource from '../datasource'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; export interface Props { usedAlignmentPeriod?: number; diff --git a/public/app/plugins/datasource/cloud-monitoring/constants.ts b/public/app/plugins/datasource/cloud-monitoring/constants.ts index a895940dfa..1dd8ae3f5f 100644 --- a/public/app/plugins/datasource/cloud-monitoring/constants.ts +++ b/public/app/plugins/datasource/cloud-monitoring/constants.ts @@ -230,7 +230,7 @@ export const aggOptions = [ ]; export const alignmentPeriods = [ - { text: 'grafana auto', value: 'grafana-auto' }, + { text: 'plutono auto', value: 'plutono-auto' }, { text: 'stackdriver auto', value: 'stackdriver-auto', hidden: true }, { text: 'cloud monitoring auto', value: 'cloud-monitoring-auto' }, { text: '1m', value: '+60s' }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/cloud-storage-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/cloud-storage-monitoring.json index 9a1b14ebaf..5df2e42303 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/cloud-storage-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/cloud-storage-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -531,7 +531,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -542,7 +542,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudfunctions-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudfunctions-monitoring.json index 51eb04474e..ac6f45d7d6 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudfunctions-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudfunctions-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -549,7 +549,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -560,7 +560,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudsql-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudsql-monitoring.json index 044f42318d..1298781cd9 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudsql-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudsql-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -987,7 +987,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -998,7 +998,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudsql-mysql-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudsql-mysql-monitoring.json index 976c738be3..3142d1f25f 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudsql-mysql-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudsql-mysql-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -545,7 +545,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -556,7 +556,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudsql-postgre-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudsql-postgre-monitoring.json index 14ea8d67aa..f7e56a6ab7 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudsql-postgre-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudsql-postgre-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -290,7 +290,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -301,7 +301,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudtasks-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudtasks-monitoring.json index 5346fd355a..0149ba9de4 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudtasks-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/cloudtasks-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -359,7 +359,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -370,7 +370,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/dataprocessing-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/dataprocessing-monitoring.json index ff3ec4dcf5..d487c19d7a 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/dataprocessing-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/dataprocessing-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -564,7 +564,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -575,7 +575,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/firewall-insight-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/firewall-insight-monitoring.json index 432a84a4f8..83fa2eded9 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/firewall-insight-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/firewall-insight-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -237,7 +237,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -248,7 +248,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/gce-network-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/gce-network-monitoring.json index 0e22135adc..5f9e0cc73d 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/gce-network-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/gce-network-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -413,7 +413,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -424,7 +424,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/gce-vm-instance-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/gce-vm-instance-monitoring.json index d0c37b18c6..1c450a1bfb 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/gce-vm-instance-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/gce-vm-instance-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -789,7 +789,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -800,7 +800,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/gke-prometheus-pod-node-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/gke-prometheus-pod-node-monitoring.json index 4620817baf..468babaa55 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/gke-prometheus-pod-node-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/gke-prometheus-pod-node-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -529,7 +529,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -540,7 +540,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/https-lb-backend-services-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/https-lb-backend-services-monitoring.json index 4ba3cd0ade..2a66081483 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/https-lb-backend-services-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/https-lb-backend-services-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -823,7 +823,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -834,7 +834,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/https-loadbalancer-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/https-loadbalancer-monitoring.json index efb96309f2..ec41d6cbf8 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/https-loadbalancer-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/https-loadbalancer-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -797,7 +797,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -808,7 +808,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/micro-service-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/micro-service-monitoring.json index 848280f715..f41de28818 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/micro-service-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/micro-service-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -651,7 +651,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -662,7 +662,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/dashboards/network-tcp-loadbalancer-monitoring.json b/public/app/plugins/datasource/cloud-monitoring/dashboards/network-tcp-loadbalancer-monitoring.json index e37decc8cd..581c1076f0 100644 --- a/public/app/plugins/datasource/cloud-monitoring/dashboards/network-tcp-loadbalancer-monitoring.json +++ b/public/app/plugins/datasource/cloud-monitoring/dashboards/network-tcp-loadbalancer-monitoring.json @@ -1,7 +1,7 @@ { "__inputs": [], "__requires": [ - { "type": "grafana", "id": "grafana", "name": "Grafana", "version": "7.3.0-pre" }, + { "type": "plutono", "id": "plutono", "name": "Plutono", "version": "7.3.0-pre" }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, { "type": "datasource", "id": "stackdriver", "name": "Google Cloud Monitoring", "version": "1.0.0" } ], @@ -9,7 +9,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -483,7 +483,7 @@ }, { "allValue": null, - "current": { "selected": false, "text": "grafana auto", "value": "grafana-auto" }, + "current": { "selected": false, "text": "plutono auto", "value": "plutono-auto" }, "datasource": "${datasource}", "definition": "", "description": null, @@ -494,7 +494,7 @@ "multi": false, "name": "alignmentPeriod", "options": [ - { "selected": true, "text": "grafana auto", "value": "grafana-auto" }, + { "selected": true, "text": "plutono auto", "value": "plutono-auto" }, { "selected": false, "text": "stackdriver auto", "value": "stackdriver-auto" }, { "selected": false, "text": "cloud monitoring auto", "value": "cloud-monitoring-auto" }, { "selected": false, "text": "1m", "value": "+60s" }, diff --git a/public/app/plugins/datasource/cloud-monitoring/datasource.ts b/public/app/plugins/datasource/cloud-monitoring/datasource.ts index 01bab8fc4b..6e8a834c7e 100644 --- a/public/app/plugins/datasource/cloud-monitoring/datasource.ts +++ b/public/app/plugins/datasource/cloud-monitoring/datasource.ts @@ -6,13 +6,13 @@ import { ScopedVars, SelectableValue, DataQueryResponse, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv'; import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { CloudMonitoringOptions, CloudMonitoringQuery, Filter, MetricDescriptor, QueryType, EditorMode } from './types'; import API from './api'; -import { DataSourceWithBackend, toDataQueryResponse } from '@grafana/runtime'; +import { DataSourceWithBackend, toDataQueryResponse } from '@credativ/plutono-runtime'; import { CloudMonitoringVariableSupport } from './variables'; import { catchError, map, mergeMap } from 'rxjs/operators'; import { from, Observable, of, throwError } from 'rxjs'; diff --git a/public/app/plugins/datasource/cloud-monitoring/functions.ts b/public/app/plugins/datasource/cloud-monitoring/functions.ts index 0a99e2e114..1ee87e2607 100644 --- a/public/app/plugins/datasource/cloud-monitoring/functions.ts +++ b/public/app/plugins/datasource/cloud-monitoring/functions.ts @@ -1,8 +1,8 @@ import _ from 'lodash'; import { alignOptions, aggOptions, ValueTypes, MetricKind, systemLabels } from './constants'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import CloudMonitoringDatasource from './datasource'; -import { TemplateSrv } from '@grafana/runtime'; +import { TemplateSrv } from '@credativ/plutono-runtime'; import { MetricDescriptor, Filter, MetricQuery } from './types'; export const extractServicesFromMetricDescriptors = (metricDescriptors: MetricDescriptor[]) => diff --git a/public/app/plugins/datasource/cloud-monitoring/module.ts b/public/app/plugins/datasource/cloud-monitoring/module.ts index b5bf015615..11f7805e6b 100644 --- a/public/app/plugins/datasource/cloud-monitoring/module.ts +++ b/public/app/plugins/datasource/cloud-monitoring/module.ts @@ -1,4 +1,4 @@ -import { DataSourcePlugin } from '@grafana/data'; +import { DataSourcePlugin } from '@credativ/plutono-data'; import CloudMonitoringDatasource from './datasource'; import { QueryEditor } from './components/QueryEditor'; import { CloudMonitoringConfigCtrl } from './config_ctrl'; diff --git a/public/app/plugins/datasource/cloud-monitoring/partials/config.html b/public/app/plugins/datasource/cloud-monitoring/partials/config.html index 84e61d1eda..80aacafb5f 100644 --- a/public/app/plugins/datasource/cloud-monitoring/partials/config.html +++ b/public/app/plugins/datasource/cloud-monitoring/partials/config.html @@ -1,19 +1,19 @@
    -
    +

    Google Cloud Monitoring Authentication

    There are two ways to authenticate the Google Cloud Monitoring plugin - either by uploading a Service Account key file or by automatically retrieving credentials from the Google metadata server. The latter option is only available when - running Grafana on a GCE virtual machine. + running Plutono on a GCE virtual machine.

    Uploading a Service Account Key File

    There are two ways to authenticate the Google Cloud Monitoring plugin. You can upload a Service Account key file or automatically retrieve - credentials from the Google metadata server. The latter option is only available when running Grafana on a GCE virtual machine. + credentials from the Google metadata server. The latter option is only available when running Plutono on a GCE virtual machine.

    - The Monitoring Viewer role provides all the permissions that Grafana needs. The following API + The Monitoring Viewer role provides all the permissions that Plutono needs. The following API needs to be enabled on GCP for the data source to work: Uploading a Service Account Key File

    GCE Default Service Account

    - If Grafana is running on a Google Compute Engine (GCE) virtual machine, it is possible for Grafana to + If Plutono is running on a Google Compute Engine (GCE) virtual machine, it is possible for Plutono to automatically retrieve the default project id and authentication token from the metadata server. In order for this to work, you need to make sure that you have a service account that is setup as the default account for the virtual machine and that the service account has been given read access to the Google Cloud Monitoring Monitoring API. @@ -45,7 +45,7 @@

    GCE Default Service Account

    Authentication

    Upload your Service Account key file or paste in the contents of the file. The file contents will be encrypted - and saved in the Grafana database.
    diff --git a/public/app/plugins/datasource/cloud-monitoring/specs/datasource.test.ts b/public/app/plugins/datasource/cloud-monitoring/specs/datasource.test.ts index 12b6dae9b3..9da5ed64c3 100644 --- a/public/app/plugins/datasource/cloud-monitoring/specs/datasource.test.ts +++ b/public/app/plugins/datasource/cloud-monitoring/specs/datasource.test.ts @@ -1,5 +1,5 @@ import { of, throwError } from 'rxjs'; -import { DataSourceInstanceSettings, toUtc } from '@grafana/data'; +import { DataSourceInstanceSettings, toUtc } from '@credativ/plutono-data'; import CloudMonitoringDataSource from '../datasource'; import { metricDescriptors } from './testData'; @@ -11,8 +11,8 @@ import { CustomVariableModel } from '../../../../features/variables/types'; import { initialCustomVariableModelState } from '../../../../features/variables/custom/reducer'; import { createFetchResponse } from 'test/helpers/createFetchResponse'; -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, })); diff --git a/public/app/plugins/datasource/cloud-monitoring/specs/testData.ts b/public/app/plugins/datasource/cloud-monitoring/specs/testData.ts index b97aad7c6c..0459b0d70d 100644 --- a/public/app/plugins/datasource/cloud-monitoring/specs/testData.ts +++ b/public/app/plugins/datasource/cloud-monitoring/specs/testData.ts @@ -1,6 +1,6 @@ export const metricDescriptors = [ { - name: 'projects/grafana-prod/metricDescriptors/agent.googleapis.com/agent/api_request_count', + name: 'projects/plutono-prod/metricDescriptors/agent.googleapis.com/agent/api_request_count', labels: [ { key: 'state', @@ -20,7 +20,7 @@ export const metricDescriptors = [ }, }, { - name: 'projects/grafana-prod/metricDescriptors/agent.googleapis.com/agent/log_entry_count', + name: 'projects/plutono-prod/metricDescriptors/agent.googleapis.com/agent/log_entry_count', labels: [ { key: 'response_code', diff --git a/public/app/plugins/datasource/cloud-monitoring/types.ts b/public/app/plugins/datasource/cloud-monitoring/types.ts index 102e086567..43f81392ea 100644 --- a/public/app/plugins/datasource/cloud-monitoring/types.ts +++ b/public/app/plugins/datasource/cloud-monitoring/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData, SelectableValue } from '@grafana/data'; +import { DataQuery, DataSourceJsonData, SelectableValue } from '@credativ/plutono-data'; export enum AuthType { JWT = 'jwt', diff --git a/public/app/plugins/datasource/cloud-monitoring/variables.ts b/public/app/plugins/datasource/cloud-monitoring/variables.ts index 181e9f07a8..2a92d823bc 100644 --- a/public/app/plugins/datasource/cloud-monitoring/variables.ts +++ b/public/app/plugins/datasource/cloud-monitoring/variables.ts @@ -1,6 +1,6 @@ import { from, Observable } from 'rxjs'; import { map, mergeMap } from 'rxjs/operators'; -import { CustomVariableSupport, DataQueryRequest, DataQueryResponse } from '@grafana/data'; +import { CustomVariableSupport, DataQueryRequest, DataQueryResponse } from '@credativ/plutono-data'; import CloudMonitoringDatasource from './datasource'; import { CloudMonitoringVariableQuery } from './types'; diff --git a/public/app/plugins/datasource/cloudwatch/README.md b/public/app/plugins/datasource/cloudwatch/README.md index 184fb89c6b..48b8cecea7 100644 --- a/public/app/plugins/datasource/cloudwatch/README.md +++ b/public/app/plugins/datasource/cloudwatch/README.md @@ -1,6 +1,6 @@ # CloudWatch Data Source - Native Plugin -Grafana ships with **built in** support for CloudWatch. You just have to add it as a data source and you will be ready to build dashboards for your CloudWatch metrics. +Plutono ships with **built in** support for CloudWatch. You just have to add it as a data source and you will be ready to build dashboards for your CloudWatch metrics. Read more about it here: diff --git a/public/app/plugins/datasource/cloudwatch/components/Alias.tsx b/public/app/plugins/datasource/cloudwatch/components/Alias.tsx index f665289ed0..5664868fe4 100644 --- a/public/app/plugins/datasource/cloudwatch/components/Alias.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/Alias.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent, useState } from 'react'; import { debounce } from 'lodash'; -import { LegacyForms } from '@grafana/ui'; +import { LegacyForms } from '@credativ/plutono-ui'; const { Input } = LegacyForms; export interface Props { diff --git a/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor.tsx index 7befb4eb63..709b9ee2cd 100644 --- a/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor.tsx @@ -1,7 +1,7 @@ import React, { ChangeEvent } from 'react'; -import { LegacyForms } from '@grafana/ui'; +import { LegacyForms } from '@credativ/plutono-ui'; const { Switch } = LegacyForms; -import { PanelData } from '@grafana/data'; +import { PanelData } from '@credativ/plutono-data'; import { AnnotationQuery } from '../types'; import { CloudWatchDatasource } from '../datasource'; import { QueryField, PanelQueryEditor } from './'; diff --git a/public/app/plugins/datasource/cloudwatch/components/CloudWatchLink.tsx b/public/app/plugins/datasource/cloudwatch/components/CloudWatchLink.tsx index c360e60440..2383276aeb 100644 --- a/public/app/plugins/datasource/cloudwatch/components/CloudWatchLink.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/CloudWatchLink.tsx @@ -2,8 +2,8 @@ import _ from 'lodash'; import React, { Component } from 'react'; import { CloudWatchLogsQuery } from '../types'; -import { PanelData } from '@grafana/data'; -import { Icon } from '@grafana/ui'; +import { PanelData } from '@credativ/plutono-data'; +import { Icon } from '@credativ/plutono-ui'; import { encodeUrl, AwsUrl } from '../aws_url'; import { CloudWatchDatasource } from '../datasource'; diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.test.tsx index 8a2752bace..954b4294db 100644 --- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { AwsAuthType } from '@grafana/aws-sdk'; +import { AwsAuthType } from '@credativ/plutono-aws-sdk'; import { ConfigEditor, Props } from './ConfigEditor'; jest.mock('app/features/plugins/datasource_srv', () => ({ diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx index 8695896fc0..1a06497b38 100644 --- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx @@ -1,7 +1,7 @@ import React, { FC, useEffect, useState } from 'react'; -import { Input, InlineField } from '@grafana/ui'; -import { DataSourcePluginOptionsEditorProps, onUpdateDatasourceJsonDataOption } from '@grafana/data'; -import { ConnectionConfig } from '@grafana/aws-sdk'; +import { Input, InlineField } from '@credativ/plutono-ui'; +import { DataSourcePluginOptionsEditorProps, onUpdateDatasourceJsonDataOption } from '@credativ/plutono-data'; +import { ConnectionConfig } from '@credativ/plutono-aws-sdk'; import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; import { store } from 'app/store/store'; @@ -26,14 +26,14 @@ export const ConfigEditor: FC = (props: Props) => { .then((datasource: CloudWatchDatasource) => setDatasource(datasource)); if (props.options.jsonData.authType === 'arn') { - addWarning('Since grafana 7.3 authentication type "arn" is deprecated, falling back to default SDK provider'); + addWarning('Since plutono 7.3 authentication type "arn" is deprecated, falling back to default SDK provider'); } else if ( props.options.jsonData.authType === 'credentials' && !props.options.jsonData.profile && !props.options.jsonData.database ) { addWarning( - 'As of grafana 7.3 authentication type "credentials" should be used only for shared file credentials. \ + 'As of plutono 7.3 authentication type "credentials" should be used only for shared file credentials. \ If you don\'t have a credentials file, switch to the default SDK provider for extracting credentials \ from environment variables or IAM roles' ); diff --git a/public/app/plugins/datasource/cloudwatch/components/Dimensions.tsx b/public/app/plugins/datasource/cloudwatch/components/Dimensions.tsx index 6380b81741..140e8f2db1 100644 --- a/public/app/plugins/datasource/cloudwatch/components/Dimensions.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/Dimensions.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent, Fragment, useState, useEffect } from 'react'; import isEqual from 'lodash/isEqual'; -import { SelectableValue } from '@grafana/data'; -import { SegmentAsync, Icon } from '@grafana/ui'; +import { SelectableValue } from '@credativ/plutono-data'; +import { SegmentAsync, Icon } from '@credativ/plutono-ui'; import { SelectableStrings } from '../types'; export interface Props { diff --git a/public/app/plugins/datasource/cloudwatch/components/Forms.tsx b/public/app/plugins/datasource/cloudwatch/components/Forms.tsx index b7b4d36239..dbc8bc733d 100644 --- a/public/app/plugins/datasource/cloudwatch/components/Forms.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/Forms.tsx @@ -1,5 +1,5 @@ import React, { InputHTMLAttributes, FunctionComponent } from 'react'; -import { InlineFormLabel } from '@grafana/ui'; +import { InlineFormLabel } from '@credativ/plutono-ui'; export interface Props extends InputHTMLAttributes { label: string; diff --git a/public/app/plugins/datasource/cloudwatch/components/LogsCheatSheet.tsx b/public/app/plugins/datasource/cloudwatch/components/LogsCheatSheet.tsx index e33eaebb51..6e68725e3e 100644 --- a/public/app/plugins/datasource/cloudwatch/components/LogsCheatSheet.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/LogsCheatSheet.tsx @@ -1,9 +1,9 @@ import React, { PureComponent } from 'react'; import { stripIndent, stripIndents } from 'common-tags'; -import { QueryEditorHelpProps } from '@grafana/data'; +import { QueryEditorHelpProps } from '@credativ/plutono-data'; import Prism from 'prismjs'; import tokenizer from '../syntax'; -import { flattenTokens } from '@grafana/ui/src/slate-plugins/slate-prism'; +import { flattenTokens } from '@credativ/plutono-ui/src/slate-plugins/slate-prism'; import { css, cx } from 'emotion'; import { CloudWatchLogsQuery } from '../types'; diff --git a/public/app/plugins/datasource/cloudwatch/components/LogsQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/LogsQueryEditor.tsx index 91c37df546..8ac204dffd 100644 --- a/public/app/plugins/datasource/cloudwatch/components/LogsQueryEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/LogsQueryEditor.tsx @@ -2,8 +2,8 @@ import React, { memo } from 'react'; // Types -import { AbsoluteTimeRange, QueryEditorProps } from '@grafana/data'; -import { InlineFormLabel } from '@grafana/ui'; +import { AbsoluteTimeRange, QueryEditorProps } from '@credativ/plutono-data'; +import { InlineFormLabel } from '@credativ/plutono-ui'; import { CloudWatchDatasource } from '../datasource'; import { CloudWatchJsonData, CloudWatchLogsQuery, CloudWatchQuery } from '../types'; import { CloudWatchLogsQueryField } from './LogsQueryField'; diff --git a/public/app/plugins/datasource/cloudwatch/components/LogsQueryField.test.tsx b/public/app/plugins/datasource/cloudwatch/components/LogsQueryField.test.tsx index f728ef6791..5b0dadd214 100644 --- a/public/app/plugins/datasource/cloudwatch/components/LogsQueryField.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/LogsQueryField.test.tsx @@ -3,7 +3,7 @@ import { shallow } from 'enzyme'; import { CloudWatchLogsQueryField } from './LogsQueryField'; import { ExploreId } from '../../../../types'; import { DescribeLogGroupsRequest } from '../types'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; jest.mock('lodash/debounce', () => { const fakeDebounce = (func: () => any, period: number) => func; diff --git a/public/app/plugins/datasource/cloudwatch/components/LogsQueryField.tsx b/public/app/plugins/datasource/cloudwatch/components/LogsQueryField.tsx index e7f9075e60..b5092a2f6c 100644 --- a/public/app/plugins/datasource/cloudwatch/components/LogsQueryField.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/LogsQueryField.tsx @@ -13,7 +13,7 @@ import { SlatePrism, TypeaheadInput, TypeaheadOutput, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; // Utils & Services // dom also includes Element polyfills @@ -22,7 +22,7 @@ import { Editor } from 'slate-react'; import syntax from '../syntax'; // Types -import { AbsoluteTimeRange, AppEvents, ExploreQueryFieldProps, SelectableValue } from '@grafana/data'; +import { AbsoluteTimeRange, AppEvents, ExploreQueryFieldProps, SelectableValue } from '@credativ/plutono-data'; import { CloudWatchJsonData, CloudWatchLogsQuery, CloudWatchQuery } from '../types'; import { CloudWatchDatasource } from '../datasource'; import { LanguageMap, languages as prismLanguages } from 'prismjs'; @@ -30,7 +30,7 @@ import { CloudWatchLanguageProvider } from '../language_provider'; import { css } from 'emotion'; import { ExploreId } from 'app/types'; import { appEvents } from 'app/core/core'; -import { InputActionMeta } from '@grafana/ui/src/components/Select/types'; +import { InputActionMeta } from '@credativ/plutono-ui/src/components/Select/types'; import { getStatsGroups } from '../utils/query/getStatsGroups'; export interface CloudWatchLogsQueryFieldProps diff --git a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor.test.tsx index 7cf91a3d7d..b160bdfc38 100644 --- a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import renderer from 'react-test-renderer'; import { mount } from 'enzyme'; import { act } from 'react-dom/test-utils'; -import { DataSourceInstanceSettings } from '@grafana/data'; +import { DataSourceInstanceSettings } from '@credativ/plutono-data'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { MetricsQueryEditor, normalizeQuery, Props } from './MetricsQueryEditor'; import { CloudWatchDatasource } from '../datasource'; diff --git a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor.tsx index 857e14cb14..d6f0f78049 100644 --- a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryEditor.tsx @@ -1,8 +1,8 @@ import React, { PureComponent, ChangeEvent } from 'react'; import isEmpty from 'lodash/isEmpty'; -import { ExploreQueryFieldProps } from '@grafana/data'; -import { LegacyForms, ValidationEvents, EventsWithValidation, Icon } from '@grafana/ui'; +import { ExploreQueryFieldProps } from '@credativ/plutono-data'; +import { LegacyForms, ValidationEvents, EventsWithValidation, Icon } from '@credativ/plutono-ui'; const { Input, Switch } = LegacyForms; import { CloudWatchQuery, CloudWatchMetricsQuery, CloudWatchJsonData } from '../types'; import { CloudWatchDatasource } from '../datasource'; diff --git a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryFieldsEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryFieldsEditor.tsx index 15d701d898..f1163a8fae 100644 --- a/public/app/plugins/datasource/cloudwatch/components/MetricsQueryFieldsEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/MetricsQueryFieldsEditor.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; -import { SelectableValue } from '@grafana/data'; -import { Segment, SegmentAsync } from '@grafana/ui'; +import { SelectableValue } from '@credativ/plutono-data'; +import { Segment, SegmentAsync } from '@credativ/plutono-ui'; import { CloudWatchMetricsQuery, SelectableStrings } from '../types'; import { CloudWatchDatasource } from '../datasource'; import { Dimensions, QueryInlineField, Stats } from '.'; diff --git a/public/app/plugins/datasource/cloudwatch/components/PanelQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/PanelQueryEditor.tsx index 295b4c3ceb..ee2bd1330a 100644 --- a/public/app/plugins/datasource/cloudwatch/components/PanelQueryEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/PanelQueryEditor.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import pick from 'lodash/pick'; -import { ExploreQueryFieldProps, ExploreMode } from '@grafana/data'; -import { Segment } from '@grafana/ui'; +import { ExploreQueryFieldProps, ExploreMode } from '@credativ/plutono-data'; +import { Segment } from '@credativ/plutono-ui'; import { CloudWatchJsonData, CloudWatchQuery } from '../types'; import { CloudWatchDatasource } from '../datasource'; import { QueryInlineField } from './'; diff --git a/public/app/plugins/datasource/cloudwatch/components/Stats.tsx b/public/app/plugins/datasource/cloudwatch/components/Stats.tsx index 748b19f77b..74f4e23c4b 100644 --- a/public/app/plugins/datasource/cloudwatch/components/Stats.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/Stats.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from 'react'; import { SelectableStrings } from '../types'; -import { SelectableValue } from '@grafana/data'; -import { Segment, Icon } from '@grafana/ui'; +import { SelectableValue } from '@credativ/plutono-data'; +import { Segment, Icon } from '@credativ/plutono-ui'; export interface Props { values: string[]; diff --git a/public/app/plugins/datasource/cloudwatch/dashboards/EBS.json b/public/app/plugins/datasource/cloudwatch/dashboards/EBS.json index 67fdda9bd3..398f495226 100644 --- a/public/app/plugins/datasource/cloudwatch/dashboards/EBS.json +++ b/public/app/plugins/datasource/cloudwatch/dashboards/EBS.json @@ -16,9 +16,9 @@ "version": "1.0.0" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", + "type": "plutono", + "id": "plutono", + "name": "Plutono", "version": "6.6.0-pre" }, { @@ -38,7 +38,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", diff --git a/public/app/plugins/datasource/cloudwatch/dashboards/Lambda.json b/public/app/plugins/datasource/cloudwatch/dashboards/Lambda.json index 9b76536036..99fc29844c 100644 --- a/public/app/plugins/datasource/cloudwatch/dashboards/Lambda.json +++ b/public/app/plugins/datasource/cloudwatch/dashboards/Lambda.json @@ -25,9 +25,9 @@ "version": "1.0.0" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", + "type": "plutono", + "id": "plutono", + "name": "Plutono", "version": "6.6.0-pre" }, { @@ -47,7 +47,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", diff --git a/public/app/plugins/datasource/cloudwatch/dashboards/Logs.json b/public/app/plugins/datasource/cloudwatch/dashboards/Logs.json index 90d211fa31..434dae3c26 100644 --- a/public/app/plugins/datasource/cloudwatch/dashboards/Logs.json +++ b/public/app/plugins/datasource/cloudwatch/dashboards/Logs.json @@ -17,9 +17,9 @@ "version": "1.0.0" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", + "type": "plutono", + "id": "plutono", + "name": "Plutono", "version": "6.6.0-pre" }, { @@ -39,7 +39,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", diff --git a/public/app/plugins/datasource/cloudwatch/dashboards/RDS.json b/public/app/plugins/datasource/cloudwatch/dashboards/RDS.json index b0884721b8..54e6aaee18 100644 --- a/public/app/plugins/datasource/cloudwatch/dashboards/RDS.json +++ b/public/app/plugins/datasource/cloudwatch/dashboards/RDS.json @@ -25,9 +25,9 @@ "version": "1.0.0" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", + "type": "plutono", + "id": "plutono", + "name": "Plutono", "version": "6.6.0-pre" }, { @@ -47,7 +47,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", diff --git a/public/app/plugins/datasource/cloudwatch/dashboards/ec2.json b/public/app/plugins/datasource/cloudwatch/dashboards/ec2.json index 483cc28334..d15e1bb274 100644 --- a/public/app/plugins/datasource/cloudwatch/dashboards/ec2.json +++ b/public/app/plugins/datasource/cloudwatch/dashboards/ec2.json @@ -25,9 +25,9 @@ "version": "1.0.0" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", + "type": "plutono", + "id": "plutono", + "name": "Plutono", "version": "6.6.0-pre" }, { @@ -47,7 +47,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", diff --git a/public/app/plugins/datasource/cloudwatch/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/datasource.test.ts index 67b675a734..a8a0beee64 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.test.ts +++ b/public/app/plugins/datasource/cloudwatch/datasource.test.ts @@ -1,6 +1,6 @@ import { of } from 'rxjs'; -import { setBackendSrv } from '@grafana/runtime'; -import { dateTime, getDefaultTimeRange } from '@grafana/data'; +import { setBackendSrv } from '@credativ/plutono-runtime'; +import { dateTime, getDefaultTimeRange } from '@credativ/plutono-data'; import { TemplateSrv } from '../../../features/templating/template_srv'; import { CloudWatchDatasource } from './datasource'; diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts index 35124ab30a..6d9ef8e03a 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.ts +++ b/public/app/plugins/datasource/cloudwatch/datasource.ts @@ -15,8 +15,8 @@ import { takeWhile, tap, } from 'rxjs/operators'; -import { getBackendSrv, getGrafanaLiveSrv, toDataQueryResponse } from '@grafana/runtime'; -import { RowContextOptions } from '@grafana/ui/src/components/Logs/LogRowContextProvider'; +import { getBackendSrv, getPlutonoLiveSrv, toDataQueryResponse } from '@credativ/plutono-runtime'; +import { RowContextOptions } from '@credativ/plutono-ui/src/components/Logs/LogRowContextProvider'; import { DataFrame, DataQueryErrorType, @@ -33,7 +33,7 @@ import { rangeUtil, ScopedVars, TimeRange, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { notifyApp } from 'app/core/actions'; import { createErrorNotification } from 'app/core/copy/appNotification'; @@ -68,8 +68,8 @@ import config from 'app/core/config'; const TSDB_QUERY_ENDPOINT = '/api/tsdb/query'; // Constants also defined in tsdb/cloudwatch/cloudwatch.go -const LOG_IDENTIFIER_INTERNAL = '__log__grafana_internal__'; -const LOGSTREAM_IDENTIFIER_INTERNAL = '__logstream__grafana_internal__'; +const LOG_IDENTIFIER_INTERNAL = '__log__plutono_internal__'; +const LOGSTREAM_IDENTIFIER_INTERNAL = '__logstream__plutono_internal__'; const displayAlert = (datasourceName: string, region: string) => store.dispatch( @@ -187,7 +187,7 @@ export class CloudWatchDatasource extends DataSourceApi { const channelName: string = response.results['A'].meta.channelName; - const channel = getGrafanaLiveSrv().getChannel({ + const channel = getPlutonoLiveSrv().getChannel({ scope: LiveChannelScope.Plugin, namespace: 'cloudwatch', path: channelName, diff --git a/public/app/plugins/datasource/cloudwatch/language_provider.test.ts b/public/app/plugins/datasource/cloudwatch/language_provider.test.ts index a7efeb9ac6..ccdab216bb 100644 --- a/public/app/plugins/datasource/cloudwatch/language_provider.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language_provider.test.ts @@ -1,5 +1,5 @@ import { Value } from 'slate'; -import { TypeaheadOutput } from '@grafana/ui'; +import { TypeaheadOutput } from '@credativ/plutono-ui'; import { CloudWatchDatasource } from './datasource'; import { GetLogGroupFieldsResponse } from './types'; import { CloudWatchLanguageProvider } from './language_provider'; diff --git a/public/app/plugins/datasource/cloudwatch/language_provider.ts b/public/app/plugins/datasource/cloudwatch/language_provider.ts index 004ee9e739..dbb8601d97 100644 --- a/public/app/plugins/datasource/cloudwatch/language_provider.ts +++ b/public/app/plugins/datasource/cloudwatch/language_provider.ts @@ -15,10 +15,10 @@ import syntax, { // Types import { CloudWatchQuery, TSDBResponse } from './types'; -import { AbsoluteTimeRange, HistoryItem, LanguageProvider } from '@grafana/data'; +import { AbsoluteTimeRange, HistoryItem, LanguageProvider } from '@credativ/plutono-data'; import { CloudWatchDatasource } from './datasource'; -import { Token, TypeaheadInput, TypeaheadOutput } from '@grafana/ui'; +import { Token, TypeaheadInput, TypeaheadOutput } from '@credativ/plutono-ui'; import Prism, { Grammar } from 'prismjs'; export type CloudWatchHistoryItem = HistoryItem; diff --git a/public/app/plugins/datasource/cloudwatch/module.tsx b/public/app/plugins/datasource/cloudwatch/module.tsx index 9c82f4ef37..46081ef5f4 100644 --- a/public/app/plugins/datasource/cloudwatch/module.tsx +++ b/public/app/plugins/datasource/cloudwatch/module.tsx @@ -1,5 +1,5 @@ import './query_parameter_ctrl'; -import { DataSourcePlugin } from '@grafana/data'; +import { DataSourcePlugin } from '@credativ/plutono-data'; import { ConfigEditor } from './components/ConfigEditor'; import { CloudWatchDatasource } from './datasource'; import { CloudWatchAnnotationsQueryCtrl } from './annotations_query_ctrl'; diff --git a/public/app/plugins/datasource/cloudwatch/query_parameter_ctrl.ts b/public/app/plugins/datasource/cloudwatch/query_parameter_ctrl.ts index 23ca76ce13..fc367176bf 100644 --- a/public/app/plugins/datasource/cloudwatch/query_parameter_ctrl.ts +++ b/public/app/plugins/datasource/cloudwatch/query_parameter_ctrl.ts @@ -1,7 +1,7 @@ import angular from 'angular'; import coreModule from 'app/core/core_module'; import _ from 'lodash'; -import { TemplateSrv } from '@grafana/runtime'; +import { TemplateSrv } from '@credativ/plutono-runtime'; export class CloudWatchQueryParameterCtrl { /** @ngInject */ diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts index afc8ba357b..0de7f182e8 100644 --- a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts +++ b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts @@ -6,7 +6,7 @@ import { DataSourceInstanceSettings, dateMath, getFrameDisplayName, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import * as redux from 'app/store/store'; import { CloudWatchDatasource, MAX_ATTEMPTS } from '../datasource'; @@ -33,8 +33,8 @@ jest.mock('rxjs/operators', () => { return operators; }); -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, })); diff --git a/public/app/plugins/datasource/cloudwatch/syntax.ts b/public/app/plugins/datasource/cloudwatch/syntax.ts index 92c279ec52..7a40b3ae6f 100644 --- a/public/app/plugins/datasource/cloudwatch/syntax.ts +++ b/public/app/plugins/datasource/cloudwatch/syntax.ts @@ -1,5 +1,5 @@ import { Grammar } from 'prismjs'; -import { CompletionItem } from '@grafana/ui'; +import { CompletionItem } from '@credativ/plutono-ui'; export const QUERY_COMMANDS: CompletionItem[] = [ { diff --git a/public/app/plugins/datasource/cloudwatch/types.ts b/public/app/plugins/datasource/cloudwatch/types.ts index 136a3999bb..c21cc02244 100644 --- a/public/app/plugins/datasource/cloudwatch/types.ts +++ b/public/app/plugins/datasource/cloudwatch/types.ts @@ -1,5 +1,5 @@ -import { DataQuery, SelectableValue } from '@grafana/data'; -import { AwsAuthDataSourceSecureJsonData, AwsAuthDataSourceJsonData } from '@grafana/aws-sdk'; +import { DataQuery, SelectableValue } from '@credativ/plutono-data'; +import { AwsAuthDataSourceSecureJsonData, AwsAuthDataSourceJsonData } from '@credativ/plutono-aws-sdk'; export interface CloudWatchMetricsQuery extends DataQuery { queryMode?: 'Metrics'; diff --git a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx index 7e5ea4ddab..613fe79379 100644 --- a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx +++ b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; -import { LegacyForms, VerticalGroup } from '@grafana/ui'; -import { DataQuery, PanelData, SelectableValue } from '@grafana/data'; +import { LegacyForms, VerticalGroup } from '@credativ/plutono-ui'; +import { DataQuery, PanelData, SelectableValue } from '@credativ/plutono-data'; import { css } from 'emotion'; import { DashboardQuery, ResultInfo, SHARED_DASHBODARD_QUERY } from './types'; diff --git a/public/app/plugins/datasource/dashboard/DashboardQueryRow.tsx b/public/app/plugins/datasource/dashboard/DashboardQueryRow.tsx index f82274b179..ae27c4a005 100644 --- a/public/app/plugins/datasource/dashboard/DashboardQueryRow.tsx +++ b/public/app/plugins/datasource/dashboard/DashboardQueryRow.tsx @@ -1,7 +1,7 @@ import React, { ReactElement } from 'react'; import { css } from 'emotion'; -import { Icon, useStyles } from '@grafana/ui'; -import { GrafanaTheme } from '@grafana/data'; +import { Icon, useStyles } from '@credativ/plutono-ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { ResultInfo } from './types'; @@ -30,7 +30,7 @@ export function DashboardQueryRow({ editURL, target }: Props): ReactElement { ); } -function getStyles(theme: GrafanaTheme) { +function getStyles(theme: PlutonoTheme) { return { logo: css` label: logo; diff --git a/public/app/plugins/datasource/dashboard/datasource.ts b/public/app/plugins/datasource/dashboard/datasource.ts index 0f7f8d8d3f..669a791e22 100644 --- a/public/app/plugins/datasource/dashboard/datasource.ts +++ b/public/app/plugins/datasource/dashboard/datasource.ts @@ -1,4 +1,4 @@ -import { DataSourceApi, DataQueryRequest, DataQueryResponse, DataSourceInstanceSettings } from '@grafana/data'; +import { DataSourceApi, DataQueryRequest, DataQueryResponse, DataSourceInstanceSettings } from '@credativ/plutono-data'; import { DashboardQuery } from './types'; /** diff --git a/public/app/plugins/datasource/dashboard/module.ts b/public/app/plugins/datasource/dashboard/module.ts index ac32bca87e..28c6e2c73c 100644 --- a/public/app/plugins/datasource/dashboard/module.ts +++ b/public/app/plugins/datasource/dashboard/module.ts @@ -1,4 +1,4 @@ import { DashboardDatasource } from './datasource'; -import { DataSourcePlugin } from '@grafana/data'; +import { DataSourcePlugin } from '@credativ/plutono-data'; export const plugin = new DataSourcePlugin(DashboardDatasource); diff --git a/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts b/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts index 51c273a436..4b1edcd639 100644 --- a/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts +++ b/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts @@ -1,5 +1,5 @@ import { isSharedDashboardQuery } from './runSharedRequest'; -import { DataSourceApi } from '@grafana/data'; +import { DataSourceApi } from '@credativ/plutono-data'; describe('SharedQueryRunner', () => { it('should identify shared queries', () => { diff --git a/public/app/plugins/datasource/dashboard/runSharedRequest.ts b/public/app/plugins/datasource/dashboard/runSharedRequest.ts index 8a0cec09a5..3541ed58cb 100644 --- a/public/app/plugins/datasource/dashboard/runSharedRequest.ts +++ b/public/app/plugins/datasource/dashboard/runSharedRequest.ts @@ -9,7 +9,7 @@ import { getDefaultTimeRange, LoadingState, PanelData, -} from '@grafana/data'; +} from '@credativ/plutono-data'; export function isSharedDashboardQuery(datasource: string | DataSourceApi | null) { if (!datasource) { diff --git a/public/app/plugins/datasource/dashboard/types.ts b/public/app/plugins/datasource/dashboard/types.ts index 2ab06533f9..8ce204d3ed 100644 --- a/public/app/plugins/datasource/dashboard/types.ts +++ b/public/app/plugins/datasource/dashboard/types.ts @@ -1,4 +1,4 @@ -import { DataFrame, DataQuery, DataQueryError } from '@grafana/data'; +import { DataFrame, DataQuery, DataQueryError } from '@credativ/plutono-data'; export const SHARED_DASHBODARD_QUERY = '-- Dashboard --'; diff --git a/public/app/plugins/datasource/elasticsearch/README.md b/public/app/plugins/datasource/elasticsearch/README.md index 3780bffc45..d33ad8185a 100644 --- a/public/app/plugins/datasource/elasticsearch/README.md +++ b/public/app/plugins/datasource/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch Data Source - Native Plugin -Grafana ships with **advanced support** for Elasticsearch. You can do many types of simple or complex elasticsearch queries to visualize logs or metrics stored in Elasticsearch. You can also annotate your graphs with log events stored in Elasticsearch. +Plutono ships with **advanced support** for Elasticsearch. You can do many types of simple or complex elasticsearch queries to visualize logs or metrics stored in Elasticsearch. You can also annotate your graphs with log events stored in Elasticsearch. Read more about it here: diff --git a/public/app/plugins/datasource/elasticsearch/components/IconButton.tsx b/public/app/plugins/datasource/elasticsearch/components/IconButton.tsx index b11a97d9be..3ea8544959 100644 --- a/public/app/plugins/datasource/elasticsearch/components/IconButton.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/IconButton.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@grafana/ui'; +import { Icon } from '@credativ/plutono-ui'; import { cx, css } from 'emotion'; import React, { FunctionComponent, ComponentProps, ButtonHTMLAttributes } from 'react'; diff --git a/public/app/plugins/datasource/elasticsearch/components/MetricPicker.tsx b/public/app/plugins/datasource/elasticsearch/components/MetricPicker.tsx index c1b7f86d8d..935bce6fb2 100644 --- a/public/app/plugins/datasource/elasticsearch/components/MetricPicker.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/MetricPicker.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from 'react'; import { css, cx } from 'emotion'; -import { SelectableValue } from '@grafana/data'; -import { Segment } from '@grafana/ui'; +import { SelectableValue } from '@credativ/plutono-data'; +import { Segment } from '@credativ/plutono-ui'; import { describeMetric } from '../utils'; import { MetricAggregation } from './QueryEditor/MetricAggregationsEditor/aggregations'; diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/BucketAggregationEditor.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/BucketAggregationEditor.tsx index c16f214895..b3b26c781a 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/BucketAggregationEditor.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/BucketAggregationEditor.tsx @@ -1,5 +1,5 @@ -import { MetricFindValue, SelectableValue } from '@grafana/data'; -import { InlineSegmentGroup, Segment, SegmentAsync } from '@grafana/ui'; +import { MetricFindValue, SelectableValue } from '@credativ/plutono-data'; +import { InlineSegmentGroup, Segment, SegmentAsync } from '@credativ/plutono-ui'; import React, { FunctionComponent } from 'react'; import { useDispatch } from '../../../hooks/useStatelessReducer'; import { useDatasource } from '../ElasticsearchQueryContext'; diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/index.tsx index c48b2697f3..88185b5f30 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/index.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/index.tsx @@ -1,4 +1,4 @@ -import { InlineField, Input, QueryField } from '@grafana/ui'; +import { InlineField, Input, QueryField } from '@credativ/plutono-ui'; import { css } from 'emotion'; import React, { FunctionComponent, useEffect } from 'react'; import { AddRemove } from '../../../../AddRemove'; diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/index.tsx index c815b08044..9a6d2fa97f 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/index.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/index.tsx @@ -1,4 +1,4 @@ -import { InlineField, Input, Select } from '@grafana/ui'; +import { InlineField, Input, Select } from '@credativ/plutono-ui'; import React, { ComponentProps, FunctionComponent } from 'react'; import { useDispatch } from '../../../../hooks/useStatelessReducer'; import { SettingsEditorContainer } from '../../SettingsEditorContainer'; diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/utils.ts b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/utils.ts index 45541c7e63..4bcf620832 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/utils.ts +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/utils.ts @@ -7,7 +7,7 @@ import { MetricAggregation, Percentiles, } from '../MetricAggregationsEditor/aggregations'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; export const bucketAggregationConfig: BucketsConfiguration = { terms: { diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx index 3defc6b1e9..bedb028f91 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx @@ -1,5 +1,5 @@ -import { MetricFindValue, SelectableValue } from '@grafana/data'; -import { InlineSegmentGroup, Segment, SegmentAsync, useTheme } from '@grafana/ui'; +import { MetricFindValue, SelectableValue } from '@credativ/plutono-data'; +import { InlineSegmentGroup, Segment, SegmentAsync, useTheme } from '@credativ/plutono-ui'; import { cx } from 'emotion'; import React, { FunctionComponent } from 'react'; import { useDatasource, useQuery } from '../ElasticsearchQueryContext'; diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/BucketScriptSettingsEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/BucketScriptSettingsEditor/index.tsx index ca31e6191a..f740441c30 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/BucketScriptSettingsEditor/index.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/BucketScriptSettingsEditor/index.tsx @@ -1,5 +1,5 @@ import React, { Fragment, FunctionComponent, useEffect } from 'react'; -import { Input, InlineLabel } from '@grafana/ui'; +import { Input, InlineLabel } from '@credativ/plutono-ui'; import { MetricAggregationAction } from '../../state/types'; import { changeMetricAttribute } from '../../state/actions'; import { css } from 'emotion'; diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/MovingAverageSettingsEditor.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/MovingAverageSettingsEditor.tsx index 5103c5110f..cebb979150 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/MovingAverageSettingsEditor.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/MovingAverageSettingsEditor.tsx @@ -1,4 +1,4 @@ -import { Input, InlineField, Select, Switch } from '@grafana/ui'; +import { Input, InlineField, Select, Switch } from '@credativ/plutono-ui'; import React, { FunctionComponent } from 'react'; import { useDispatch } from '../../../../hooks/useStatelessReducer'; import { movingAvgModelOptions } from '../../../../query_def'; diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/SettingField.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/SettingField.tsx index 01a9370cca..9ee705a898 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/SettingField.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/SettingField.tsx @@ -1,5 +1,5 @@ import React, { ComponentProps, useState } from 'react'; -import { InlineField, Input } from '@grafana/ui'; +import { InlineField, Input } from '@credativ/plutono-ui'; import { useDispatch } from '../../../../hooks/useStatelessReducer'; import { changeMetricSetting } from '../state/actions'; import { ChangeMetricSettingAction } from '../state/types'; diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx index 0c20b13427..5047808056 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx @@ -1,4 +1,4 @@ -import { InlineField, Input, InlineSwitch } from '@grafana/ui'; +import { InlineField, Input, InlineSwitch } from '@credativ/plutono-ui'; import React, { FunctionComponent, ComponentProps, useState } from 'react'; import { extendedStats } from '../../../../query_def'; import { useDispatch } from '../../../../hooks/useStatelessReducer'; diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/styles.ts b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/styles.ts index 470de7e031..2e32d4c012 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/styles.ts +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/styles.ts @@ -1,8 +1,8 @@ -import { GrafanaTheme } from '@grafana/data'; -import { stylesFactory } from '@grafana/ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { stylesFactory } from '@credativ/plutono-ui'; import { css } from 'emotion'; -export const getStyles = stylesFactory((theme: GrafanaTheme, hidden: boolean) => ({ +export const getStyles = stylesFactory((theme: PlutonoTheme, hidden: boolean) => ({ color: hidden && css` diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx index b4dfe932fc..7ec4e16eef 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx @@ -1,5 +1,5 @@ -import { GrafanaTheme } from '@grafana/data'; -import { IconButton, InlineFieldRow, InlineLabel, InlineSegmentGroup, stylesFactory, useTheme } from '@grafana/ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { IconButton, InlineFieldRow, InlineLabel, InlineSegmentGroup, stylesFactory, useTheme } from '@credativ/plutono-ui'; import { css } from 'emotion'; import { noop } from 'lodash'; import React, { FunctionComponent } from 'react'; @@ -55,7 +55,7 @@ export const QueryEditorRow: FunctionComponent = ({ ); }; -const getStyles = stylesFactory((theme: GrafanaTheme) => { +const getStyles = stylesFactory((theme: PlutonoTheme) => { return { iconWrapper: css` display: flex; diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx index ffe68974c4..82898c9b56 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx @@ -1,10 +1,10 @@ -import { GrafanaTheme } from '@grafana/data'; -import { Icon, InlineSegmentGroup, stylesFactory, useTheme } from '@grafana/ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { Icon, InlineSegmentGroup, stylesFactory, useTheme } from '@credativ/plutono-ui'; import { css, cx } from 'emotion'; import React, { FunctionComponent, useState } from 'react'; import { segmentStyles } from './styles'; -const getStyles = stylesFactory((theme: GrafanaTheme, hidden: boolean) => { +const getStyles = stylesFactory((theme: PlutonoTheme, hidden: boolean) => { return { wrapper: css` display: flex; diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx index cc8da80c0e..d738c71495 100644 --- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx @@ -1,9 +1,9 @@ import React, { FunctionComponent } from 'react'; -import { QueryEditorProps } from '@grafana/data'; +import { QueryEditorProps } from '@credativ/plutono-data'; import { ElasticDatasource } from '../../datasource'; import { ElasticsearchOptions, ElasticsearchQuery } from '../../types'; import { ElasticsearchProvider } from './ElasticsearchQueryContext'; -import { InlineField, InlineFieldRow, Input, QueryField } from '@grafana/ui'; +import { InlineField, InlineFieldRow, Input, QueryField } from '@credativ/plutono-ui'; import { changeAliasPattern, changeQuery } from './state'; import { MetricAggregationsEditor } from './MetricAggregationsEditor'; import { BucketAggregationsEditor } from './BucketAggregationsEditor'; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx index eedbaf1202..eb30e7cfd7 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { mount, shallow } from 'enzyme'; import { ConfigEditor } from './ConfigEditor'; -import { DataSourceHttpSettings } from '@grafana/ui'; +import { DataSourceHttpSettings } from '@credativ/plutono-ui'; import { ElasticDetails } from './ElasticDetails'; import { LogsConfig } from './LogsConfig'; import { createDefaultConfigOptions } from './mocks'; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx index def2f5da0b..7e1dc55e97 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx @@ -1,6 +1,6 @@ import React, { useEffect } from 'react'; -import { Alert, DataSourceHttpSettings } from '@grafana/ui'; -import { DataSourcePluginOptionsEditorProps } from '@grafana/data'; +import { Alert, DataSourceHttpSettings } from '@credativ/plutono-ui'; +import { DataSourcePluginOptionsEditorProps } from '@credativ/plutono-data'; import { ElasticsearchOptions } from '../types'; import { defaultMaxConcurrentShardRequests, ElasticDetails } from './ElasticDetails'; import { LogsConfig } from './LogsConfig'; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx b/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx index 87d62860aa..fdc9eb089f 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx @@ -1,7 +1,7 @@ import React, { Dispatch, SetStateAction, useEffect, useState } from 'react'; import { css } from 'emotion'; -import { VariableSuggestion } from '@grafana/data'; -import { Button, LegacyForms, DataLinkInput, stylesFactory } from '@grafana/ui'; +import { VariableSuggestion } from '@credativ/plutono-data'; +import { Button, LegacyForms, DataLinkInput, stylesFactory } from '@credativ/plutono-ui'; const { FormField, Switch } = LegacyForms; import { DataLinkConfig } from '../types'; import { usePrevious } from 'react-use'; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.test.tsx b/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.test.tsx index d6665b89b9..651af1b8ab 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.test.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { mount } from 'enzyme'; import { DataLinks } from './DataLinks'; -import { Button } from '@grafana/ui'; +import { Button } from '@credativ/plutono-ui'; import { DataLink } from './DataLink'; import { act } from 'react-dom/test-utils'; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx b/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx index 05ab6090e6..679d1c0332 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { css } from 'emotion'; -import { Button, stylesFactory, useTheme } from '@grafana/ui'; -import { GrafanaTheme, VariableOrigin, DataLinkBuiltInVars } from '@grafana/data'; +import { Button, stylesFactory, useTheme } from '@credativ/plutono-ui'; +import { PlutonoTheme, VariableOrigin, DataLinkBuiltInVars } from '@credativ/plutono-data'; import { DataLinkConfig } from '../types'; import { DataLink } from './DataLink'; -const getStyles = stylesFactory((theme: GrafanaTheme) => ({ +const getStyles = stylesFactory((theme: PlutonoTheme) => ({ infoText: css` padding-bottom: ${theme.spacing.md}; color: ${theme.colors.textWeak}; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx index 177a71c8fd..138c6b1ee5 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx @@ -3,7 +3,7 @@ import { last } from 'lodash'; import { mount } from 'enzyme'; import { ElasticDetails } from './ElasticDetails'; import { createDefaultConfigOptions } from './mocks'; -import { LegacyForms } from '@grafana/ui'; +import { LegacyForms } from '@credativ/plutono-ui'; const { Select } = LegacyForms; describe('ElasticDetails', () => { diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx index 49d36e76c3..3943303fbc 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { EventsWithValidation, regexValidation, LegacyForms } from '@grafana/ui'; +import { EventsWithValidation, regexValidation, LegacyForms } from '@credativ/plutono-ui'; const { Select, Input, FormField } = LegacyForms; import { ElasticsearchOptions, Interval } from '../types'; -import { DataSourceSettings, SelectableValue } from '@grafana/data'; +import { DataSourceSettings, SelectableValue } from '@credativ/plutono-data'; const indexPatternTypes = [ { label: 'No pattern', value: 'none' }, diff --git a/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.test.tsx b/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.test.tsx index eab865a458..142b879a82 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.test.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { mount, shallow } from 'enzyme'; import { LogsConfig } from './LogsConfig'; import { createDefaultConfigOptions } from './mocks'; -import { LegacyForms } from '@grafana/ui'; +import { LegacyForms } from '@credativ/plutono-ui'; const { FormField } = LegacyForms; describe('ElasticDetails', () => { diff --git a/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx b/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx index 67d547e7da..1ceb9e00b7 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { LegacyForms } from '@grafana/ui'; +import { LegacyForms } from '@credativ/plutono-ui'; const { FormField } = LegacyForms; import { ElasticsearchOptions } from '../types'; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/mocks.ts b/public/app/plugins/datasource/elasticsearch/configuration/mocks.ts index ea7b451b06..d8652ef5b4 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/mocks.ts +++ b/public/app/plugins/datasource/elasticsearch/configuration/mocks.ts @@ -1,4 +1,4 @@ -import { DataSourceSettings } from '@grafana/data'; +import { DataSourceSettings } from '@credativ/plutono-data'; import { ElasticsearchOptions } from '../types'; import { createDatasourceSettings } from '../../../../features/datasources/mocks'; diff --git a/public/app/plugins/datasource/elasticsearch/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/datasource.test.ts index 9d69c76923..e0856230d0 100644 --- a/public/app/plugins/datasource/elasticsearch/datasource.test.ts +++ b/public/app/plugins/datasource/elasticsearch/datasource.test.ts @@ -13,8 +13,8 @@ import { MutableDataFrame, TimeRange, toUtc, -} from '@grafana/data'; -import { BackendSrvRequest, FetchResponse } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { BackendSrvRequest, FetchResponse } from '@credativ/plutono-runtime'; import { ElasticDatasource, enhanceDataFrame } from './datasource'; import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__ @@ -24,8 +24,8 @@ import { createFetchResponse } from '../../../../test/helpers/createFetchRespons const ELASTICSEARCH_MOCK_URL = 'http://elasticsearch.local'; -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, getDataSourceSrv: () => { return { diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts index 7ac4d57fe7..2b156f7aab 100644 --- a/public/app/plugins/datasource/elasticsearch/datasource.ts +++ b/public/app/plugins/datasource/elasticsearch/datasource.ts @@ -17,16 +17,16 @@ import { ScopedVars, TimeRange, toUtc, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import LanguageProvider from './language_provider'; import { ElasticResponse } from './elastic_response'; import { IndexPattern } from './index_pattern'; import { ElasticQueryBuilder } from './query_builder'; import { defaultBucketAgg, hasMetricOfType } from './query_def'; -import { getBackendSrv, getDataSourceSrv } from '@grafana/runtime'; +import { getBackendSrv, getDataSourceSrv } from '@credativ/plutono-runtime'; import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv'; import { DataLinkConfig, ElasticsearchOptions, ElasticsearchQuery } from './types'; -import { RowContextOptions } from '@grafana/ui/src/components/Logs/LogRowContextProvider'; +import { RowContextOptions } from '@credativ/plutono-ui/src/components/Logs/LogRowContextProvider'; import { metricAggregationConfig } from './components/QueryEditor/MetricAggregationsEditor/utils'; import { isMetricAggregationWithField, diff --git a/public/app/plugins/datasource/elasticsearch/elastic_response.ts b/public/app/plugins/datasource/elasticsearch/elastic_response.ts index 470c064572..2d201fb09a 100644 --- a/public/app/plugins/datasource/elasticsearch/elastic_response.ts +++ b/public/app/plugins/datasource/elasticsearch/elastic_response.ts @@ -9,7 +9,7 @@ import { FieldType, MutableDataFrame, PreferredVisualisationType, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { ElasticsearchAggregation, ElasticsearchQuery } from './types'; import { ExtendedStatMetaType, diff --git a/public/app/plugins/datasource/elasticsearch/index_pattern.ts b/public/app/plugins/datasource/elasticsearch/index_pattern.ts index 386ebd9239..92a3678946 100644 --- a/public/app/plugins/datasource/elasticsearch/index_pattern.ts +++ b/public/app/plugins/datasource/elasticsearch/index_pattern.ts @@ -1,4 +1,4 @@ -import { toUtc, dateTime, DateTime, DurationUnit } from '@grafana/data'; +import { toUtc, dateTime, DateTime, DurationUnit } from '@credativ/plutono-data'; import { Interval } from './types'; type IntervalMap = Record< diff --git a/public/app/plugins/datasource/elasticsearch/language_provider.test.ts b/public/app/plugins/datasource/elasticsearch/language_provider.test.ts index c8b2c9f0c6..f3213a16e8 100644 --- a/public/app/plugins/datasource/elasticsearch/language_provider.test.ts +++ b/public/app/plugins/datasource/elasticsearch/language_provider.test.ts @@ -1,7 +1,7 @@ import LanguageProvider from './language_provider'; import { PromQuery } from '../prometheus/types'; import { ElasticDatasource } from './datasource'; -import { DataSourceInstanceSettings } from '@grafana/data'; +import { DataSourceInstanceSettings } from '@credativ/plutono-data'; import { ElasticsearchOptions, ElasticsearchQuery } from './types'; import { TemplateSrv } from '../../../features/templating/template_srv'; import { defaultBucketAgg } from './query_def'; diff --git a/public/app/plugins/datasource/elasticsearch/language_provider.ts b/public/app/plugins/datasource/elasticsearch/language_provider.ts index ea25957cdb..22068fed52 100644 --- a/public/app/plugins/datasource/elasticsearch/language_provider.ts +++ b/public/app/plugins/datasource/elasticsearch/language_provider.ts @@ -1,5 +1,5 @@ import { ElasticsearchQuery } from './types'; -import { DataQuery, LanguageProvider } from '@grafana/data'; +import { DataQuery, LanguageProvider } from '@credativ/plutono-data'; import { ElasticDatasource } from './datasource'; diff --git a/public/app/plugins/datasource/elasticsearch/module.ts b/public/app/plugins/datasource/elasticsearch/module.ts index 1ac22e392a..21a9898aeb 100644 --- a/public/app/plugins/datasource/elasticsearch/module.ts +++ b/public/app/plugins/datasource/elasticsearch/module.ts @@ -1,4 +1,4 @@ -import { DataSourcePlugin } from '@grafana/data'; +import { DataSourcePlugin } from '@credativ/plutono-data'; import { ElasticDatasource } from './datasource'; import { ConfigEditor } from './configuration/ConfigEditor'; import { QueryEditor } from './components/QueryEditor'; diff --git a/public/app/plugins/datasource/elasticsearch/query_help.md b/public/app/plugins/datasource/elasticsearch/query_help.md index ba42059f53..3f08ccd02e 100644 --- a/public/app/plugins/datasource/elasticsearch/query_help.md +++ b/public/app/plugins/datasource/elasticsearch/query_help.md @@ -5,6 +5,6 @@ #### Documentation links -[Grafana's Elasticsearch Documentation](http://docs.grafana.org/features/datasources/elasticsearch) +[Plutono's Elasticsearch Documentation](http://docs.plutono.org/features/datasources/elasticsearch) [Official Elasticsearch Documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html) diff --git a/public/app/plugins/datasource/elasticsearch/specs/elastic_response.test.ts b/public/app/plugins/datasource/elasticsearch/specs/elastic_response.test.ts index e518e189fa..ef8f38ac8a 100644 --- a/public/app/plugins/datasource/elasticsearch/specs/elastic_response.test.ts +++ b/public/app/plugins/datasource/elasticsearch/specs/elastic_response.test.ts @@ -1,4 +1,4 @@ -import { DataFrameView, FieldCache, KeyValue, MutableDataFrame } from '@grafana/data'; +import { DataFrameView, FieldCache, KeyValue, MutableDataFrame } from '@credativ/plutono-data'; import { ElasticResponse } from '../elastic_response'; import flatten from 'app/core/utils/flatten'; import { ElasticsearchQuery } from '../types'; diff --git a/public/app/plugins/datasource/elasticsearch/specs/index_pattern.test.ts b/public/app/plugins/datasource/elasticsearch/specs/index_pattern.test.ts index 76a96794dd..390233b590 100644 --- a/public/app/plugins/datasource/elasticsearch/specs/index_pattern.test.ts +++ b/public/app/plugins/datasource/elasticsearch/specs/index_pattern.test.ts @@ -1,7 +1,7 @@ /// import { IndexPattern } from '../index_pattern'; -import { toUtc, getLocale, setLocale, dateTime } from '@grafana/data'; +import { toUtc, getLocale, setLocale, dateTime } from '@credativ/plutono-data'; describe('IndexPattern', () => { const originalLocale = getLocale(); diff --git a/public/app/plugins/datasource/elasticsearch/types.ts b/public/app/plugins/datasource/elasticsearch/types.ts index 6f9b633753..d1b34cb51f 100644 --- a/public/app/plugins/datasource/elasticsearch/types.ts +++ b/public/app/plugins/datasource/elasticsearch/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/data'; +import { DataQuery, DataSourceJsonData } from '@credativ/plutono-data'; import { BucketAggregation, BucketAggregationType, diff --git a/public/app/plugins/datasource/elasticsearch/utils.test.ts b/public/app/plugins/datasource/elasticsearch/utils.test.ts index 22f396b3c1..212c06593c 100644 --- a/public/app/plugins/datasource/elasticsearch/utils.test.ts +++ b/public/app/plugins/datasource/elasticsearch/utils.test.ts @@ -17,7 +17,7 @@ describe('removeEmpty', () => { }, nestedObjectToKeep: { thisShouldBeRemoved: null, - thisShouldBeKept: 'Hello, Grafana', + thisShouldBeKept: 'Hello, Plutono', }, }; @@ -27,7 +27,7 @@ describe('removeEmpty', () => { booleansShouldBeKept: false, nonEmptyArraysShouldBeKept: [1, 2, 3], nestedObjectToKeep: { - thisShouldBeKept: 'Hello, Grafana', + thisShouldBeKept: 'Hello, Plutono', }, }; diff --git a/public/app/plugins/datasource/elasticsearch/utils.ts b/public/app/plugins/datasource/elasticsearch/utils.ts index ad6de6a724..d611a98e55 100644 --- a/public/app/plugins/datasource/elasticsearch/utils.ts +++ b/public/app/plugins/datasource/elasticsearch/utils.ts @@ -67,7 +67,7 @@ export const convertOrderByToMetricId = (orderBy: string): string | undefined => /** Gets the actual script value for metrics that support inline scripts. * * This is needed because the `script` is a bit polymorphic. - * when creating a query with Grafana < 7.4 it was stored as: + * when creating a query with Plutono < 7.4 it was stored as: * ```json * { * "settings": { diff --git a/public/app/plugins/datasource/grafana/annotation_ctrl.ts b/public/app/plugins/datasource/grafana/annotation_ctrl.ts deleted file mode 100644 index 8876ddfb66..0000000000 --- a/public/app/plugins/datasource/grafana/annotation_ctrl.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { SelectableValue } from '@grafana/data'; -import { GrafanaAnnotationType } from './types'; - -export const annotationTypes: Array> = [ - { text: 'Dashboard', value: GrafanaAnnotationType.Dashboard }, - { text: 'Tags', value: GrafanaAnnotationType.Tags }, -]; - -export class GrafanaAnnotationsQueryCtrl { - annotation: any; - - types = annotationTypes; - - constructor() { - this.annotation.type = this.annotation.type || GrafanaAnnotationType.Tags; - this.annotation.limit = this.annotation.limit || 100; - } - - static templateUrl = 'partials/annotations.editor.html'; -} diff --git a/public/app/plugins/datasource/grafana/module.ts b/public/app/plugins/datasource/grafana/module.ts deleted file mode 100644 index 4fff367be8..0000000000 --- a/public/app/plugins/datasource/grafana/module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { DataSourcePlugin } from '@grafana/data'; -import { GrafanaDatasource } from './datasource'; -import { QueryEditor } from './components/QueryEditor'; -import { GrafanaQuery } from './types'; -import { GrafanaAnnotationsQueryCtrl } from './annotation_ctrl'; - -export const plugin = new DataSourcePlugin(GrafanaDatasource) - .setQueryEditor(QueryEditor) - .setAnnotationQueryCtrl(GrafanaAnnotationsQueryCtrl); diff --git a/public/app/plugins/datasource/grafana/types.ts b/public/app/plugins/datasource/grafana/types.ts deleted file mode 100644 index e9fe0abb58..0000000000 --- a/public/app/plugins/datasource/grafana/types.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { AnnotationQuery, DataQuery } from '@grafana/data'; -import { MeasurementsQuery } from '@grafana/runtime'; - -//---------------------------------------------- -// Query -//---------------------------------------------- - -export enum GrafanaQueryType { - RandomWalk = 'randomWalk', - LiveMeasurements = 'measurements', -} - -export interface GrafanaQuery extends DataQuery { - queryType: GrafanaQueryType; // RandomWalk by default - channel?: string; - measurements?: MeasurementsQuery; -} - -export const defaultQuery: GrafanaQuery = { - refId: 'A', - queryType: GrafanaQueryType.RandomWalk, -}; - -//---------------------------------------------- -// Annotations -//---------------------------------------------- - -export enum GrafanaAnnotationType { - Dashboard = 'dashboard', - Tags = 'tags', -} - -export interface GrafanaAnnotationQuery extends AnnotationQuery { - type: GrafanaAnnotationType; // tags - limit: number; // 100 - tags?: string[]; - matchAny?: boolean; // By default Grafana only shows annotations that match all tags in the query. Enabling this returns annotations that match any of the tags in the query. -} diff --git a/public/app/plugins/datasource/graphite/FunctionEditor.tsx b/public/app/plugins/datasource/graphite/FunctionEditor.tsx index d178904640..b6bebf01c1 100644 --- a/public/app/plugins/datasource/graphite/FunctionEditor.tsx +++ b/public/app/plugins/datasource/graphite/FunctionEditor.tsx @@ -1,5 +1,5 @@ import React, { Suspense } from 'react'; -import { PopoverController, Popover, ClickOutsideWrapper } from '@grafana/ui'; +import { PopoverController, Popover, ClickOutsideWrapper } from '@credativ/plutono-ui'; import { FunctionDescriptor, FunctionEditorControls, FunctionEditorControlsProps } from './FunctionEditorControls'; interface FunctionEditorProps extends FunctionEditorControlsProps { diff --git a/public/app/plugins/datasource/graphite/FunctionEditorControls.tsx b/public/app/plugins/datasource/graphite/FunctionEditorControls.tsx index 1a8211b791..6ef9a1852b 100644 --- a/public/app/plugins/datasource/graphite/FunctionEditorControls.tsx +++ b/public/app/plugins/datasource/graphite/FunctionEditorControls.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Icon } from '@grafana/ui'; +import { Icon } from '@credativ/plutono-ui'; export interface FunctionDescriptor { text: string; diff --git a/public/app/plugins/datasource/graphite/MetricTankMetaInspector.tsx b/public/app/plugins/datasource/graphite/MetricTankMetaInspector.tsx index 403c125f46..ee45dd716a 100644 --- a/public/app/plugins/datasource/graphite/MetricTankMetaInspector.tsx +++ b/public/app/plugins/datasource/graphite/MetricTankMetaInspector.tsx @@ -1,10 +1,10 @@ import { css, cx } from 'emotion'; import React, { PureComponent } from 'react'; -import { MetadataInspectorProps, rangeUtil } from '@grafana/data'; +import { MetadataInspectorProps, rangeUtil } from '@credativ/plutono-data'; import { GraphiteDatasource } from './datasource'; import { GraphiteQuery, GraphiteOptions, MetricTankSeriesMeta } from './types'; import { parseSchemaRetentions, getRollupNotice, getRuntimeConsolidationNotice } from './meta'; -import { stylesFactory } from '@grafana/ui'; +import { stylesFactory } from '@credativ/plutono-ui'; import { config } from 'app/core/config'; export type Props = MetadataInspectorProps; diff --git a/public/app/plugins/datasource/graphite/README.md b/public/app/plugins/datasource/graphite/README.md index d0890e4925..7338fa98cc 100644 --- a/public/app/plugins/datasource/graphite/README.md +++ b/public/app/plugins/datasource/graphite/README.md @@ -1,12 +1,12 @@ # Graphite Data Source - Native Plugin -Grafana ships with **built in** support for Graphite (of course!). +Plutono ships with **built in** support for Graphite (of course!). -Grafana has an advanced Graphite query editor that lets you quickly navigate the metric space, add functions, change function parameters and much more. The editor can handle all types of graphite queries. It can even handle complex nested queries through the use of query references. +Plutono has an advanced Graphite query editor that lets you quickly navigate the metric space, add functions, change function parameters and much more. The editor can handle all types of graphite queries. It can even handle complex nested queries through the use of query references. Read more about it here: -[http://docs.grafana.org/datasources/graphite/](http://docs.grafana.org/datasources/graphite/) +[http://docs.plutono.org/datasources/graphite/](http://docs.plutono.org/datasources/graphite/) Graphite 1.1 Release: diff --git a/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx index 0e2bcee2ce..35b68b7ae7 100644 --- a/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx +++ b/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx @@ -1,11 +1,11 @@ import React, { PureComponent } from 'react'; -import { DataSourceHttpSettings, InlineFormLabel, LegacyForms } from '@grafana/ui'; +import { DataSourceHttpSettings, InlineFormLabel, LegacyForms } from '@credativ/plutono-ui'; const { Select, Switch } = LegacyForms; import { DataSourcePluginOptionsEditorProps, onUpdateDatasourceJsonDataOptionSelect, onUpdateDatasourceJsonDataOptionChecked, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { GraphiteOptions, GraphiteType } from '../types'; const graphiteVersions = [ diff --git a/public/app/plugins/datasource/graphite/dashboards/metrictank.json b/public/app/plugins/datasource/graphite/dashboards/metrictank.json index 7cc07a8a3d..0697a4d274 100644 --- a/public/app/plugins/datasource/graphite/dashboards/metrictank.json +++ b/public/app/plugins/datasource/graphite/dashboards/metrictank.json @@ -11,7 +11,7 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": "-- Plutono --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts index a4cf2ae9ce..5117b62e04 100644 --- a/public/app/plugins/datasource/graphite/datasource.ts +++ b/public/app/plugins/datasource/graphite/datasource.ts @@ -9,10 +9,10 @@ import { ScopedVars, toDataFrame, TimeRange, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { isVersionGtOrEq, SemVersion } from 'app/core/utils/version'; import gfunc from './gfunc'; -import { getBackendSrv } from '@grafana/runtime'; +import { getBackendSrv } from '@credativ/plutono-runtime'; import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv'; // Types import { GraphiteOptions, GraphiteQuery, GraphiteType, MetricTankRequestMeta } from './types'; @@ -56,7 +56,7 @@ export class GraphiteDatasource extends DataSourceApi ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, })); diff --git a/public/app/plugins/datasource/graphite/types.ts b/public/app/plugins/datasource/graphite/types.ts index 46b6bde0aa..7df858b316 100644 --- a/public/app/plugins/datasource/graphite/types.ts +++ b/public/app/plugins/datasource/graphite/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/data'; +import { DataQuery, DataSourceJsonData } from '@credativ/plutono-data'; export interface GraphiteQuery extends DataQuery { target?: string; diff --git a/public/app/plugins/datasource/influxdb/README.md b/public/app/plugins/datasource/influxdb/README.md index 3cfb8c07ef..158138735c 100644 --- a/public/app/plugins/datasource/influxdb/README.md +++ b/public/app/plugins/datasource/influxdb/README.md @@ -1,9 +1,9 @@ # InfluxDB data source -Grafana ships with built-in support for InfluxDB releases >0.9.x. +Plutono ships with built-in support for InfluxDB releases >0.9.x. -There are separate data sources for InfluxDB in Grafana: the latest InfluxDB release and [InfluxDB 0.8.x](https://grafana.com/plugins/grafana-influxdb-08-datasource) that Grafana maintains support for as a convenience for its existing users. InfluxDB no longer maintains release 0.8. +There are separate data sources for InfluxDB in Plutono: the latest InfluxDB release and [InfluxDB 0.8.x](https://grafana.com/plugins/plutono-influxdb-08-datasource) that Plutono maintains support for as a convenience for its existing users. InfluxDB no longer maintains release 0.8. -The API and capabilities of the latest release of InfluxDB are completely different from those of InfluxDB 0.8.x, which is why Grafana handles them as different data sources. +The API and capabilities of the latest release of InfluxDB are completely different from those of InfluxDB 0.8.x, which is why Plutono handles them as different data sources. -For more information, refer to [Using InfluxDB in Grafana](http://docs.grafana.org/datasources/influxdb/). +For more information, refer to [Using InfluxDB in Plutono](http://docs.plutono.org/datasources/influxdb/). diff --git a/public/app/plugins/datasource/influxdb/components/ConfigEditor.tsx b/public/app/plugins/datasource/influxdb/components/ConfigEditor.tsx index 8721dfef83..2ce3beae3d 100644 --- a/public/app/plugins/datasource/influxdb/components/ConfigEditor.tsx +++ b/public/app/plugins/datasource/influxdb/components/ConfigEditor.tsx @@ -8,8 +8,8 @@ import { onUpdateDatasourceJsonDataOptionSelect, onUpdateDatasourceSecureJsonDataOption, updateDatasourcePluginJsonDataOption, -} from '@grafana/data'; -import { DataSourceHttpSettings, InfoBox, InlineField, InlineFormLabel, LegacyForms } from '@grafana/ui'; +} from '@credativ/plutono-data'; +import { DataSourceHttpSettings, InfoBox, InlineField, InlineFormLabel, LegacyForms } from '@credativ/plutono-ui'; const { Select, Input, SecretFormField } = LegacyForms; import { InfluxOptions, InfluxSecureJsonData, InfluxVersion } from '../types'; @@ -269,7 +269,7 @@ export class ConfigEditor extends PureComponent { {options.jsonData.version === InfluxVersion.Flux && ( -
    Support for Flux in Grafana is currently in beta
    +
    Support for Flux in Plutono is currently in beta

    Please report any issues to:
    @@ -295,7 +295,7 @@ export class ConfigEditor extends PureComponent { { diff --git a/public/app/plugins/datasource/influxdb/components/InfluxLogsQueryField.tsx b/public/app/plugins/datasource/influxdb/components/InfluxLogsQueryField.tsx index a70b4151c3..18517be65b 100644 --- a/public/app/plugins/datasource/influxdb/components/InfluxLogsQueryField.tsx +++ b/public/app/plugins/datasource/influxdb/components/InfluxLogsQueryField.tsx @@ -1,10 +1,10 @@ import React from 'react'; -import { ExploreQueryFieldProps } from '@grafana/data'; -import { ButtonCascader, CascaderOption } from '@grafana/ui'; +import { ExploreQueryFieldProps } from '@credativ/plutono-data'; +import { ButtonCascader, CascaderOption } from '@credativ/plutono-ui'; import InfluxQueryModel from '../influx_query_model'; import { AdHocFilterField, KeyValuePair } from 'app/features/explore/AdHocFilterField'; -import { getTemplateSrv, TemplateSrv } from '@grafana/runtime'; +import { getTemplateSrv, TemplateSrv } from '@credativ/plutono-runtime'; import InfluxDatasource from '../datasource'; import { InfluxQueryBuilder } from '../query_builder'; import { InfluxOptions, InfluxQuery } from '../types'; diff --git a/public/app/plugins/datasource/influxdb/components/InfluxStartPage.tsx b/public/app/plugins/datasource/influxdb/components/InfluxStartPage.tsx index 846d0155ea..7151e51a2e 100644 --- a/public/app/plugins/datasource/influxdb/components/InfluxStartPage.tsx +++ b/public/app/plugins/datasource/influxdb/components/InfluxStartPage.tsx @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { QueryEditorHelpProps } from '@grafana/data'; +import { QueryEditorHelpProps } from '@credativ/plutono-data'; import InfluxCheatSheet from './InfluxCheatSheet'; export default class InfluxStartPage extends PureComponent { diff --git a/public/app/plugins/datasource/influxdb/components/VariableQueryEditor.tsx b/public/app/plugins/datasource/influxdb/components/VariableQueryEditor.tsx index 0ca9b6958c..3598cd12f2 100644 --- a/public/app/plugins/datasource/influxdb/components/VariableQueryEditor.tsx +++ b/public/app/plugins/datasource/influxdb/components/VariableQueryEditor.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import InfluxDatasource from '../datasource'; -import { InlineFormLabel, TextArea } from '@grafana/ui'; +import { InlineFormLabel, TextArea } from '@credativ/plutono-ui'; import { FluxQueryEditor } from './FluxQueryEditor'; interface Props { diff --git a/public/app/plugins/datasource/influxdb/components/__snapshots__/ConfigEditor.test.tsx.snap b/public/app/plugins/datasource/influxdb/components/__snapshots__/ConfigEditor.test.tsx.snap index 682eba17c8..be1d0130c5 100644 --- a/public/app/plugins/datasource/influxdb/components/__snapshots__/ConfigEditor.test.tsx.snap +++ b/public/app/plugins/datasource/influxdb/components/__snapshots__/ConfigEditor.test.tsx.snap @@ -281,7 +281,7 @@ exports[`Render should disable basic auth password input 1`] = ` ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, })); diff --git a/public/app/plugins/datasource/influxdb/types.ts b/public/app/plugins/datasource/influxdb/types.ts index 929f7326c2..916d25d5cf 100644 --- a/public/app/plugins/datasource/influxdb/types.ts +++ b/public/app/plugins/datasource/influxdb/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/data'; +import { DataQuery, DataSourceJsonData } from '@credativ/plutono-data'; export enum InfluxVersion { InfluxQL = 'InfluxQL', diff --git a/public/app/plugins/datasource/jaeger/ConfigEditor.tsx b/public/app/plugins/datasource/jaeger/ConfigEditor.tsx index 29d02ee169..2202735ec4 100644 --- a/public/app/plugins/datasource/jaeger/ConfigEditor.tsx +++ b/public/app/plugins/datasource/jaeger/ConfigEditor.tsx @@ -1,5 +1,5 @@ -import { DataSourcePluginOptionsEditorProps } from '@grafana/data'; -import { DataSourceHttpSettings } from '@grafana/ui'; +import { DataSourcePluginOptionsEditorProps } from '@credativ/plutono-data'; +import { DataSourceHttpSettings } from '@credativ/plutono-ui'; import { TraceToLogsSettings } from 'app/core/components/TraceToLogsSettings'; import React from 'react'; diff --git a/public/app/plugins/datasource/jaeger/QueryField.test.tsx b/public/app/plugins/datasource/jaeger/QueryField.test.tsx index 585ad6fd3f..3bc1e70b06 100644 --- a/public/app/plugins/datasource/jaeger/QueryField.test.tsx +++ b/public/app/plugins/datasource/jaeger/QueryField.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { JaegerQueryField } from './QueryField'; import { shallow, mount } from 'enzyme'; import { JaegerDatasource, JaegerQuery } from './datasource'; -import { ButtonCascader } from '@grafana/ui'; +import { ButtonCascader } from '@credativ/plutono-ui'; describe('JaegerQueryField', function () { it('shows empty value if no services returned', function () { diff --git a/public/app/plugins/datasource/jaeger/QueryField.tsx b/public/app/plugins/datasource/jaeger/QueryField.tsx index cb15be5bb2..774b3d5d00 100644 --- a/public/app/plugins/datasource/jaeger/QueryField.tsx +++ b/public/app/plugins/datasource/jaeger/QueryField.tsx @@ -1,6 +1,6 @@ -import { AppEvents, ExploreQueryFieldProps } from '@grafana/data'; -import { selectors } from '@grafana/e2e-selectors'; -import { ButtonCascader, CascaderOption } from '@grafana/ui'; +import { AppEvents, ExploreQueryFieldProps } from '@credativ/plutono-data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; +import { ButtonCascader, CascaderOption } from '@credativ/plutono-ui'; import React from 'react'; import { appEvents } from '../../../core/core'; import { JaegerDatasource, JaegerQuery } from './datasource'; diff --git a/public/app/plugins/datasource/jaeger/datasource.test.ts b/public/app/plugins/datasource/jaeger/datasource.test.ts index 1d63001c6e..abb2897b2b 100644 --- a/public/app/plugins/datasource/jaeger/datasource.test.ts +++ b/public/app/plugins/datasource/jaeger/datasource.test.ts @@ -6,8 +6,8 @@ import { PluginType, dateTime, ArrayVector, -} from '@grafana/data'; -import { BackendSrv, BackendSrvRequest, getBackendSrv, setBackendSrv } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { BackendSrv, BackendSrvRequest, getBackendSrv, setBackendSrv } from '@credativ/plutono-runtime'; import { testResponse } from './testResponse'; describe('JaegerDatasource', () => { diff --git a/public/app/plugins/datasource/jaeger/datasource.ts b/public/app/plugins/datasource/jaeger/datasource.ts index a7716a6282..99123fd747 100644 --- a/public/app/plugins/datasource/jaeger/datasource.ts +++ b/public/app/plugins/datasource/jaeger/datasource.ts @@ -8,8 +8,8 @@ import { DateTime, FieldType, MutableDataFrame, -} from '@grafana/data'; -import { BackendSrvRequest, getBackendSrv } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { BackendSrvRequest, getBackendSrv } from '@credativ/plutono-runtime'; import { from, Observable, of } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; diff --git a/public/app/plugins/datasource/jaeger/module.ts b/public/app/plugins/datasource/jaeger/module.ts index 9ed98d289f..6244c0f510 100644 --- a/public/app/plugins/datasource/jaeger/module.ts +++ b/public/app/plugins/datasource/jaeger/module.ts @@ -1,4 +1,4 @@ -import { DataSourcePlugin } from '@grafana/data'; +import { DataSourcePlugin } from '@credativ/plutono-data'; import { JaegerDatasource } from './datasource'; import { JaegerQueryField } from './QueryField'; import { ConfigEditor } from './ConfigEditor'; diff --git a/public/app/plugins/datasource/jaeger/responseTransform.test.ts b/public/app/plugins/datasource/jaeger/responseTransform.test.ts index 83b0540f25..0d61d1fd67 100644 --- a/public/app/plugins/datasource/jaeger/responseTransform.test.ts +++ b/public/app/plugins/datasource/jaeger/responseTransform.test.ts @@ -1,5 +1,5 @@ import { createTraceFrame } from './responseTransform'; -import { ArrayVector } from '@grafana/data'; +import { ArrayVector } from '@credativ/plutono-data'; import { testResponse } from './testResponse'; describe('createTraceFrame', () => { diff --git a/public/app/plugins/datasource/jaeger/responseTransform.ts b/public/app/plugins/datasource/jaeger/responseTransform.ts index 17bddd9b0b..017be20ac9 100644 --- a/public/app/plugins/datasource/jaeger/responseTransform.ts +++ b/public/app/plugins/datasource/jaeger/responseTransform.ts @@ -1,4 +1,4 @@ -import { DataFrame, FieldType, MutableDataFrame, TraceSpanRow } from '@grafana/data'; +import { DataFrame, FieldType, MutableDataFrame, TraceSpanRow } from '@credativ/plutono-data'; import { Span, TraceProcess, TraceResponse } from './types'; diff --git a/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx b/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx index 2a7669e20c..26034d0389 100644 --- a/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx +++ b/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { shuffle } from 'lodash'; -import { QueryEditorHelpProps, DataQuery } from '@grafana/data'; +import { QueryEditorHelpProps, DataQuery } from '@credativ/plutono-data'; import LokiLanguageProvider from '../language_provider'; const DEFAULT_EXAMPLES = ['{job="default/prometheus"}']; diff --git a/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx index f9d4e74b81..259c18d826 100644 --- a/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx +++ b/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx @@ -5,7 +5,7 @@ import LokiExploreQueryEditor from './LokiExploreQueryEditor'; import { LokiOptionFields } from './LokiOptionFields'; import { LokiDatasource } from '../datasource'; import { LokiQuery } from '../types'; -import { ExploreMode, LoadingState, PanelData, toUtc, TimeRange } from '@grafana/data'; +import { ExploreMode, LoadingState, PanelData, toUtc, TimeRange } from '@credativ/plutono-data'; import { makeMockLokiDatasource } from '../mocks'; import LokiLanguageProvider from '../language_provider'; @@ -43,7 +43,7 @@ const setup = (renderMethod: any, propOverrides?: object) => { scopedVars: {}, targets: [], timezone: 'GMT', - app: 'Grafana', + app: 'Plutono', startTime: 0, }, timeRange: { diff --git a/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.tsx b/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.tsx index 0949fa8cb4..cfed322e12 100644 --- a/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.tsx +++ b/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.tsx @@ -3,7 +3,7 @@ import React, { memo } from 'react'; import _ from 'lodash'; // Types -import { ExploreQueryFieldProps } from '@grafana/data'; +import { ExploreQueryFieldProps } from '@credativ/plutono-data'; import { LokiDatasource } from '../datasource'; import { LokiQuery, LokiOptions } from '../types'; import { LokiQueryField } from './LokiQueryField'; diff --git a/public/app/plugins/datasource/loki/components/LokiLabel.tsx b/public/app/plugins/datasource/loki/components/LokiLabel.tsx index 5f8bd9d5d7..86872e33ed 100644 --- a/public/app/plugins/datasource/loki/components/LokiLabel.tsx +++ b/public/app/plugins/datasource/loki/components/LokiLabel.tsx @@ -1,7 +1,7 @@ import React, { forwardRef, HTMLAttributes } from 'react'; import { cx, css } from 'emotion'; -import { GrafanaTheme } from '@grafana/data'; -import { useTheme } from '@grafana/ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { useTheme } from '@credativ/plutono-ui'; // @ts-ignore import Highlighter from 'react-highlight-words'; @@ -69,7 +69,7 @@ export const LokiLabel = forwardRef( LokiLabel.displayName = 'LokiLabel'; -const getLabelStyles = (theme: GrafanaTheme) => ({ +const getLabelStyles = (theme: PlutonoTheme) => ({ base: css` cursor: pointer; font-size: ${theme.typography.size.sm}; diff --git a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx index f368b6a48b..a31593e58a 100644 --- a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx +++ b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { render, screen, waitFor, waitForElementToBeRemoved } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { getTheme } from '@grafana/ui'; +import { getTheme } from '@credativ/plutono-ui'; import { buildSelector, facetLabels, diff --git a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx index ea1eeb7ae7..f6e515a8fc 100644 --- a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx +++ b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx @@ -1,11 +1,11 @@ import React, { ChangeEvent } from 'react'; -import { Button, HorizontalGroup, Input, Label, LoadingPlaceholder, stylesFactory, withTheme } from '@grafana/ui'; +import { Button, HorizontalGroup, Input, Label, LoadingPlaceholder, stylesFactory, withTheme } from '@credativ/plutono-ui'; import LokiLanguageProvider from '../language_provider'; import { css, cx } from 'emotion'; import store from 'app/core/store'; import { FixedSizeList } from 'react-window'; -import { GrafanaTheme } from '@grafana/data'; +import { PlutonoTheme } from '@credativ/plutono-data'; import { LokiLabel } from './LokiLabel'; // Hard limit on labels to render @@ -13,12 +13,12 @@ const MAX_LABEL_COUNT = 100; const MAX_VALUE_COUNT = 10000; const MAX_AUTO_SELECT = 4; const EMPTY_SELECTOR = '{}'; -export const LAST_USED_LABELS_KEY = 'grafana.datasources.loki.browser.labels'; +export const LAST_USED_LABELS_KEY = 'plutono.datasources.loki.browser.labels'; export interface BrowserProps { languageProvider: LokiLanguageProvider; onChange: (selector: string) => void; - theme: GrafanaTheme; + theme: PlutonoTheme; autoSelect?: number; hide?: () => void; } @@ -88,7 +88,7 @@ export function facetLabels( }); } -const getStyles = stylesFactory((theme: GrafanaTheme) => ({ +const getStyles = stylesFactory((theme: PlutonoTheme) => ({ wrapper: css` background-color: ${theme.colors.bg2}; padding: ${theme.spacing.md}; diff --git a/public/app/plugins/datasource/loki/components/LokiOptionFields.tsx b/public/app/plugins/datasource/loki/components/LokiOptionFields.tsx index 20f73c1726..3ec8d90440 100644 --- a/public/app/plugins/datasource/loki/components/LokiOptionFields.tsx +++ b/public/app/plugins/datasource/loki/components/LokiOptionFields.tsx @@ -4,7 +4,7 @@ import { css, cx } from 'emotion'; import { LokiQuery } from '../types'; // Types -import { InlineFormLabel, RadioButtonGroup, InlineField, Input } from '@grafana/ui'; +import { InlineFormLabel, RadioButtonGroup, InlineField, Input } from '@credativ/plutono-ui'; export interface LokiOptionFieldsProps { lineLimitValue: string; diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx index 53485f9db9..500b5bbbb3 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { toUtc } from '@grafana/data'; +import { toUtc } from '@credativ/plutono-data'; import { LokiQueryEditor } from './LokiQueryEditor'; import { LokiDatasource } from '../datasource'; diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx index 67ded1bd8a..bcd801db31 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx @@ -2,8 +2,8 @@ import React, { memo } from 'react'; // Types -import { QueryEditorProps } from '@grafana/data'; -import { InlineFormLabel } from '@grafana/ui'; +import { QueryEditorProps } from '@credativ/plutono-data'; +import { InlineFormLabel } from '@credativ/plutono-ui'; import { LokiDatasource } from '../datasource'; import { LokiQuery, LokiOptions } from '../types'; import { LokiQueryField } from './LokiQueryField'; diff --git a/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx b/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx index 6567f12a8b..ebb9072b8e 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx @@ -10,7 +10,7 @@ import { BracesPlugin, DOMUtil, Icon, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; // Utils & Services // dom also includes Element polyfills @@ -19,7 +19,7 @@ import { Editor } from 'slate-react'; import { LokiLabelBrowser } from './LokiLabelBrowser'; // Types -import { ExploreQueryFieldProps, AbsoluteTimeRange } from '@grafana/data'; +import { ExploreQueryFieldProps, AbsoluteTimeRange } from '@credativ/plutono-data'; import { LokiQuery, LokiOptions } from '../types'; import { LanguageMap, languages as prismLanguages } from 'prismjs'; import LokiLanguageProvider, { LokiHistoryItem } from '../language_provider'; diff --git a/public/app/plugins/datasource/loki/components/__snapshots__/LokiExploreQueryEditor.test.tsx.snap b/public/app/plugins/datasource/loki/components/__snapshots__/LokiExploreQueryEditor.test.tsx.snap index 5b3345352f..f65185cfef 100644 --- a/public/app/plugins/datasource/loki/components/__snapshots__/LokiExploreQueryEditor.test.tsx.snap +++ b/public/app/plugins/datasource/loki/components/__snapshots__/LokiExploreQueryEditor.test.tsx.snap @@ -5,7 +5,7 @@ exports[`LokiExploreQueryEditor should render component 1`] = ` data={ Object { "request": Object { - "app": "Grafana", + "app": "Plutono", "dashboardId": 1, "interval": "1s", "intervalMs": 1000, diff --git a/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx b/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx index 39f2a3bcf0..90c990ea9f 100644 --- a/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx +++ b/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { mount } from 'enzyme'; import { ConfigEditor } from './ConfigEditor'; import { createDefaultConfigOptions } from '../mocks'; -import { DataSourceHttpSettings } from '@grafana/ui'; +import { DataSourceHttpSettings } from '@credativ/plutono-ui'; import { DerivedFields } from './DerivedFields'; describe('ConfigEditor', () => { diff --git a/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx index a0323e4936..456c057220 100644 --- a/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx +++ b/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { DataSourcePluginOptionsEditorProps, DataSourceSettings } from '@grafana/data'; -import { DataSourceHttpSettings } from '@grafana/ui'; +import { DataSourcePluginOptionsEditorProps, DataSourceSettings } from '@credativ/plutono-data'; +import { DataSourceHttpSettings } from '@credativ/plutono-ui'; import { LokiOptions } from '../types'; import { MaxLinesField } from './MaxLinesField'; import { DerivedFields } from './DerivedFields'; diff --git a/public/app/plugins/datasource/loki/configuration/DebugSection.test.tsx b/public/app/plugins/datasource/loki/configuration/DebugSection.test.tsx index e6c54a590d..2914af5582 100644 --- a/public/app/plugins/datasource/loki/configuration/DebugSection.test.tsx +++ b/public/app/plugins/datasource/loki/configuration/DebugSection.test.tsx @@ -3,7 +3,7 @@ import { DebugSection } from './DebugSection'; import { mount } from 'enzyme'; import { getLinkSrv, LinkService, LinkSrv, setLinkSrv } from '../../../../features/panel/panellinks/link_srv'; import { TimeSrv } from '../../../../features/dashboard/services/TimeSrv'; -import { dateTime } from '@grafana/data'; +import { dateTime } from '@credativ/plutono-data'; import { TemplateSrv } from '../../../../features/templating/template_srv'; describe('DebugSection', () => { diff --git a/public/app/plugins/datasource/loki/configuration/DebugSection.tsx b/public/app/plugins/datasource/loki/configuration/DebugSection.tsx index b4ee9ff6f7..e973893818 100644 --- a/public/app/plugins/datasource/loki/configuration/DebugSection.tsx +++ b/public/app/plugins/datasource/loki/configuration/DebugSection.tsx @@ -1,10 +1,10 @@ import React, { useState } from 'react'; import { css } from 'emotion'; import cx from 'classnames'; -import { LegacyForms } from '@grafana/ui'; +import { LegacyForms } from '@credativ/plutono-ui'; const { FormField } = LegacyForms; import { DerivedFieldConfig } from '../types'; -import { ArrayVector, Field, FieldType, LinkModel } from '@grafana/data'; +import { ArrayVector, Field, FieldType, LinkModel } from '@credativ/plutono-data'; import { getFieldLinksForExplore } from '../../../../features/explore/utils/links'; type Props = { diff --git a/public/app/plugins/datasource/loki/configuration/DerivedField.test.tsx b/public/app/plugins/datasource/loki/configuration/DerivedField.test.tsx index 64bf6d58c1..e1e0393219 100644 --- a/public/app/plugins/datasource/loki/configuration/DerivedField.test.tsx +++ b/public/app/plugins/datasource/loki/configuration/DerivedField.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { DerivedField } from './DerivedField'; import { DataSourcePicker } from '../../../../core/components/Select/DataSourcePicker'; -import { DataSourceInstanceSettings } from '@grafana/data'; +import { DataSourceInstanceSettings } from '@credativ/plutono-data'; jest.mock('app/features/plugins/datasource_srv', () => ({ getDatasourceSrv() { diff --git a/public/app/plugins/datasource/loki/configuration/DerivedField.tsx b/public/app/plugins/datasource/loki/configuration/DerivedField.tsx index a93b194f9b..e738229660 100644 --- a/public/app/plugins/datasource/loki/configuration/DerivedField.tsx +++ b/public/app/plugins/datasource/loki/configuration/DerivedField.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import { css } from 'emotion'; -import { Button, DataLinkInput, stylesFactory, LegacyForms } from '@grafana/ui'; -import { VariableSuggestion } from '@grafana/data'; +import { Button, DataLinkInput, stylesFactory, LegacyForms } from '@credativ/plutono-ui'; +import { VariableSuggestion } from '@credativ/plutono-data'; import { DerivedFieldConfig } from '../types'; import { DataSourcePicker } from 'app/core/components/Select/DataSourcePicker'; import { usePrevious } from 'react-use'; diff --git a/public/app/plugins/datasource/loki/configuration/DerivedFields.test.tsx b/public/app/plugins/datasource/loki/configuration/DerivedFields.test.tsx index 932f58b80f..9de04aa066 100644 --- a/public/app/plugins/datasource/loki/configuration/DerivedFields.test.tsx +++ b/public/app/plugins/datasource/loki/configuration/DerivedFields.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { mount } from 'enzyme'; import { DerivedFields } from './DerivedFields'; -import { Button } from '@grafana/ui'; +import { Button } from '@credativ/plutono-ui'; import { DerivedField } from './DerivedField'; import { act } from 'react-dom/test-utils'; diff --git a/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx b/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx index bcabb0475a..d28fa0d459 100644 --- a/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx +++ b/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx @@ -1,12 +1,12 @@ import React, { useState } from 'react'; import { css } from 'emotion'; -import { Button, stylesFactory, useTheme } from '@grafana/ui'; -import { GrafanaTheme, VariableOrigin, DataLinkBuiltInVars } from '@grafana/data'; +import { Button, stylesFactory, useTheme } from '@credativ/plutono-ui'; +import { PlutonoTheme, VariableOrigin, DataLinkBuiltInVars } from '@credativ/plutono-data'; import { DerivedFieldConfig } from '../types'; import { DerivedField } from './DerivedField'; import { DebugSection } from './DebugSection'; -const getStyles = stylesFactory((theme: GrafanaTheme) => ({ +const getStyles = stylesFactory((theme: PlutonoTheme) => ({ infoText: css` padding-bottom: ${theme.spacing.md}; color: ${theme.colors.textWeak}; diff --git a/public/app/plugins/datasource/loki/configuration/MaxLinesField.tsx b/public/app/plugins/datasource/loki/configuration/MaxLinesField.tsx index 5d3ddddf84..66475d1e15 100644 --- a/public/app/plugins/datasource/loki/configuration/MaxLinesField.tsx +++ b/public/app/plugins/datasource/loki/configuration/MaxLinesField.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { LegacyForms } from '@grafana/ui'; +import { LegacyForms } from '@credativ/plutono-ui'; const { FormField } = LegacyForms; type Props = { diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts index 64fc678a9f..2a9b4ba847 100644 --- a/public/app/plugins/datasource/loki/datasource.test.ts +++ b/public/app/plugins/datasource/loki/datasource.test.ts @@ -1,7 +1,7 @@ import { of, throwError } from 'rxjs'; import { take } from 'rxjs/operators'; -import { AnnotationQueryRequest, CoreApp, DataFrame, dateTime, FieldCache, TimeSeries } from '@grafana/data'; -import { BackendSrvRequest, FetchResponse } from '@grafana/runtime'; +import { AnnotationQueryRequest, CoreApp, DataFrame, dateTime, FieldCache, TimeSeries } from '@credativ/plutono-data'; +import { BackendSrvRequest, FetchResponse } from '@credativ/plutono-runtime'; import LokiDatasource from './datasource'; import { LokiQuery, LokiResponse, LokiResultType } from './types'; @@ -13,9 +13,9 @@ import { initialCustomVariableModelState } from '../../../features/variables/cus import { makeMockLokiDatasource } from './mocks'; import { createFetchResponse } from 'test/helpers/createFetchResponse'; -jest.mock('@grafana/runtime', () => ({ +jest.mock('@credativ/plutono-runtime', () => ({ // @ts-ignore - ...jest.requireActual('@grafana/runtime'), + ...jest.requireActual('@credativ/plutono-runtime'), getBackendSrv: () => backendSrv, })); @@ -90,7 +90,7 @@ describe('LokiDatasource', () => { }); it('should use default intervalMs if one is not provided', () => { - const target = { expr: '{job="grafana"}', refId: 'B' }; + const target = { expr: '{job="plutono"}', refId: 'B' }; const raw = { from: 'now', to: 'now-1h' }; const range = { from: dateTime(), to: dateTime(), raw: raw }; const options = { @@ -104,7 +104,7 @@ describe('LokiDatasource', () => { }); it('should use provided intervalMs', () => { - const target = { expr: '{job="grafana"}', refId: 'B' }; + const target = { expr: '{job="plutono"}', refId: 'B' }; const raw = { from: 'now', to: 'now-1h' }; const range = { from: dateTime(), to: dateTime(), raw: raw }; const options = { @@ -119,7 +119,7 @@ describe('LokiDatasource', () => { }); it('should set the minimal step to 1ms', () => { - const target = { expr: '{job="grafana"}', refId: 'B' }; + const target = { expr: '{job="plutono"}', refId: 'B' }; const raw = { from: 'now', to: 'now-1h' }; const range = { from: dateTime('2020-10-14T00:00:00'), to: dateTime('2020-10-14T00:00:01'), raw: raw }; const options = { @@ -202,8 +202,8 @@ describe('LokiDatasource', () => { return { ds, options }; } - const metricsQuery = 'rate({job="grafana"}[10m])'; - const logsQuery = '{job="grafana"} |= "foo"'; + const metricsQuery = 'rate({job="plutono"}[10m])'; + const logsQuery = '{job="plutono"} |= "foo"'; it('should run logs instant if only instant is selected', async () => { const { ds, options } = setup(logsQuery, CoreApp.Explore, true, false); diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index 89d21ab9e0..0665d439e6 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -23,8 +23,8 @@ import { PluginMeta, QueryResultMeta, ScopedVars, -} from '@grafana/data'; -import { getTemplateSrv, TemplateSrv, BackendSrvRequest, FetchError, getBackendSrv } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { getTemplateSrv, TemplateSrv, BackendSrvRequest, FetchError, getBackendSrv } from '@credativ/plutono-runtime'; import { addLabelToQuery } from 'app/plugins/datasource/prometheus/add_label_to_query'; import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { convertToWebSocketUrl } from 'app/core/utils/explore'; @@ -47,7 +47,7 @@ import { import { LiveStreams, LokiLiveTarget } from './live_streams'; import LanguageProvider from './language_provider'; import { serializeParams } from '../../../core/utils/fetch'; -import { RowContextOptions } from '@grafana/ui/src/components/Logs/LogRowContextProvider'; +import { RowContextOptions } from '@credativ/plutono-ui/src/components/Logs/LogRowContextProvider'; import syntax from './syntax'; export type RangeQueryOptions = DataQueryRequest | AnnotationQueryRequest; diff --git a/public/app/plugins/datasource/loki/img/grafana_icon.svg b/public/app/plugins/datasource/loki/img/plutono_icon.svg similarity index 100% rename from public/app/plugins/datasource/loki/img/grafana_icon.svg rename to public/app/plugins/datasource/loki/img/plutono_icon.svg diff --git a/public/app/plugins/datasource/loki/language_provider.test.ts b/public/app/plugins/datasource/loki/language_provider.test.ts index 9eb3c23439..d829d8ac52 100644 --- a/public/app/plugins/datasource/loki/language_provider.test.ts +++ b/public/app/plugins/datasource/loki/language_provider.test.ts @@ -1,7 +1,7 @@ import Plain from 'slate-plain-serializer'; import LanguageProvider, { LokiHistoryItem } from './language_provider'; -import { TypeaheadInput } from '@grafana/ui'; +import { TypeaheadInput } from '@credativ/plutono-ui'; import { makeMockLokiDatasource } from './mocks'; import LokiDatasource from './datasource'; diff --git a/public/app/plugins/datasource/loki/language_provider.ts b/public/app/plugins/datasource/loki/language_provider.ts index 60f99df36c..3aad937a2a 100644 --- a/public/app/plugins/datasource/loki/language_provider.ts +++ b/public/app/plugins/datasource/loki/language_provider.ts @@ -13,12 +13,12 @@ import syntax, { FUNCTIONS, PIPE_PARSERS, PIPE_OPERATORS } from './syntax'; // Types import { LokiQuery } from './types'; -import { dateTime, AbsoluteTimeRange, LanguageProvider, HistoryItem } from '@grafana/data'; +import { dateTime, AbsoluteTimeRange, LanguageProvider, HistoryItem } from '@credativ/plutono-data'; import { PromQuery } from '../prometheus/types'; import { RATE_RANGES } from '../prometheus/promql'; import LokiDatasource from './datasource'; -import { CompletionItem, TypeaheadInput, TypeaheadOutput, CompletionItemGroup } from '@grafana/ui'; +import { CompletionItem, TypeaheadInput, TypeaheadOutput, CompletionItemGroup } from '@credativ/plutono-ui'; import { Grammar } from 'prismjs'; const DEFAULT_KEYS = ['job', 'namespace']; diff --git a/public/app/plugins/datasource/loki/live_streams.test.ts b/public/app/plugins/datasource/loki/live_streams.test.ts index 249a3758e6..eacc2c3424 100644 --- a/public/app/plugins/datasource/loki/live_streams.test.ts +++ b/public/app/plugins/datasource/loki/live_streams.test.ts @@ -2,7 +2,7 @@ import { Observable, Subject, of, throwError, concat } from 'rxjs'; import { mergeMap } from 'rxjs/operators'; import * as rxJsWebSocket from 'rxjs/webSocket'; import { LiveStreams } from './live_streams'; -import { DataFrame, DataFrameView, formatLabels, Labels } from '@grafana/data'; +import { DataFrame, DataFrameView, formatLabels, Labels } from '@credativ/plutono-data'; import { noop } from 'lodash'; import { LokiTailResponse } from './types'; diff --git a/public/app/plugins/datasource/loki/live_streams.ts b/public/app/plugins/datasource/loki/live_streams.ts index fd96048a70..994902c38f 100644 --- a/public/app/plugins/datasource/loki/live_streams.ts +++ b/public/app/plugins/datasource/loki/live_streams.ts @@ -1,4 +1,4 @@ -import { DataFrame, FieldType, parseLabels, KeyValue, CircularDataFrame } from '@grafana/data'; +import { DataFrame, FieldType, parseLabels, KeyValue, CircularDataFrame } from '@credativ/plutono-data'; import { Observable, throwError, timer } from 'rxjs'; import { webSocket } from 'rxjs/webSocket'; import { LokiTailResponse } from './types'; diff --git a/public/app/plugins/datasource/loki/mocks.ts b/public/app/plugins/datasource/loki/mocks.ts index 6b565f63d9..b6ef161db6 100644 --- a/public/app/plugins/datasource/loki/mocks.ts +++ b/public/app/plugins/datasource/loki/mocks.ts @@ -1,5 +1,5 @@ import { LokiDatasource, LOKI_ENDPOINT } from './datasource'; -import { AbsoluteTimeRange, DataSourceSettings } from '@grafana/data'; +import { AbsoluteTimeRange, DataSourceSettings } from '@credativ/plutono-data'; import { LokiOptions } from './types'; import { createDatasourceSettings } from '../../../features/datasources/mocks'; diff --git a/public/app/plugins/datasource/loki/module.ts b/public/app/plugins/datasource/loki/module.ts index a32760427a..5ee7b2ef96 100644 --- a/public/app/plugins/datasource/loki/module.ts +++ b/public/app/plugins/datasource/loki/module.ts @@ -1,4 +1,4 @@ -import { DataSourcePlugin } from '@grafana/data'; +import { DataSourcePlugin } from '@credativ/plutono-data'; import Datasource from './datasource'; import LokiCheatSheet from './components/LokiCheatSheet'; diff --git a/public/app/plugins/datasource/loki/result_transformer.test.ts b/public/app/plugins/datasource/loki/result_transformer.test.ts index fc9095c4f5..878acdd0fc 100644 --- a/public/app/plugins/datasource/loki/result_transformer.test.ts +++ b/public/app/plugins/datasource/loki/result_transformer.test.ts @@ -1,4 +1,4 @@ -import { CircularDataFrame, FieldCache, FieldType, MutableDataFrame } from '@grafana/data'; +import { CircularDataFrame, FieldCache, FieldType, MutableDataFrame } from '@credativ/plutono-data'; import { LokiStreamResult, LokiTailResponse, @@ -8,7 +8,7 @@ import { LokiMatrixResult, } from './types'; import * as ResultTransformer from './result_transformer'; -import { setTemplateSrv } from '@grafana/runtime'; +import { setTemplateSrv } from '@credativ/plutono-runtime'; import { TemplateSrv } from 'app/features/templating/template_srv'; const streamResult: LokiStreamResult[] = [ @@ -39,9 +39,9 @@ const lokiResponse: LokiStreamResponse = { }, }; -jest.mock('@grafana/runtime', () => ({ +jest.mock('@credativ/plutono-runtime', () => ({ // @ts-ignore - ...jest.requireActual('@grafana/runtime'), + ...jest.requireActual('@credativ/plutono-runtime'), getDataSourceSrv: () => { return { getInstanceSettings: () => { @@ -145,13 +145,13 @@ describe('loki result transformer', () => { streams: [ { stream: { - filename: '/var/log/grafana/grafana.log', - job: 'grafana', + filename: '/var/log/plutono/plutono.log', + job: 'plutono', }, values: [ [ '1581519914265798400', - 't=2020-02-12T15:04:51+0000 lvl=info msg="Starting Grafana" logger=server version=6.7.0-pre commit=6f09bc9fb4 branch=issue-21929 compiled=2020-02-11T20:43:28+0000', + 't=2020-02-12T15:04:51+0000 lvl=info msg="Starting Plutono" logger=server version=6.7.0-pre commit=6f09bc9fb4 branch=issue-21929 compiled=2020-02-11T20:43:28+0000', ], ], }, @@ -161,7 +161,7 @@ describe('loki result transformer', () => { const data = new CircularDataFrame({ capacity: 1 }); data.addField({ name: 'ts', type: FieldType.time, config: { displayName: 'Time' } }); data.addField({ name: 'tsNs', type: FieldType.time, config: { displayName: 'Time ns' } }); - data.addField({ name: 'line', type: FieldType.string }).labels = { job: 'grafana' }; + data.addField({ name: 'line', type: FieldType.string }).labels = { job: 'plutono' }; data.addField({ name: 'labels', type: FieldType.other }); data.addField({ name: 'id', type: FieldType.string }); @@ -170,8 +170,8 @@ describe('loki result transformer', () => { ts: '2020-02-12T15:05:14.265Z', tsNs: '1581519914265798400', line: - 't=2020-02-12T15:04:51+0000 lvl=info msg="Starting Grafana" logger=server version=6.7.0-pre commit=6f09bc9fb4 branch=issue-21929 compiled=2020-02-11T20:43:28+0000', - labels: { filename: '/var/log/grafana/grafana.log' }, + 't=2020-02-12T15:04:51+0000 lvl=info msg="Starting Plutono" logger=server version=6.7.0-pre commit=6f09bc9fb4 branch=issue-21929 compiled=2020-02-11T20:43:28+0000', + labels: { filename: '/var/log/plutono/plutono.log' }, id: '19e8e093d70122b3b53cb6e24efd6e2d', }); }); @@ -181,8 +181,8 @@ describe('loki result transformer', () => { streams: [ { stream: { - filename: '/var/log/grafana/grafana.log', - job: 'grafana', + filename: '/var/log/plutono/plutono.log', + job: 'plutono', }, values: [ ['1581519914265798400', 't=2020-02-12T15:04:51+0000 lvl=info msg="Dupplicated 1"'], @@ -199,7 +199,7 @@ describe('loki result transformer', () => { const data = new CircularDataFrame({ capacity: 6 }); data.addField({ name: 'ts', type: FieldType.time, config: { displayName: 'Time' } }); data.addField({ name: 'tsNs', type: FieldType.time, config: { displayName: 'Time ns' } }); - data.addField({ name: 'line', type: FieldType.string }).labels = { job: 'grafana' }; + data.addField({ name: 'line', type: FieldType.string }).labels = { job: 'plutono' }; data.addField({ name: 'labels', type: FieldType.other }); data.addField({ name: 'id', type: FieldType.string }); data.refId = 'C'; diff --git a/public/app/plugins/datasource/loki/result_transformer.ts b/public/app/plugins/datasource/loki/result_transformer.ts index 04d5e90109..a1f6b496f7 100644 --- a/public/app/plugins/datasource/loki/result_transformer.ts +++ b/public/app/plugins/datasource/loki/result_transformer.ts @@ -17,9 +17,9 @@ import { QueryResultMeta, TimeSeriesValue, ScopedVars, -} from '@grafana/data'; +} from '@credativ/plutono-data'; -import { getTemplateSrv, getDataSourceSrv } from '@grafana/runtime'; +import { getTemplateSrv, getDataSourceSrv } from '@credativ/plutono-runtime'; import TableModel from 'app/core/table_model'; import { formatQuery, getHighlighterExpressionsFromQuery } from './query_utils'; import { diff --git a/public/app/plugins/datasource/loki/syntax.ts b/public/app/plugins/datasource/loki/syntax.ts index 979b5e07e9..0c66a39d1e 100644 --- a/public/app/plugins/datasource/loki/syntax.ts +++ b/public/app/plugins/datasource/loki/syntax.ts @@ -1,5 +1,5 @@ import { Grammar } from 'prismjs'; -import { CompletionItem } from '@grafana/ui'; +import { CompletionItem } from '@credativ/plutono-ui'; const AGGREGATION_OPERATORS: CompletionItem[] = [ { diff --git a/public/app/plugins/datasource/loki/types.ts b/public/app/plugins/datasource/loki/types.ts index 0b751fb73f..0a189939d1 100644 --- a/public/app/plugins/datasource/loki/types.ts +++ b/public/app/plugins/datasource/loki/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData, QueryResultMeta, ScopedVars } from '@grafana/data'; +import { DataQuery, DataSourceJsonData, QueryResultMeta, ScopedVars } from '@credativ/plutono-data'; export interface LokiInstantQueryRequest { query: string; diff --git a/public/app/plugins/datasource/mixed/MixedDataSource.test.ts b/public/app/plugins/datasource/mixed/MixedDataSource.test.ts index 455b081aee..189f5262b9 100644 --- a/public/app/plugins/datasource/mixed/MixedDataSource.test.ts +++ b/public/app/plugins/datasource/mixed/MixedDataSource.test.ts @@ -1,6 +1,6 @@ import { from } from 'rxjs'; -import { getDataSourceSrv } from '@grafana/runtime'; -import { DataSourceInstanceSettings, LoadingState } from '@grafana/data'; +import { getDataSourceSrv } from '@credativ/plutono-runtime'; +import { DataSourceInstanceSettings, LoadingState } from '@credativ/plutono-data'; import { DatasourceSrvMock, MockDataSourceApi } from 'test/mocks/datasource_srv'; import { getQueryOptions } from 'test/helpers/getQueryOptions'; @@ -16,8 +16,8 @@ const datasourceSrv = new DatasourceSrvMock(defaultDS, { E: new MockDataSourceApi('DSE', { data: [] }, {}, 'syntax error near WHERE'), }); -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getDataSourceSrv: () => { return datasourceSrv; }, diff --git a/public/app/plugins/datasource/mixed/MixedDataSource.ts b/public/app/plugins/datasource/mixed/MixedDataSource.ts index 9a0ad8fbc0..eb33ee4b03 100644 --- a/public/app/plugins/datasource/mixed/MixedDataSource.ts +++ b/public/app/plugins/datasource/mixed/MixedDataSource.ts @@ -10,8 +10,8 @@ import { DataSourceApi, DataSourceInstanceSettings, LoadingState, -} from '@grafana/data'; -import { getDataSourceSrv, toDataQueryError } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { getDataSourceSrv, toDataQueryError } from '@credativ/plutono-runtime'; export const MIXED_DATASOURCE_NAME = '-- Mixed --'; diff --git a/public/app/plugins/datasource/mssql/README.md b/public/app/plugins/datasource/mssql/README.md index b109226ccc..56e1d1a367 100644 --- a/public/app/plugins/datasource/mssql/README.md +++ b/public/app/plugins/datasource/mssql/README.md @@ -1,12 +1,12 @@ -# Grafana Microsoft SQL Server Data Source - Native Plugin +# Plutono Microsoft SQL Server Data Source - Native Plugin -Grafana ships with a built-in Microsoft SQL Server (MSSQL) data source plugin that allows you to query and visualize data from any Microsoft SQL Server 2005 or newer. +Plutono ships with a built-in Microsoft SQL Server (MSSQL) data source plugin that allows you to query and visualize data from any Microsoft SQL Server 2005 or newer. ## Adding the data source -1. Open the side menu by clicking the Grafana icon in the top header. +1. Open the side menu by clicking the Plutono icon in the top header. 2. In the side menu under the `Configuration` link you should find a link named `Data Sources`. 3. Click the `+ Add data source` button in the top header. 4. Select *Microsoft SQL Server* from the *Type* dropdown. -For more information, check the [docs](http://docs.grafana.org/). \ No newline at end of file +For more information, check the [docs](http://docs.plutono.org/). \ No newline at end of file diff --git a/public/app/plugins/datasource/mssql/datasource.ts b/public/app/plugins/datasource/mssql/datasource.ts index af080617d2..f6d6389ab0 100644 --- a/public/app/plugins/datasource/mssql/datasource.ts +++ b/public/app/plugins/datasource/mssql/datasource.ts @@ -1,8 +1,8 @@ import _ from 'lodash'; import { Observable, of } from 'rxjs'; import { catchError, map, mapTo } from 'rxjs/operators'; -import { getBackendSrv } from '@grafana/runtime'; -import { ScopedVars } from '@grafana/data'; +import { getBackendSrv } from '@credativ/plutono-runtime'; +import { ScopedVars } from '@credativ/plutono-data'; import ResponseParser, { MssqlResponse } from './response_parser'; import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv'; diff --git a/public/app/plugins/datasource/mssql/partials/config.html b/public/app/plugins/datasource/mssql/partials/config.html index 51ecbd7579..20b307cd8e 100644 --- a/public/app/plugins/datasource/mssql/partials/config.html +++ b/public/app/plugins/datasource/mssql/partials/config.html @@ -112,11 +112,11 @@

    MS SQL details

    -
    +
    User Permission

    The database user should only be granted SELECT permissions on the specified database and tables you want to query. - Grafana does not validate that queries are safe so queries can contain any SQL statement. For example, statements + Plutono does not validate that queries are safe so queries can contain any SQL statement. For example, statements like USE otherdb; and DROP TABLE user; would be executed. To protect against this we highly recommmend you create a specific MS SQL user with restricted permissions.

    diff --git a/public/app/plugins/datasource/mssql/partials/query.editor.html b/public/app/plugins/datasource/mssql/partials/query.editor.html index a1c71e0ccc..1ee4ab7785 100644 --- a/public/app/plugins/datasource/mssql/partials/query.editor.html +++ b/public/app/plugins/datasource/mssql/partials/query.editor.html @@ -53,7 +53,7 @@ - $__unixEpochFilter(column) -> column >= 1492750877 AND column <= 1492750877 - $__unixEpochNanoFilter(column) -> column >= 1494410783152415214 AND column <= 1494497183142514872 - $__timeGroup(column, '5m'[, fillvalue]) -> CAST(ROUND(DATEDIFF(second, '1970-01-01', column)/300.0, 0) as bigint)*300. - by setting fillvalue grafana will fill in missing values according to the interval + by setting fillvalue plutono will fill in missing values according to the interval fillvalue can be either a literal value, NULL or previous; previous will fill in the previous seen value or NULL if none has been seen yet - $__timeGroupAlias(column, '5m'[, fillvalue]) -> CAST(ROUND(DATEDIFF(second, '1970-01-01', column)/300.0, 0) as bigint)*300 AS [time] - $__unixEpochGroup(column,'5m') -> FLOOR(column/300)*300 diff --git a/public/app/plugins/datasource/mssql/query_ctrl.ts b/public/app/plugins/datasource/mssql/query_ctrl.ts index f826d63c69..d197990fa5 100644 --- a/public/app/plugins/datasource/mssql/query_ctrl.ts +++ b/public/app/plugins/datasource/mssql/query_ctrl.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import { QueryCtrl } from 'app/plugins/sdk'; import { auto } from 'angular'; -import { PanelEvents, QueryResultMeta } from '@grafana/data'; +import { PanelEvents, QueryResultMeta } from '@credativ/plutono-data'; export interface MssqlQuery { refId: string; diff --git a/public/app/plugins/datasource/mssql/response_parser.ts b/public/app/plugins/datasource/mssql/response_parser.ts index 89808f3036..cd080cabd5 100644 --- a/public/app/plugins/datasource/mssql/response_parser.ts +++ b/public/app/plugins/datasource/mssql/response_parser.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { MetricFindValue } from '@grafana/data'; +import { MetricFindValue } from '@credativ/plutono-data'; interface TableResponse extends Record { type: string; diff --git a/public/app/plugins/datasource/mssql/specs/datasource.test.ts b/public/app/plugins/datasource/mssql/specs/datasource.test.ts index e1415f1b03..9bf36d015a 100644 --- a/public/app/plugins/datasource/mssql/specs/datasource.test.ts +++ b/public/app/plugins/datasource/mssql/specs/datasource.test.ts @@ -1,5 +1,5 @@ import { of } from 'rxjs'; -import { dateTime } from '@grafana/data'; +import { dateTime } from '@credativ/plutono-data'; import { MssqlDatasource } from '../datasource'; import { TimeSrvStub } from 'test/specs/helpers'; @@ -8,8 +8,8 @@ import { backendSrv } from 'app/core/services/backend_srv'; import { initialCustomVariableModelState } from '../../../../features/variables/custom/reducer'; import { createFetchResponse } from 'test/helpers/createFetchResponse'; -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, })); @@ -294,7 +294,7 @@ describe('MSSQLDatasource', () => { avg(value) as value, hostname as metric FROM - grafana_metric + plutono_metric WHERE $__timeFilter(createdAt) AND measurement = 'logins.count' AND @@ -317,7 +317,7 @@ describe('MSSQLDatasource', () => { avg(value) as value, hostname as metric FROM - grafana_metric + plutono_metric WHERE $__timeFilter(createdAt) AND measurement = 'logins.count' diff --git a/public/app/plugins/datasource/mysql/README.md b/public/app/plugins/datasource/mysql/README.md index 2d843b0f55..39fcf70fbf 100644 --- a/public/app/plugins/datasource/mysql/README.md +++ b/public/app/plugins/datasource/mysql/README.md @@ -1,14 +1,14 @@ # MySQL Data Source - Native Plugin -Grafana ships with a built-in MySQL data source plugin that allows you to query and visualize data from a MySQL compatible database. +Plutono ships with a built-in MySQL data source plugin that allows you to query and visualize data from a MySQL compatible database. ## Adding the data source -1. Open the side menu by clicking the Grafana icon in the top header. +1. Open the side menu by clicking the Plutono icon in the top header. 2. In the side menu under the Dashboards link you should find a link named Data Sources. 3. Click the + Add data source button in the top header. 4. Select MySQL from the Type dropdown. Read more about it here: -[http://docs.grafana.org/features/datasources/mysql/](http://docs.grafana.org/features/datasources/mysql/) +[http://docs.plutono.org/features/datasources/mysql/](http://docs.plutono.org/features/datasources/mysql/) diff --git a/public/app/plugins/datasource/mysql/datasource.ts b/public/app/plugins/datasource/mysql/datasource.ts index d5c1ef7077..7197f3bfe7 100644 --- a/public/app/plugins/datasource/mysql/datasource.ts +++ b/public/app/plugins/datasource/mysql/datasource.ts @@ -1,8 +1,8 @@ import _ from 'lodash'; import { Observable, of } from 'rxjs'; import { catchError, map, mapTo } from 'rxjs/operators'; -import { getBackendSrv } from '@grafana/runtime'; -import { ScopedVars } from '@grafana/data'; +import { getBackendSrv } from '@credativ/plutono-runtime'; +import { ScopedVars } from '@credativ/plutono-data'; import MysqlQuery from 'app/plugins/datasource/mysql/mysql_query'; import ResponseParser, { MysqlResponse } from './response_parser'; import { MysqlMetricFindValue, MysqlQueryForInterpolation } from './types'; diff --git a/public/app/plugins/datasource/mysql/mysql_query.ts b/public/app/plugins/datasource/mysql/mysql_query.ts index 67c5f641d0..dc1a2a0c78 100644 --- a/public/app/plugins/datasource/mysql/mysql_query.ts +++ b/public/app/plugins/datasource/mysql/mysql_query.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; -import { TemplateSrv } from '@grafana/runtime'; -import { ScopedVars } from '@grafana/data'; +import { TemplateSrv } from '@credativ/plutono-runtime'; +import { ScopedVars } from '@credativ/plutono-data'; export default class MysqlQuery { target: any; diff --git a/public/app/plugins/datasource/mysql/partials/config.html b/public/app/plugins/datasource/mysql/partials/config.html index b9455b16bd..e1c259c4fe 100644 --- a/public/app/plugins/datasource/mysql/partials/config.html +++ b/public/app/plugins/datasource/mysql/partials/config.html @@ -99,15 +99,15 @@

    MySQL details

    -
    +
    User Permission

    The database user should only be granted SELECT permissions on the specified database & tables you want to query. - Grafana does not validate that queries are safe so queries can contain any SQL statement. For example, statements + Plutono does not validate that queries are safe so queries can contain any SQL statement. For example, statements like USE otherdb; and DROP TABLE user; would be executed. To protect against this we Highly recommmend you create a specific MySQL user with restricted permissions. - Checkout the MySQL Data Source Docs for more information. + Checkout the MySQL Data Source Docs for more information.

    diff --git a/public/app/plugins/datasource/mysql/partials/query.editor.html b/public/app/plugins/datasource/mysql/partials/query.editor.html index a04ea7891c..180299c751 100644 --- a/public/app/plugins/datasource/mysql/partials/query.editor.html +++ b/public/app/plugins/datasource/mysql/partials/query.editor.html @@ -153,7 +153,7 @@ - $__unixEpochFilter(column) -> time_unix_epoch > 1492750877 AND time_unix_epoch < 1492750877 - $__unixEpochNanoFilter(column) -> column >= 1494410783152415214 AND column <= 1494497183142514872 - $__timeGroup(column,'5m'[, fillvalue]) -> cast(cast(UNIX_TIMESTAMP(column)/(300) as signed)*300 as signed) - by setting fillvalue grafana will fill in missing values according to the interval + by setting fillvalue plutono will fill in missing values according to the interval fillvalue can be either a literal value, NULL or previous; previous will fill in the previous seen value or NULL if none has been seen yet - $__timeGroupAlias(column,'5m') -> cast(cast(UNIX_TIMESTAMP(column)/(300) as signed)*300 as signed) AS "time" - $__unixEpochGroup(column,'5m') -> column DIV 300 * 300 diff --git a/public/app/plugins/datasource/mysql/query_ctrl.ts b/public/app/plugins/datasource/mysql/query_ctrl.ts index f146a7af9e..e00256f37a 100644 --- a/public/app/plugins/datasource/mysql/query_ctrl.ts +++ b/public/app/plugins/datasource/mysql/query_ctrl.ts @@ -7,9 +7,9 @@ import MysqlQuery from './mysql_query'; import sqlPart from './sql_part'; import { auto } from 'angular'; import { CoreEvents } from 'app/types'; -import { PanelEvents, QueryResultMeta } from '@grafana/data'; +import { PanelEvents, QueryResultMeta } from '@credativ/plutono-data'; import { VariableWithMultiSupport } from 'app/features/variables/types'; -import { TemplateSrv } from '@grafana/runtime'; +import { TemplateSrv } from '@credativ/plutono-runtime'; const defaultQuery = `SELECT UNIX_TIMESTAMP() as time_sec, diff --git a/public/app/plugins/datasource/mysql/specs/datasource.test.ts b/public/app/plugins/datasource/mysql/specs/datasource.test.ts index a36e5b9143..1aae844fd3 100644 --- a/public/app/plugins/datasource/mysql/specs/datasource.test.ts +++ b/public/app/plugins/datasource/mysql/specs/datasource.test.ts @@ -1,14 +1,14 @@ import { of } from 'rxjs'; -import { dateTime, toUtc } from '@grafana/data'; +import { dateTime, toUtc } from '@credativ/plutono-data'; import { MysqlDatasource } from '../datasource'; import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__ import { TemplateSrv } from 'app/features/templating/template_srv'; import { initialCustomVariableModelState } from '../../../../features/variables/custom/reducer'; -import { FetchResponse } from '@grafana/runtime'; +import { FetchResponse } from '@credativ/plutono-runtime'; -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, })); @@ -311,7 +311,7 @@ describe('MySQLDatasource', () => { avg(value) as value, hostname as metric FROM - grafana_metric + plutono_metric WHERE $__timeFilter(createdAt) AND measurement = 'logins.count' AND @@ -336,7 +336,7 @@ describe('MySQLDatasource', () => { avg(value) as value, hostname as metric FROM - grafana_metric + plutono_metric WHERE $__timeFilter(createdAt) AND measurement = 'logins.count' diff --git a/public/app/plugins/datasource/mysql/types.ts b/public/app/plugins/datasource/mysql/types.ts index e97ab564f4..97c57bdd8a 100644 --- a/public/app/plugins/datasource/mysql/types.ts +++ b/public/app/plugins/datasource/mysql/types.ts @@ -1,4 +1,4 @@ -import { MetricFindValue } from '@grafana/data'; +import { MetricFindValue } from '@credativ/plutono-data'; export interface MysqlQueryForInterpolation { alias?: any; diff --git a/public/app/plugins/datasource/opentsdb/README.md b/public/app/plugins/datasource/opentsdb/README.md index 4afd5dce1b..f1816e9e74 100644 --- a/public/app/plugins/datasource/opentsdb/README.md +++ b/public/app/plugins/datasource/opentsdb/README.md @@ -1,7 +1,7 @@ # OpenTSDB Data Source - Native Plugin -Grafana ships with **built in** support for OpenTSDB, a scalable, distributed time series database. +Plutono ships with **built in** support for OpenTSDB, a scalable, distributed time series database. Read more about it here: -[http://docs.grafana.org/datasources/opentsdb/](http://docs.grafana.org/datasources/opentsdb/) +[http://docs.plutono.org/datasources/opentsdb/](http://docs.plutono.org/datasources/opentsdb/) diff --git a/public/app/plugins/datasource/opentsdb/components/ConfigEditor.tsx b/public/app/plugins/datasource/opentsdb/components/ConfigEditor.tsx index dc0bc712c0..710f830b7d 100644 --- a/public/app/plugins/datasource/opentsdb/components/ConfigEditor.tsx +++ b/public/app/plugins/datasource/opentsdb/components/ConfigEditor.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { DataSourceHttpSettings } from '@grafana/ui'; -import { DataSourcePluginOptionsEditorProps } from '@grafana/data'; +import { DataSourceHttpSettings } from '@credativ/plutono-ui'; +import { DataSourcePluginOptionsEditorProps } from '@credativ/plutono-data'; import { OpenTsdbDetails } from './OpenTsdbDetails'; import { OpenTsdbOptions } from '../types'; diff --git a/public/app/plugins/datasource/opentsdb/components/OpenTsdbDetails.tsx b/public/app/plugins/datasource/opentsdb/components/OpenTsdbDetails.tsx index 0457fe63db..3ae91576d7 100644 --- a/public/app/plugins/datasource/opentsdb/components/OpenTsdbDetails.tsx +++ b/public/app/plugins/datasource/opentsdb/components/OpenTsdbDetails.tsx @@ -1,7 +1,7 @@ import React, { SyntheticEvent } from 'react'; -import { InlineFormLabel, LegacyForms } from '@grafana/ui'; +import { InlineFormLabel, LegacyForms } from '@credativ/plutono-ui'; const { Select, Input } = LegacyForms; -import { DataSourceSettings, SelectableValue } from '@grafana/data'; +import { DataSourceSettings, SelectableValue } from '@credativ/plutono-data'; import { OpenTsdbOptions } from '../types'; const tsdbVersions = [ diff --git a/public/app/plugins/datasource/opentsdb/datasource.ts b/public/app/plugins/datasource/opentsdb/datasource.ts index 59847c96de..37ac5bdb56 100644 --- a/public/app/plugins/datasource/opentsdb/datasource.ts +++ b/public/app/plugins/datasource/opentsdb/datasource.ts @@ -2,7 +2,7 @@ import angular from 'angular'; import _ from 'lodash'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; -import { FetchResponse, getBackendSrv } from '@grafana/runtime'; +import { FetchResponse, getBackendSrv } from '@credativ/plutono-runtime'; import { AnnotationEvent, DataQueryRequest, @@ -10,7 +10,7 @@ import { DataSourceApi, dateMath, ScopedVars, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv'; import { OpenTsdbOptions, OpenTsdbQuery } from './types'; diff --git a/public/app/plugins/datasource/opentsdb/module.ts b/public/app/plugins/datasource/opentsdb/module.ts index 768025c026..80cc187274 100644 --- a/public/app/plugins/datasource/opentsdb/module.ts +++ b/public/app/plugins/datasource/opentsdb/module.ts @@ -1,6 +1,6 @@ import OpenTsDatasource from './datasource'; import { OpenTsQueryCtrl } from './query_ctrl'; -import { DataSourcePlugin } from '@grafana/data'; +import { DataSourcePlugin } from '@credativ/plutono-data'; import { ConfigEditor } from './components/ConfigEditor'; class AnnotationsQueryCtrl { diff --git a/public/app/plugins/datasource/opentsdb/query_ctrl.ts b/public/app/plugins/datasource/opentsdb/query_ctrl.ts index c95072b31d..3fc360acec 100644 --- a/public/app/plugins/datasource/opentsdb/query_ctrl.ts +++ b/public/app/plugins/datasource/opentsdb/query_ctrl.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import { QueryCtrl } from 'app/plugins/sdk'; import { auto } from 'angular'; -import { textUtil, rangeUtil } from '@grafana/data'; +import { textUtil, rangeUtil } from '@credativ/plutono-data'; export class OpenTsQueryCtrl extends QueryCtrl { static templateUrl = 'partials/query.editor.html'; diff --git a/public/app/plugins/datasource/opentsdb/specs/datasource.test.ts b/public/app/plugins/datasource/opentsdb/specs/datasource.test.ts index a7b05d1960..18e0c50645 100644 --- a/public/app/plugins/datasource/opentsdb/specs/datasource.test.ts +++ b/public/app/plugins/datasource/opentsdb/specs/datasource.test.ts @@ -4,8 +4,8 @@ import { OpenTsdbQuery } from '../types'; import { createFetchResponse } from '../../../../../test/helpers/createFetchResponse'; import { of } from 'rxjs'; -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, })); diff --git a/public/app/plugins/datasource/opentsdb/types.ts b/public/app/plugins/datasource/opentsdb/types.ts index 4a5cf58eb4..d44c6c12a9 100644 --- a/public/app/plugins/datasource/opentsdb/types.ts +++ b/public/app/plugins/datasource/opentsdb/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/data'; +import { DataQuery, DataSourceJsonData } from '@credativ/plutono-data'; export interface OpenTsdbQuery extends DataQuery { metric?: any; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/query_ctrl.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/__mocks__/query_ctrl.ts similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/query_ctrl.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/__mocks__/query_ctrl.ts diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/sdk.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/__mocks__/sdk.ts similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/sdk.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/__mocks__/sdk.ts diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/annotations_query_ctrl.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/annotations_query_ctrl.ts similarity index 96% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/annotations_query_ctrl.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/annotations_query_ctrl.ts index 8b68db49d0..6ffe3826a4 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/annotations_query_ctrl.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/annotations_query_ctrl.ts @@ -1,4 +1,4 @@ -import { getTemplateSrv, TemplateSrv } from '@grafana/runtime'; +import { getTemplateSrv, TemplateSrv } from '@credativ/plutono-runtime'; export class AzureMonitorAnnotationsQueryCtrl { static templateUrl = 'partials/annotations.editor.html'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.test.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/app_insights/app_insights_datasource.test.ts similarity index 98% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.test.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/app_insights/app_insights_datasource.test.ts index 02608d1b97..9959867e3d 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.test.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/app_insights/app_insights_datasource.test.ts @@ -1,15 +1,15 @@ -import { DataFrame, getFrameDisplayName, toUtc } from '@grafana/data'; +import { DataFrame, getFrameDisplayName, toUtc } from '@credativ/plutono-data'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { backendSrv } from 'app/core/services/backend_srv'; -import { setBackendSrv } from '@grafana/runtime'; +import { setBackendSrv } from '@credativ/plutono-runtime'; import AppInsightsDatasource from './app_insights_datasource'; import { of } from 'rxjs'; const templateSrv = new TemplateSrv(); jest.mock('app/core/services/backend_srv'); -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, getTemplateSrv: () => templateSrv, })); diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/app_insights/app_insights_datasource.ts similarity index 97% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/app_insights/app_insights_datasource.ts index cfa6fd475e..e3f3c352da 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/app_insights/app_insights_datasource.ts @@ -1,5 +1,5 @@ -import { DataQueryRequest, DataSourceInstanceSettings, ScopedVars, MetricFindValue } from '@grafana/data'; -import { getBackendSrv, getTemplateSrv, DataSourceWithBackend } from '@grafana/runtime'; +import { DataQueryRequest, DataSourceInstanceSettings, ScopedVars, MetricFindValue } from '@credativ/plutono-data'; +import { getBackendSrv, getTemplateSrv, DataSourceWithBackend } from '@credativ/plutono-runtime'; import _, { isString } from 'lodash'; import TimegrainConverter from '../time_grain_converter'; @@ -123,7 +123,7 @@ export default class AppInsightsDatasource extends DataSourceWithBackend ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, getTemplateSrv: () => templateSrv, })); diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts similarity index 99% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts index 50690fd4d1..abf272268f 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts @@ -8,8 +8,8 @@ import { ScopedVars, DataSourceInstanceSettings, MetricFindValue, -} from '@grafana/data'; -import { getBackendSrv, getTemplateSrv, DataSourceWithBackend } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { getBackendSrv, getTemplateSrv, DataSourceWithBackend } from '@credativ/plutono-runtime'; import { Observable, from } from 'rxjs'; import { mergeMap } from 'rxjs/operators'; @@ -215,7 +215,7 @@ export default class AzureLogAnalyticsDatasource extends DataSourceWithBackend< /** * This is named differently than DataSourceApi.metricFindQuery - * because it's not exposed to Grafana like the main AzureMonitorDataSource. + * because it's not exposed to Plutono like the main AzureMonitorDataSource. * And some of the azure internal data sources return null in this function, which the * external interface does not support */ diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.test.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_log_analytics/response_parser.test.ts similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.test.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_log_analytics/response_parser.test.ts diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_log_analytics/response_parser.ts similarity index 98% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_log_analytics/response_parser.ts index 1eeb16ca2e..0c373c798a 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_log_analytics/response_parser.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { AnnotationEvent, dateTime, TimeSeries } from '@grafana/data'; +import { AnnotationEvent, dateTime, TimeSeries } from '@credativ/plutono-data'; import { AzureLogsTableData, AzureLogsVariable, diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts similarity index 99% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts index f70544139c..fd47950dea 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts @@ -1,14 +1,14 @@ import AzureMonitorDatasource from '../datasource'; import { TemplateSrv } from 'app/features/templating/template_srv'; -import { DataSourceInstanceSettings } from '@grafana/data'; +import { DataSourceInstanceSettings } from '@credativ/plutono-data'; import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__ import { AzureDataSourceJsonData } from '../types'; const templateSrv = new TemplateSrv(); -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, getTemplateSrv: () => templateSrv, })); diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts similarity index 99% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts index d8c386682c..118cd5bcdc 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts @@ -10,8 +10,8 @@ import { AzureMonitorResourceGroupsResponse, AzureQueryType, } from '../types'; -import { DataSourceInstanceSettings, ScopedVars, MetricFindValue } from '@grafana/data'; -import { getBackendSrv, DataSourceWithBackend, getTemplateSrv } from '@grafana/runtime'; +import { DataSourceInstanceSettings, ScopedVars, MetricFindValue } from '@credativ/plutono-data'; +import { getBackendSrv, DataSourceWithBackend, getTemplateSrv } from '@credativ/plutono-runtime'; const defaultDropdownValue = 'select'; @@ -104,7 +104,7 @@ export default class AzureMonitorDatasource extends DataSourceWithBackend { id: 21, orgId: 1, name: 'Azure Monitor-10-10', - type: 'grafana-azure-monitor-datasource', + type: 'plutono-azure-monitor-datasource', typeName: 'Azure', typeLogoUrl: '', access: 'proxy', diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AnalyticsConfig.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/AnalyticsConfig.tsx similarity index 97% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AnalyticsConfig.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/components/AnalyticsConfig.tsx index ed27e06448..9131487f64 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AnalyticsConfig.tsx +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/AnalyticsConfig.tsx @@ -1,7 +1,7 @@ import React, { PureComponent, ChangeEvent } from 'react'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { AzureCredentialsForm } from './AzureCredentialsForm'; -import { InlineFormLabel, LegacyForms, Button } from '@grafana/ui'; +import { InlineFormLabel, LegacyForms, Button } from '@credativ/plutono-ui'; const { Select, Switch } = LegacyForms; import { AzureDataSourceSettings } from '../types'; @@ -144,7 +144,7 @@ export class AnalyticsConfig extends PureComponent { {...addtlAttrs} /> {showSameAsHelpMsg && ( -
    +

    Re-enter your Azure Monitor Client Secret to use this setting.

    diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AzureCredentialsForm.test.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/AzureCredentialsForm.test.tsx similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AzureCredentialsForm.test.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/components/AzureCredentialsForm.test.tsx diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AzureCredentialsForm.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/AzureCredentialsForm.tsx similarity index 97% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AzureCredentialsForm.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/components/AzureCredentialsForm.tsx index 5be266eb59..bfc7f51a05 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AzureCredentialsForm.tsx +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/AzureCredentialsForm.tsx @@ -1,6 +1,6 @@ import React, { ChangeEvent, PureComponent } from 'react'; -import { SelectableValue } from '@grafana/data'; -import { InlineFormLabel, LegacyForms, Button } from '@grafana/ui'; +import { SelectableValue } from '@credativ/plutono-data'; +import { InlineFormLabel, LegacyForms, Button } from '@credativ/plutono-ui'; const { Select, Input } = LegacyForms; export interface Props { diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ConfigEditor.test.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/ConfigEditor.test.tsx similarity index 95% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ConfigEditor.test.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/components/ConfigEditor.test.tsx index c3a5272327..54f5024d38 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ConfigEditor.test.tsx +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/ConfigEditor.test.tsx @@ -8,7 +8,7 @@ const setup = () => { id: 21, orgId: 1, name: 'Azure Monitor-10-10', - type: 'grafana-azure-monitor-datasource', + type: 'plutono-azure-monitor-datasource', typeLogoUrl: '', typeName: 'Azure', access: 'proxy', diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ConfigEditor.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/ConfigEditor.tsx similarity index 98% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ConfigEditor.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/components/ConfigEditor.tsx index 033a606676..cfe9897700 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ConfigEditor.tsx +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/ConfigEditor.tsx @@ -6,10 +6,10 @@ import { updateDatasourcePluginResetOption, updateDatasourcePluginJsonDataOption, updateDatasourcePluginSecureJsonDataOption, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { MonitorConfig } from './MonitorConfig'; import { AnalyticsConfig } from './AnalyticsConfig'; -import { getBackendSrv, TemplateSrv, getTemplateSrv } from '@grafana/runtime'; +import { getBackendSrv, TemplateSrv, getTemplateSrv } from '@credativ/plutono-runtime'; import { InsightsConfig } from './InsightsConfig'; import ResponseParser from '../azure_monitor/response_parser'; import { AzureDataSourceJsonData, AzureDataSourceSecureJsonData, AzureDataSourceSettings } from '../types'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/InsightsConfig.test.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/InsightsConfig.test.tsx similarity index 97% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/components/InsightsConfig.test.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/components/InsightsConfig.test.tsx index cb1e8302eb..525a09f9cb 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/InsightsConfig.test.tsx +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/InsightsConfig.test.tsx @@ -8,7 +8,7 @@ const setup = (propOverrides?: object) => { id: 21, orgId: 1, name: 'Azure Monitor-10-10', - type: 'grafana-azure-monitor-datasource', + type: 'plutono-azure-monitor-datasource', typeLogoUrl: '', typeName: 'Azure', access: 'proxy', diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/InsightsConfig.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/InsightsConfig.tsx similarity index 97% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/components/InsightsConfig.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/components/InsightsConfig.tsx index 23ce9f2311..458f4c72e0 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/InsightsConfig.tsx +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/InsightsConfig.tsx @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { InlineFormLabel, Button, LegacyForms } from '@grafana/ui'; +import { InlineFormLabel, Button, LegacyForms } from '@credativ/plutono-ui'; const { Input } = LegacyForms; import { AzureDataSourceSettings, AzureDataSourceJsonData, AzureDataSourceSecureJsonData } from '../types'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MonitorConfig.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/MonitorConfig.tsx similarity index 98% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MonitorConfig.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/components/MonitorConfig.tsx index 92028087b6..f32d60e24b 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MonitorConfig.tsx +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/MonitorConfig.tsx @@ -1,5 +1,5 @@ import React, { PureComponent, ChangeEvent } from 'react'; -import { SelectableValue } from '@grafana/data'; +import { SelectableValue } from '@credativ/plutono-data'; import { AzureCredentialsForm } from './AzureCredentialsForm'; import { AzureDataSourceSettings } from '../types'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AnalyticsConfig.test.tsx.snap b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/__snapshots__/AnalyticsConfig.test.tsx.snap similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AnalyticsConfig.test.tsx.snap rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/components/__snapshots__/AnalyticsConfig.test.tsx.snap diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AzureCredentialsForm.test.tsx.snap b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/__snapshots__/AzureCredentialsForm.test.tsx.snap similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AzureCredentialsForm.test.tsx.snap rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/components/__snapshots__/AzureCredentialsForm.test.tsx.snap diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/ConfigEditor.test.tsx.snap b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/__snapshots__/ConfigEditor.test.tsx.snap similarity index 95% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/ConfigEditor.test.tsx.snap rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/components/__snapshots__/ConfigEditor.test.tsx.snap index 271a21c84b..3fe192f0a0 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/ConfigEditor.test.tsx.snap +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/__snapshots__/ConfigEditor.test.tsx.snap @@ -28,7 +28,7 @@ exports[`Render should render component 1`] = ` "readOnly": false, "secureJsonData": Object {}, "secureJsonFields": Object {}, - "type": "grafana-azure-monitor-datasource", + "type": "plutono-azure-monitor-datasource", "typeLogoUrl": "", "typeName": "Azure", "url": "", @@ -66,7 +66,7 @@ exports[`Render should render component 1`] = ` "password": "", "readOnly": false, "secureJsonFields": Object {}, - "type": "grafana-azure-monitor-datasource", + "type": "plutono-azure-monitor-datasource", "typeLogoUrl": "", "typeName": "Azure", "url": "/api/datasources/proxy/21", @@ -106,7 +106,7 @@ exports[`Render should render component 1`] = ` "readOnly": false, "secureJsonData": Object {}, "secureJsonFields": Object {}, - "type": "grafana-azure-monitor-datasource", + "type": "plutono-azure-monitor-datasource", "typeLogoUrl": "", "typeName": "Azure", "url": "", @@ -142,7 +142,7 @@ exports[`Render should render component 1`] = ` "readOnly": false, "secureJsonData": Object {}, "secureJsonFields": Object {}, - "type": "grafana-azure-monitor-datasource", + "type": "plutono-azure-monitor-datasource", "typeLogoUrl": "", "typeName": "Azure", "url": "", diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/InsightsConfig.test.tsx.snap b/public/app/plugins/datasource/plutono-azure-monitor-datasource/components/__snapshots__/InsightsConfig.test.tsx.snap similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/InsightsConfig.test.tsx.snap rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/components/__snapshots__/InsightsConfig.test.tsx.snap diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/css/query_editor.css b/public/app/plugins/datasource/plutono-azure-monitor-datasource/css/query_editor.css similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/css/query_editor.css rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/css/query_editor.css diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/datasource.ts similarity index 98% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/datasource.ts index f6a2cc5c1c..0eb4cc58bb 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/datasource.ts @@ -11,9 +11,9 @@ import { DataSourceInstanceSettings, LoadingState, ScopedVars, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { forkJoin, Observable, of } from 'rxjs'; -import { DataSourceWithBackend } from '@grafana/runtime'; +import { DataSourceWithBackend } from '@credativ/plutono-runtime'; import InsightsAnalyticsDatasource from './insights_analytics/insights_analytics_datasource'; import { migrateMetricsDimensionFilters } from './query_ctrl'; import { map } from 'rxjs/operators'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/KustoQueryField.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/KustoQueryField.tsx similarity index 98% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/KustoQueryField.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/KustoQueryField.tsx index 8b060e04b2..992eb77d87 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/KustoQueryField.tsx +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/KustoQueryField.tsx @@ -3,10 +3,10 @@ import Plain from 'slate-plain-serializer'; import QueryField from './query_field'; import debounce from 'lodash/debounce'; -import { DOMUtil } from '@grafana/ui'; +import { DOMUtil } from '@credativ/plutono-ui'; import { Editor } from 'slate-react'; -import { KEYWORDS, functionTokens, operatorTokens, grafanaMacros } from './kusto/kusto'; +import { KEYWORDS, functionTokens, operatorTokens, plutonoMacros } from './kusto/kusto'; // import '../sass/editor.base.scss'; const TYPEAHEAD_DELAY = 100; @@ -315,7 +315,7 @@ export default class KustoQueryField extends QueryField { { prefixMatch: true, label: 'Macros', - items: grafanaMacros.map((s: any) => { + items: plutonoMacros.map((s: any) => { s.type = 'function'; return s; }), @@ -341,7 +341,7 @@ export default class KustoQueryField extends QueryField { { prefixMatch: true, label: 'Macros', - items: grafanaMacros.map((s: any) => { + items: plutonoMacros.map((s: any) => { s.type = 'function'; return s; }), diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/editor_component.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/editor_component.tsx similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/editor_component.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/editor_component.tsx diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/kusto/kusto.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/kusto/kusto.ts similarity index 99% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/kusto/kusto.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/kusto/kusto.ts index c809f7d122..6d8bd16adb 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/kusto/kusto.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/kusto/kusto.ts @@ -643,21 +643,21 @@ export const KEYWORDS = [ 'bool', ]; -export const grafanaMacros = [ +export const plutonoMacros = [ { text: '$__timeFilter', display: '$__timeFilter()', - hint: 'Macro that uses the selected timerange in Grafana to filter the query.', + hint: 'Macro that uses the selected timerange in Plutono to filter the query.', }, { text: '$__timeTo', display: '$__timeTo()', - hint: 'Returns the From datetime from the Grafana picker. Example: datetime(2018-06-05T20:09:58.907Z).', + hint: 'Returns the From datetime from the Plutono picker. Example: datetime(2018-06-05T20:09:58.907Z).', }, { text: '$__timeFrom', display: '$__timeFrom()', - hint: 'Returns the From datetime from the Grafana picker. Example: datetime(2018-06-05T18:09:58.907Z).', + hint: 'Returns the From datetime from the Plutono picker. Example: datetime(2018-06-05T18:09:58.907Z).', }, { text: '$__escapeMulti', diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/query_field.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/query_field.tsx similarity index 99% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/query_field.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/query_field.tsx index 0723197688..964116a552 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/query_field.tsx +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/query_field.tsx @@ -1,5 +1,5 @@ import PluginPrism from 'app/features/explore/slate-plugins/prism'; -import { BracesPlugin, ClearPlugin, RunnerPlugin, NewlinePlugin } from '@grafana/ui'; +import { BracesPlugin, ClearPlugin, RunnerPlugin, NewlinePlugin } from '@credativ/plutono-ui'; import Typeahead from './typeahead'; import { getKeybindingSrv, KeybindingSrv } from 'app/core/services/keybindingSrv'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/typeahead.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/typeahead.tsx similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/typeahead.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/editor/typeahead.tsx diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/img/azure_monitor_cpu.png b/public/app/plugins/datasource/plutono-azure-monitor-datasource/img/azure_monitor_cpu.png similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/img/azure_monitor_cpu.png rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/img/azure_monitor_cpu.png diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/img/azure_monitor_network.png b/public/app/plugins/datasource/plutono-azure-monitor-datasource/img/azure_monitor_network.png similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/img/azure_monitor_network.png rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/img/azure_monitor_network.png diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/img/config_1_select_type.png b/public/app/plugins/datasource/plutono-azure-monitor-datasource/img/config_1_select_type.png similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/img/config_1_select_type.png rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/img/config_1_select_type.png diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/img/config_2_azure_monitor_api_details.png b/public/app/plugins/datasource/plutono-azure-monitor-datasource/img/config_2_azure_monitor_api_details.png similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/img/config_2_azure_monitor_api_details.png rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/img/config_2_azure_monitor_api_details.png diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/img/config_3_app_insights_api_details.png b/public/app/plugins/datasource/plutono-azure-monitor-datasource/img/config_3_app_insights_api_details.png similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/img/config_3_app_insights_api_details.png rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/img/config_3_app_insights_api_details.png diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/img/config_4_save_and_test.png b/public/app/plugins/datasource/plutono-azure-monitor-datasource/img/config_4_save_and_test.png similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/img/config_4_save_and_test.png rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/img/config_4_save_and_test.png diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/img/contoso_loans_grafana_dashboard.png b/public/app/plugins/datasource/plutono-azure-monitor-datasource/img/contoso_loans_plutono_dashboard.png similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/img/contoso_loans_grafana_dashboard.png rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/img/contoso_loans_plutono_dashboard.png diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/img/logo.jpg b/public/app/plugins/datasource/plutono-azure-monitor-datasource/img/logo.jpg similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/img/logo.jpg rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/img/logo.jpg diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/img/grafana_cloud_install.png b/public/app/plugins/datasource/plutono-azure-monitor-datasource/img/plutono_cloud_install.png similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/img/grafana_cloud_install.png rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/img/plutono_cloud_install.png diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/img/grafana_cloud_login.png b/public/app/plugins/datasource/plutono-azure-monitor-datasource/img/plutono_cloud_login.png similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/img/grafana_cloud_login.png rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/img/plutono_cloud_login.png diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/insights_analytics/insights_analytics_datasource.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/insights_analytics/insights_analytics_datasource.ts similarity index 86% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/insights_analytics/insights_analytics_datasource.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/insights_analytics/insights_analytics_datasource.ts index f62bae6ad1..7375410c0d 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/insights_analytics/insights_analytics_datasource.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/insights_analytics/insights_analytics_datasource.ts @@ -1,5 +1,5 @@ -import { ScopedVars, DataSourceInstanceSettings } from '@grafana/data'; -import { getTemplateSrv } from '@grafana/runtime'; +import { ScopedVars, DataSourceInstanceSettings } from '@credativ/plutono-data'; +import { getTemplateSrv } from '@credativ/plutono-runtime'; import { AzureDataSourceJsonData, AzureMonitorQuery, AzureQueryType } from '../types'; import AppInsightsDatasource from '../app_insights/app_insights_datasource'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.test.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/log_analytics/querystring_builder.test.ts similarity index 89% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.test.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/log_analytics/querystring_builder.test.ts index 7e5ee1b300..ff2ecd6438 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.test.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/log_analytics/querystring_builder.test.ts @@ -1,5 +1,5 @@ import LogAnalyticsQuerystringBuilder from './querystring_builder'; -import { dateTime } from '@grafana/data'; +import { dateTime } from '@credativ/plutono-data'; describe('LogAnalyticsDatasource', () => { let builder: LogAnalyticsQuerystringBuilder; @@ -120,47 +120,47 @@ describe('LogAnalyticsDatasource', () => { describe('when using $__escape and multi template variable has one selected value', () => { beforeEach(() => { - builder.rawQueryString = `$__escapeMulti('\\grafana-vm\Network(eth0)\Total Bytes Received')`; + builder.rawQueryString = `$__escapeMulti('\\plutono-vm\Network(eth0)\Total Bytes Received')`; }); it('should replace $__escape(val) with KQL style escaped string', () => { const query = builder.generate().uriString; - expect(query).toContain(`%40'%5Cgrafana-vmNetwork(eth0)Total%20Bytes%20Received'`); + expect(query).toContain(`%40'%5Cplutono-vmNetwork(eth0)Total%20Bytes%20Received'`); }); }); describe('when using $__escape and multi template variable has multiple selected values', () => { beforeEach(() => { - builder.rawQueryString = `CounterPath in ($__escapeMulti('\\grafana-vm\Network(eth0)\Total','\\grafana-vm\Network(eth0)\Total'))`; + builder.rawQueryString = `CounterPath in ($__escapeMulti('\\plutono-vm\Network(eth0)\Total','\\plutono-vm\Network(eth0)\Total'))`; }); it('should replace $__escape(val) with multiple KQL style escaped string', () => { const query = builder.generate().uriString; expect(query).toContain( - `CounterPath%20in%20(%40'%5Cgrafana-vmNetwork(eth0)Total'%2C%20%40'%5Cgrafana-vmNetwork(eth0)Total')` + `CounterPath%20in%20(%40'%5Cplutono-vmNetwork(eth0)Total'%2C%20%40'%5Cplutono-vmNetwork(eth0)Total')` ); }); }); describe('when using $__escape and multi template variable has one selected value that contains comma', () => { beforeEach(() => { - builder.rawQueryString = `$__escapeMulti('\\grafana-vm,\Network(eth0)\Total Bytes Received')`; + builder.rawQueryString = `$__escapeMulti('\\plutono-vm,\Network(eth0)\Total Bytes Received')`; }); it('should replace $__escape(val) with KQL style escaped string', () => { const query = builder.generate().uriString; - expect(query).toContain(`%40'%5Cgrafana-vm%2CNetwork(eth0)Total%20Bytes%20Received'`); + expect(query).toContain(`%40'%5Cplutono-vm%2CNetwork(eth0)Total%20Bytes%20Received'`); }); }); describe(`when using $__escape and multi template variable value is not wrapped in single '`, () => { beforeEach(() => { - builder.rawQueryString = `$__escapeMulti(\\grafana-vm,\Network(eth0)\Total Bytes Received)`; + builder.rawQueryString = `$__escapeMulti(\\plutono-vm,\Network(eth0)\Total Bytes Received)`; }); it('should not replace macro', () => { const query = builder.generate().uriString; - expect(query).toContain(`%24__escapeMulti(%5Cgrafana-vm%2CNetwork(eth0)Total%20Bytes%20Received)`); + expect(query).toContain(`%24__escapeMulti(%5Cplutono-vm%2CNetwork(eth0)Total%20Bytes%20Received)`); }); }); }); diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/log_analytics/querystring_builder.ts similarity index 98% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/log_analytics/querystring_builder.ts index 0d2824831d..b3c395f047 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/log_analytics/querystring_builder.ts @@ -1,4 +1,4 @@ -import { dateTime } from '@grafana/data'; +import { dateTime } from '@credativ/plutono-data'; export default class LogAnalyticsQuerystringBuilder { constructor(public rawQueryString: string, public options: any, public defaultTimeField: any) {} diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/module.tsx b/public/app/plugins/datasource/plutono-azure-monitor-datasource/module.tsx similarity index 90% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/module.tsx rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/module.tsx index 33ca27c6ac..7ab9c3fc16 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/module.tsx +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/module.tsx @@ -1,4 +1,4 @@ -import { DataSourcePlugin } from '@grafana/data'; +import { DataSourcePlugin } from '@credativ/plutono-data'; import { AzureMonitorQueryCtrl } from './query_ctrl'; import Datasource from './datasource'; import { ConfigEditor } from './components/ConfigEditor'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/annotations.editor.html b/public/app/plugins/datasource/plutono-azure-monitor-datasource/partials/annotations.editor.html similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/annotations.editor.html rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/partials/annotations.editor.html diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/query.editor.html b/public/app/plugins/datasource/plutono-azure-monitor-datasource/partials/query.editor.html similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/query.editor.html rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/partials/query.editor.html diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/plugin.json b/public/app/plugins/datasource/plutono-azure-monitor-datasource/plugin.json similarity index 89% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/plugin.json rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/plugin.json index 7aa3f28fa8..3361029f42 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/plugin.json +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/plugin.json @@ -1,7 +1,7 @@ { "type": "datasource", "name": "Azure Monitor", - "id": "grafana-azure-monitor-datasource", + "id": "plutono-azure-monitor-datasource", "category": "cloud", "info": { @@ -20,7 +20,7 @@ { "name": "Apache License", "url": "https://github.com/grafana/azure-monitor-datasource/blob/master/LICENSE" } ], "screenshots": [ - { "name": "Azure Contoso Loans", "path": "img/contoso_loans_grafana_dashboard.png" }, + { "name": "Azure Contoso Loans", "path": "img/contoso_loans_plutono_dashboard.png" }, { "name": "Azure Monitor Network", "path": "img/azure_monitor_network.png" }, { "name": "Azure Monitor CPU", "path": "img/azure_monitor_cpu.png" } ], @@ -42,7 +42,7 @@ "resource": "https://management.azure.com/" } }, - "headers": [{ "name": "x-ms-app", "content": "Grafana" }] + "headers": [{ "name": "x-ms-app", "content": "Plutono" }] }, { "path": "govazuremonitor", @@ -57,7 +57,7 @@ "resource": "https://management.usgovcloudapi.net/" } }, - "headers": [{ "name": "x-ms-app", "content": "Grafana" }] + "headers": [{ "name": "x-ms-app", "content": "Plutono" }] }, { "path": "germanyazuremonitor", @@ -72,7 +72,7 @@ "resource": "https://management.microsoftazure.de/" } }, - "headers": [{ "name": "x-ms-app", "content": "Grafana" }] + "headers": [{ "name": "x-ms-app", "content": "Plutono" }] }, { "path": "chinaazuremonitor", @@ -87,7 +87,7 @@ "resource": "https://management.chinacloudapi.cn/" } }, - "headers": [{ "name": "x-ms-app", "content": "Grafana" }] + "headers": [{ "name": "x-ms-app", "content": "Plutono" }] }, { "path": "appinsights", @@ -95,7 +95,7 @@ "url": "https://api.applicationinsights.io", "headers": [ { "name": "X-API-Key", "content": "{{.SecureJsonData.appInsightsApiKey}}" }, - { "name": "x-ms-app", "content": "Grafana" } + { "name": "x-ms-app", "content": "Plutono" } ] }, { @@ -104,7 +104,7 @@ "url": "https://api.applicationinsights.azure.cn", "headers": [ { "name": "X-API-Key", "content": "{{.SecureJsonData.appInsightsApiKey}}" }, - { "name": "x-ms-app", "content": "Grafana" } + { "name": "x-ms-app", "content": "Plutono" } ] }, { @@ -120,7 +120,7 @@ "resource": "https://management.azure.com/" } }, - "headers": [{ "name": "x-ms-app", "content": "Grafana" }] + "headers": [{ "name": "x-ms-app", "content": "Plutono" }] }, { "path": "chinaworkspacesloganalytics", @@ -135,7 +135,7 @@ "resource": "https://management.chinacloudapi.cn/" } }, - "headers": [{ "name": "x-ms-app", "content": "Grafana" }] + "headers": [{ "name": "x-ms-app", "content": "Plutono" }] }, { "path": "govworkspacesloganalytics", @@ -150,7 +150,7 @@ "resource": "https://management.usgovcloudapi.net/" } }, - "headers": [{ "name": "x-ms-app", "content": "Grafana" }] + "headers": [{ "name": "x-ms-app", "content": "Plutono" }] }, { "path": "loganalyticsazure", @@ -166,7 +166,7 @@ } }, "headers": [ - { "name": "x-ms-app", "content": "Grafana" }, + { "name": "x-ms-app", "content": "Plutono" }, { "name": "Cache-Control", "content": "public, max-age=60" } ] }, @@ -184,7 +184,7 @@ } }, "headers": [ - { "name": "x-ms-app", "content": "Grafana" }, + { "name": "x-ms-app", "content": "Plutono" }, { "name": "Cache-Control", "content": "public, max-age=60" } ] }, @@ -202,14 +202,14 @@ } }, "headers": [ - { "name": "x-ms-app", "content": "Grafana" }, + { "name": "x-ms-app", "content": "Plutono" }, { "name": "Cache-Control", "content": "public, max-age=60" } ] } ], "dependencies": { - "grafanaVersion": "5.2.x", + "plutonoVersion": "5.2.x", "plugins": [] }, diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.test.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/query_ctrl.test.ts similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.test.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/query_ctrl.test.ts diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/query_ctrl.ts similarity index 99% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/query_ctrl.ts index 5c0fc6aabd..1fb27bafb3 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/query_ctrl.ts @@ -4,9 +4,9 @@ import { QueryCtrl } from 'app/plugins/sdk'; import TimegrainConverter from './time_grain_converter'; import './editor/editor_component'; -import { TemplateSrv } from '@grafana/runtime'; +import { TemplateSrv } from '@credativ/plutono-runtime'; import { auto, IPromise } from 'angular'; -import { DataFrame, PanelEvents, rangeUtil } from '@grafana/data'; +import { DataFrame, PanelEvents, rangeUtil } from '@credativ/plutono-data'; import { AzureQueryType, AzureMetricQuery } from './types'; export interface ResultFormat { diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_help.md b/public/app/plugins/datasource/plutono-azure-monitor-datasource/query_help.md similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/query_help.md rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/query_help.md diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.test.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/time_grain_converter.test.ts similarity index 100% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.test.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/time_grain_converter.test.ts diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/time_grain_converter.ts similarity index 98% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/time_grain_converter.ts index a83325a3ba..2c05764013 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/time_grain_converter.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { rangeUtil } from '@grafana/data'; +import { rangeUtil } from '@credativ/plutono-data'; export default class TimeGrainConverter { static createISO8601Duration(timeGrain: string | number, timeGrainUnit: any) { diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts b/public/app/plugins/datasource/plutono-azure-monitor-datasource/types.ts similarity index 98% rename from public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts rename to public/app/plugins/datasource/plutono-azure-monitor-datasource/types.ts index 86510d6387..43f99c2b2e 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts +++ b/public/app/plugins/datasource/plutono-azure-monitor-datasource/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData, DataSourceSettings, TableData } from '@grafana/data'; +import { DataQuery, DataSourceJsonData, DataSourceSettings, TableData } from '@credativ/plutono-data'; export type AzureDataSourceSettings = DataSourceSettings; diff --git a/public/app/plugins/datasource/grafana/README.md b/public/app/plugins/datasource/plutono/README.md similarity index 58% rename from public/app/plugins/datasource/grafana/README.md rename to public/app/plugins/datasource/plutono/README.md index a8319c8dec..520a32bdb2 100644 --- a/public/app/plugins/datasource/grafana/README.md +++ b/public/app/plugins/datasource/plutono/README.md @@ -1,3 +1,3 @@ -# Grafana Fake Data Datasource - Native Plugin +# Plutono Fake Data Datasource - Native Plugin -This is the built in Fake Data Datasource that is used before any datasources are set up in your Grafana installation. It means you can create a graph without any data and still get an idea of what it would look like. +This is the built in Fake Data Datasource that is used before any datasources are set up in your Plutono installation. It means you can create a graph without any data and still get an idea of what it would look like. diff --git a/public/app/plugins/datasource/plutono/annotation_ctrl.ts b/public/app/plugins/datasource/plutono/annotation_ctrl.ts new file mode 100644 index 0000000000..c8645929ce --- /dev/null +++ b/public/app/plugins/datasource/plutono/annotation_ctrl.ts @@ -0,0 +1,20 @@ +import { SelectableValue } from '@credativ/plutono-data'; +import { PlutonoAnnotationType } from './types'; + +export const annotationTypes: Array> = [ + { text: 'Dashboard', value: PlutonoAnnotationType.Dashboard }, + { text: 'Tags', value: PlutonoAnnotationType.Tags }, +]; + +export class PlutonoAnnotationsQueryCtrl { + annotation: any; + + types = annotationTypes; + + constructor() { + this.annotation.type = this.annotation.type || PlutonoAnnotationType.Tags; + this.annotation.limit = this.annotation.limit || 100; + } + + static templateUrl = 'partials/annotations.editor.html'; +} diff --git a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx b/public/app/plugins/datasource/plutono/components/QueryEditor.tsx similarity index 83% rename from public/app/plugins/datasource/grafana/components/QueryEditor.tsx rename to public/app/plugins/datasource/plutono/components/QueryEditor.tsx index acb3240f02..8b03f4cfc1 100644 --- a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx +++ b/public/app/plugins/datasource/plutono/components/QueryEditor.tsx @@ -1,31 +1,31 @@ import defaults from 'lodash/defaults'; import React, { PureComponent } from 'react'; -import { InlineField, Select, FeatureInfoBox } from '@grafana/ui'; -import { QueryEditorProps, SelectableValue, LiveChannelScope, FeatureState } from '@grafana/data'; -import { getLiveMeasurements, LiveMeasurements } from '@grafana/runtime'; -import { GrafanaDatasource } from '../datasource'; -import { defaultQuery, GrafanaQuery, GrafanaQueryType } from '../types'; +import { InlineField, Select, FeatureInfoBox } from '@credativ/plutono-ui'; +import { QueryEditorProps, SelectableValue, LiveChannelScope, FeatureState } from '@credativ/plutono-data'; +import { getLiveMeasurements, LiveMeasurements } from '@credativ/plutono-runtime'; +import { PlutonoDatasource } from '../datasource'; +import { defaultQuery, PlutonoQuery, PlutonoQueryType } from '../types'; -type Props = QueryEditorProps; +type Props = QueryEditorProps; const labelWidth = 12; export class QueryEditor extends PureComponent { - queryTypes: Array> = [ + queryTypes: Array> = [ { label: 'Random Walk', - value: GrafanaQueryType.RandomWalk, + value: PlutonoQueryType.RandomWalk, description: 'Random signal within the selected time range', }, { label: 'Live Measurements', - value: GrafanaQueryType.LiveMeasurements, - description: 'Stream real-time measurements from Grafana', + value: PlutonoQueryType.LiveMeasurements, + description: 'Stream real-time measurements from Plutono', }, ]; - onQueryTypeChange = (sel: SelectableValue) => { + onQueryTypeChange = (sel: SelectableValue) => { const { onChange, query, onRunQuery } = this.props; onChange({ ...query, queryType: sel.value! }); onRunQuery(); @@ -72,7 +72,7 @@ export class QueryEditor extends PureComponent { let info: LiveMeasurements | undefined = undefined; if (channel) { info = getLiveMeasurements({ - scope: LiveChannelScope.Grafana, + scope: LiveChannelScope.Plutono, namespace: 'measurements', path: channel, }); @@ -137,9 +137,9 @@ export class QueryEditor extends PureComponent {
    )} - +

    - This supports real-time event streams in Grafana core. This feature is under heavy development. Expect the + This supports real-time event streams in Plutono core. This feature is under heavy development. Expect the interfaces and structures to change as this becomes more production ready.

    @@ -160,7 +160,7 @@ export class QueryEditor extends PureComponent { />
    - {query.queryType === GrafanaQueryType.LiveMeasurements && this.renderMeasurementsQuery()} + {query.queryType === PlutonoQueryType.LiveMeasurements && this.renderMeasurementsQuery()} ); } diff --git a/public/app/plugins/datasource/grafana/datasource.test.ts b/public/app/plugins/datasource/plutono/datasource.test.ts similarity index 79% rename from public/app/plugins/datasource/grafana/datasource.test.ts rename to public/app/plugins/datasource/plutono/datasource.test.ts index c107003dd3..1c180be82e 100644 --- a/public/app/plugins/datasource/grafana/datasource.test.ts +++ b/public/app/plugins/datasource/plutono/datasource.test.ts @@ -1,11 +1,11 @@ -import { DataSourceInstanceSettings, dateTime, AnnotationQueryRequest } from '@grafana/data'; +import { DataSourceInstanceSettings, dateTime, AnnotationQueryRequest } from '@credativ/plutono-data'; import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__ -import { GrafanaDatasource } from './datasource'; -import { GrafanaQuery, GrafanaAnnotationQuery, GrafanaAnnotationType } from './types'; +import { PlutonoDatasource } from './datasource'; +import { PlutonoQuery, PlutonoAnnotationQuery, PlutonoAnnotationType } from './types'; -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, getTemplateSrv: () => ({ replace: (val: string) => { @@ -14,7 +14,7 @@ jest.mock('@grafana/runtime', () => ({ }), })); -describe('grafana data source', () => { +describe('plutono data source', () => { const getMock = jest.spyOn(backendSrv, 'get'); beforeEach(() => { @@ -23,14 +23,14 @@ describe('grafana data source', () => { describe('when executing an annotations query', () => { let calledBackendSrvParams: any; - let ds: GrafanaDatasource; + let ds: PlutonoDatasource; beforeEach(() => { getMock.mockImplementation((url: string, options: any) => { calledBackendSrvParams = options; return Promise.resolve([]); }); - ds = new GrafanaDatasource({} as DataSourceInstanceSettings); + ds = new PlutonoDatasource({} as DataSourceInstanceSettings); }); describe('with tags that have template variables', () => { @@ -61,7 +61,7 @@ describe('grafana data source', () => { describe('with type dashboard', () => { const options = setupAnnotationQueryOptions( { - type: GrafanaAnnotationType.Dashboard, + type: PlutonoAnnotationType.Dashboard, tags: ['tag1'], }, { id: 1 } @@ -78,7 +78,7 @@ describe('grafana data source', () => { }); }); -function setupAnnotationQueryOptions(annotation: Partial, dashboard?: { id: number }) { +function setupAnnotationQueryOptions(annotation: Partial, dashboard?: { id: number }) { return ({ annotation, dashboard, @@ -87,5 +87,5 @@ function setupAnnotationQueryOptions(annotation: Partial to: dateTime(1432288401), }, rangeRaw: { from: 'now-24h', to: 'now' }, - } as unknown) as AnnotationQueryRequest; + } as unknown) as AnnotationQueryRequest; } diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/plutono/datasource.ts similarity index 82% rename from public/app/plugins/datasource/grafana/datasource.ts rename to public/app/plugins/datasource/plutono/datasource.ts index 0c422e0885..ce5fbbad74 100644 --- a/public/app/plugins/datasource/grafana/datasource.ts +++ b/public/app/plugins/datasource/plutono/datasource.ts @@ -7,33 +7,33 @@ import { DataSourceApi, DataSourceInstanceSettings, LiveChannelScope, -} from '@grafana/data'; +} from '@credativ/plutono-data'; -import { GrafanaQuery, GrafanaAnnotationQuery, GrafanaAnnotationType, GrafanaQueryType } from './types'; -import { getBackendSrv, getTemplateSrv, toDataQueryResponse, getLiveMeasurementsObserver } from '@grafana/runtime'; +import { PlutonoQuery, PlutonoAnnotationQuery, PlutonoAnnotationType, PlutonoQueryType } from './types'; +import { getBackendSrv, getTemplateSrv, toDataQueryResponse, getLiveMeasurementsObserver } from '@credativ/plutono-runtime'; import { Observable, of, merge } from 'rxjs'; import { map, catchError } from 'rxjs/operators'; let counter = 100; -export class GrafanaDatasource extends DataSourceApi { +export class PlutonoDatasource extends DataSourceApi { constructor(instanceSettings: DataSourceInstanceSettings) { super(instanceSettings); } - query(request: DataQueryRequest): Observable { + query(request: DataQueryRequest): Observable { const queries: Array> = []; for (const target of request.targets) { if (target.hide) { continue; } - if (target.queryType === GrafanaQueryType.LiveMeasurements) { + if (target.queryType === PlutonoQueryType.LiveMeasurements) { const { channel, measurements } = target; if (channel) { queries.push( getLiveMeasurementsObserver( { - scope: LiveChannelScope.Grafana, + scope: LiveChannelScope.Plutono, namespace: 'measurements', path: channel, }, @@ -60,9 +60,9 @@ export class GrafanaDatasource extends DataSourceApi { return Promise.resolve([]); } - annotationQuery(options: AnnotationQueryRequest): Promise { + annotationQuery(options: AnnotationQueryRequest): Promise { const templateSrv = getTemplateSrv(); - const annotation = (options.annotation as unknown) as GrafanaAnnotationQuery; + const annotation = (options.annotation as unknown) as PlutonoAnnotationQuery; const params: any = { from: options.range.from.valueOf(), to: options.range.to.valueOf(), @@ -71,7 +71,7 @@ export class GrafanaDatasource extends DataSourceApi { matchAny: annotation.matchAny, }; - if (annotation.type === GrafanaAnnotationType.Dashboard) { + if (annotation.type === PlutonoAnnotationType.Dashboard) { // if no dashboard id yet return if (!options.dashboard.id) { return Promise.resolve([]); @@ -105,7 +105,7 @@ export class GrafanaDatasource extends DataSourceApi { return getBackendSrv().get( '/api/annotations', params, - `grafana-data-source-annotations-${annotation.name}-${options.dashboard?.id}` + `plutono-data-source-annotations-${annotation.name}-${options.dashboard?.id}` ); } diff --git a/public/app/plugins/datasource/plutono/module.ts b/public/app/plugins/datasource/plutono/module.ts new file mode 100644 index 0000000000..40eb314078 --- /dev/null +++ b/public/app/plugins/datasource/plutono/module.ts @@ -0,0 +1,9 @@ +import { DataSourcePlugin } from '@credativ/plutono-data'; +import { PlutonoDatasource } from './datasource'; +import { QueryEditor } from './components/QueryEditor'; +import { PlutonoQuery } from './types'; +import { PlutonoAnnotationsQueryCtrl } from './annotation_ctrl'; + +export const plugin = new DataSourcePlugin(PlutonoDatasource) + .setQueryEditor(QueryEditor) + .setAnnotationQueryCtrl(PlutonoAnnotationsQueryCtrl); diff --git a/public/app/plugins/datasource/grafana/partials/annotations.editor.html b/public/app/plugins/datasource/plutono/partials/annotations.editor.html similarity index 96% rename from public/app/plugins/datasource/grafana/partials/annotations.editor.html rename to public/app/plugins/datasource/plutono/partials/annotations.editor.html index c1164f7f8c..3bc65a7e12 100644 --- a/public/app/plugins/datasource/grafana/partials/annotations.editor.html +++ b/public/app/plugins/datasource/plutono/partials/annotations.editor.html @@ -32,7 +32,7 @@ label-class="width-9" checked="ctrl.annotation.matchAny" on-change="ctrl.refresh()" - tooltip="By default Grafana only shows annotations that match all tags in the query. Enabling this returns annotations that match any of the tags in the query."> + tooltip="By default Plutono only shows annotations that match all tags in the query. Enabling this returns annotations that match any of the tags in the query.">
    diff --git a/public/app/plugins/datasource/grafana/plugin.json b/public/app/plugins/datasource/plutono/plugin.json similarity index 65% rename from public/app/plugins/datasource/grafana/plugin.json rename to public/app/plugins/datasource/plutono/plugin.json index d7d957ec01..4838c44893 100644 --- a/public/app/plugins/datasource/grafana/plugin.json +++ b/public/app/plugins/datasource/plutono/plugin.json @@ -1,7 +1,7 @@ { "type": "datasource", - "name": "-- Grafana --", - "id": "grafana", + "name": "-- Plutono --", + "id": "plutono", "builtIn": true, "annotations": true, diff --git a/public/app/plugins/datasource/plutono/types.ts b/public/app/plugins/datasource/plutono/types.ts new file mode 100644 index 0000000000..42563f7141 --- /dev/null +++ b/public/app/plugins/datasource/plutono/types.ts @@ -0,0 +1,38 @@ +import { AnnotationQuery, DataQuery } from '@credativ/plutono-data'; +import { MeasurementsQuery } from '@credativ/plutono-runtime'; + +//---------------------------------------------- +// Query +//---------------------------------------------- + +export enum PlutonoQueryType { + RandomWalk = 'randomWalk', + LiveMeasurements = 'measurements', +} + +export interface PlutonoQuery extends DataQuery { + queryType: PlutonoQueryType; // RandomWalk by default + channel?: string; + measurements?: MeasurementsQuery; +} + +export const defaultQuery: PlutonoQuery = { + refId: 'A', + queryType: PlutonoQueryType.RandomWalk, +}; + +//---------------------------------------------- +// Annotations +//---------------------------------------------- + +export enum PlutonoAnnotationType { + Dashboard = 'dashboard', + Tags = 'tags', +} + +export interface PlutonoAnnotationQuery extends AnnotationQuery { + type: PlutonoAnnotationType; // tags + limit: number; // 100 + tags?: string[]; + matchAny?: boolean; // By default Plutono only shows annotations that match all tags in the query. Enabling this returns annotations that match any of the tags in the query. +} diff --git a/public/app/plugins/datasource/postgres/README.md b/public/app/plugins/datasource/postgres/README.md index 75c3615841..eb686079d3 100644 --- a/public/app/plugins/datasource/postgres/README.md +++ b/public/app/plugins/datasource/postgres/README.md @@ -1,12 +1,12 @@ -# Grafana PostgreSQL Data Source - Native Plugin +# Plutono PostgreSQL Data Source - Native Plugin -Grafana ships with a built-in PostgreSQL data source plugin that allows you to query and visualize data from a PostgreSQL compatible database. +Plutono ships with a built-in PostgreSQL data source plugin that allows you to query and visualize data from a PostgreSQL compatible database. ## Adding the data source -1. Open the side menu by clicking the Grafana icon in the top header. +1. Open the side menu by clicking the Plutono icon in the top header. 2. In the side menu under the Dashboards link you should find a link named Data Sources. 3. Click the + Add data source button in the top header. 4. Select PostgreSQL from the Type dropdown. -[http://docs.grafana.org/features/datasources/postgres/](http://docs.grafana.org/features/datasources/postgres/) +[http://docs.plutono.org/features/datasources/postgres/](http://docs.plutono.org/features/datasources/postgres/) diff --git a/public/app/plugins/datasource/postgres/datasource.ts b/public/app/plugins/datasource/postgres/datasource.ts index 63d282f91c..20ccd75b79 100644 --- a/public/app/plugins/datasource/postgres/datasource.ts +++ b/public/app/plugins/datasource/postgres/datasource.ts @@ -1,8 +1,8 @@ import _ from 'lodash'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; -import { getBackendSrv } from '@grafana/runtime'; -import { DataQueryResponse, ScopedVars } from '@grafana/data'; +import { getBackendSrv } from '@credativ/plutono-runtime'; +import { DataQueryResponse, ScopedVars } from '@credativ/plutono-data'; import ResponseParser from './response_parser'; import PostgresQuery from 'app/plugins/datasource/postgres/postgres_query'; diff --git a/public/app/plugins/datasource/postgres/partials/config.html b/public/app/plugins/datasource/postgres/partials/config.html index 9bff000e21..5a1ce96e4e 100644 --- a/public/app/plugins/datasource/postgres/partials/config.html +++ b/public/app/plugins/datasource/postgres/partials/config.html @@ -50,11 +50,11 @@

    PostgreSQL Connection

    This option determines how TLS/SSL certifications are configured. Selecting File system path will allow you to configure certificates by specifying paths to existing certificates on the local file system where - Grafana is running. Be sure that the file is readable by the user executing the Grafana process.

    + Plutono is running. Be sure that the file is readable by the user executing the Plutono process.

    Selecting Certificate content will allow you to configure certificates by specifying its content. - The content will be stored encrypted in Grafana's database. When connecting to the database the certificates - will be written as files to Grafana's configured data path on the local file system. + The content will be stored encrypted in Plutono's database. When connecting to the database the certificates + will be written as files to Plutono's configured data path on the local file system.
    @@ -78,7 +78,7 @@
    TLS/SSL Auth Details
    placeholder="TLS/SSL client cert file"> To authenticate with an TLS/SSL client certificate, provide the path to the file here. - Be sure that the file is readable by the user executing the grafana process. + Be sure that the file is readable by the user executing the plutono process.
    @@ -87,7 +87,7 @@
    TLS/SSL Auth Details
    placeholder="TLS/SSL client key file"> To authenticate with a client TLS/SSL certificate, provide the path to the corresponding key file here. - Be sure that the file is only readable by the user executing the grafana process. + Be sure that the file is only readable by the user executing the plutono process.
    @@ -171,11 +171,11 @@

    PostgreSQL details

    • -
    +

    TimescaleDB is a - time-series database built as a PostgreSQL extension. If enabled, Grafana will use time_bucket in + time-series database built as a PostgreSQL extension. If enabled, Plutono will use time_bucket in the $__timeGroup macro and display TimescaleDB specific aggregate functions in the query builder.

    @@ -183,11 +183,11 @@

    PostgreSQL details

    -
    +
    User Permission

    The database user should only be granted SELECT permissions on the specified database & tables you want to query. - Grafana does not validate that queries are safe so queries can contain any SQL statement. For example, statements + Plutono does not validate that queries are safe so queries can contain any SQL statement. For example, statements like DELETE FROM user; and DROP TABLE user; would be executed. To protect against this we Highly recommmend you create a specific PostgreSQL user with restricted permissions.

    diff --git a/public/app/plugins/datasource/postgres/partials/query.editor.html b/public/app/plugins/datasource/postgres/partials/query.editor.html index 13bba6a04d..f0bc90ce3a 100644 --- a/public/app/plugins/datasource/postgres/partials/query.editor.html +++ b/public/app/plugins/datasource/postgres/partials/query.editor.html @@ -154,7 +154,7 @@ - $__unixEpochFilter(column) -> column >= 1492750877 AND column <= 1492750877 - $__unixEpochNanoFilter(column) -> column >= 1494410783152415214 AND column <= 1494497183142514872 - $__timeGroup(column,'5m'[, fillvalue]) -> (extract(epoch from column)/300)::bigint*300 - by setting fillvalue grafana will fill in missing values according to the interval + by setting fillvalue plutono will fill in missing values according to the interval fillvalue can be either a literal value, NULL or previous; previous will fill in the previous seen value or NULL if none has been seen yet - $__timeGroupAlias(column,'5m') -> (extract(epoch from column)/300)::bigint*300 AS "time" - $__unixEpochGroup(column,'5m') -> floor(column/300)*300 diff --git a/public/app/plugins/datasource/postgres/postgres_query.ts b/public/app/plugins/datasource/postgres/postgres_query.ts index b2cc198b41..ae1a2d8191 100644 --- a/public/app/plugins/datasource/postgres/postgres_query.ts +++ b/public/app/plugins/datasource/postgres/postgres_query.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; -import { TemplateSrv } from '@grafana/runtime'; -import { ScopedVars } from '@grafana/data'; +import { TemplateSrv } from '@credativ/plutono-runtime'; +import { ScopedVars } from '@credativ/plutono-data'; export default class PostgresQuery { target: any; diff --git a/public/app/plugins/datasource/postgres/query_ctrl.ts b/public/app/plugins/datasource/postgres/query_ctrl.ts index 6ac3375b14..80c983c4f8 100644 --- a/public/app/plugins/datasource/postgres/query_ctrl.ts +++ b/public/app/plugins/datasource/postgres/query_ctrl.ts @@ -7,9 +7,9 @@ import PostgresQuery from './postgres_query'; import sqlPart from './sql_part'; import { auto } from 'angular'; import { CoreEvents } from 'app/types'; -import { PanelEvents, QueryResultMeta } from '@grafana/data'; +import { PanelEvents, QueryResultMeta } from '@credativ/plutono-data'; import { VariableWithMultiSupport } from 'app/features/variables/types'; -import { TemplateSrv } from '@grafana/runtime'; +import { TemplateSrv } from '@credativ/plutono-runtime'; const defaultQuery = `SELECT $__time(time_column), diff --git a/public/app/plugins/datasource/postgres/specs/datasource.test.ts b/public/app/plugins/datasource/postgres/specs/datasource.test.ts index d6da46a303..5fc0910682 100644 --- a/public/app/plugins/datasource/postgres/specs/datasource.test.ts +++ b/public/app/plugins/datasource/postgres/specs/datasource.test.ts @@ -1,7 +1,7 @@ import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { FetchResponse } from '@grafana/runtime'; -import { dateTime, toUtc } from '@grafana/data'; +import { FetchResponse } from '@credativ/plutono-runtime'; +import { dateTime, toUtc } from '@credativ/plutono-data'; import { PostgresDatasource } from '../datasource'; import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__ @@ -9,8 +9,8 @@ import { TemplateSrv } from 'app/features/templating/template_srv'; import { initialCustomVariableModelState } from '../../../../features/variables/custom/reducer'; import { TimeSrv } from '../../../../features/dashboard/services/TimeSrv'; -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, })); @@ -74,7 +74,7 @@ describe('PostgreSQLDatasource', () => { { format: 'time_series', rawQuery: true, - rawSql: 'select time, metric from grafana_metric', + rawSql: 'select time, metric from plutono_metric', refId: 'A', datasource: 'gdev-ds', }, @@ -86,7 +86,7 @@ describe('PostgreSQLDatasource', () => { A: { refId: 'A', meta: { - executedQueryString: 'select time, metric from grafana_metric', + executedQueryString: 'select time, metric from plutono_metric', rowCount: 0, }, series: [ @@ -110,7 +110,7 @@ describe('PostgreSQLDatasource', () => { { datapoints: [[30.226249741223704, 1599643351085]], meta: { - executedQueryString: 'select time, metric from grafana_metric', + executedQueryString: 'select time, metric from plutono_metric', rowCount: 0, }, refId: 'A', @@ -135,7 +135,7 @@ describe('PostgreSQLDatasource', () => { { format: 'table', rawQuery: true, - rawSql: 'select time, metric, value from grafana_metric', + rawSql: 'select time, metric, value from plutono_metric', refId: 'A', datasource: 'gdev-ds', }, @@ -147,7 +147,7 @@ describe('PostgreSQLDatasource', () => { A: { refId: 'A', meta: { - executedQueryString: 'select time, metric, value from grafana_metric', + executedQueryString: 'select time, metric, value from plutono_metric', rowCount: 1, }, series: null, @@ -194,7 +194,7 @@ describe('PostgreSQLDatasource', () => { type: 'table', refId: 'A', meta: { - executedQueryString: 'select time, metric, value from grafana_metric', + executedQueryString: 'select time, metric, value from plutono_metric', rowCount: 1, }, }, @@ -217,7 +217,7 @@ describe('PostgreSQLDatasource', () => { { format: 'table', rawQuery: true, - rawSql: 'select time, metric, value from grafana_metric', + rawSql: 'select time, metric, value from plutono_metric', refId: 'A', datasource: 'gdev-ds', hide: true, @@ -523,7 +523,7 @@ describe('PostgreSQLDatasource', () => { avg(value) as "value", hostname as "metric" FROM - grafana_metric + plutono_metric WHERE $__timeFilter("createdAt") AND measurement = 'logins.count' AND @@ -550,7 +550,7 @@ describe('PostgreSQLDatasource', () => { avg(value) as "value", hostname as "metric" FROM - grafana_metric + plutono_metric WHERE $__timeFilter("createdAt") AND measurement = 'logins.count' diff --git a/public/app/plugins/datasource/postgres/types.ts b/public/app/plugins/datasource/postgres/types.ts index dc1b015775..ecf481bf65 100644 --- a/public/app/plugins/datasource/postgres/types.ts +++ b/public/app/plugins/datasource/postgres/types.ts @@ -1,4 +1,4 @@ -import { MetricFindValue } from '@grafana/data'; +import { MetricFindValue } from '@credativ/plutono-data'; export interface PostgresQueryForInterpolation { alias?: any; diff --git a/public/app/plugins/datasource/prometheus/README.md b/public/app/plugins/datasource/prometheus/README.md index 2c44605c04..da303dd05b 100644 --- a/public/app/plugins/datasource/prometheus/README.md +++ b/public/app/plugins/datasource/prometheus/README.md @@ -1,7 +1,7 @@ # Prometheus Data Source - Native Plugin -Grafana ships with **built in** support for Prometheus, the open-source service monitoring system and time series database. +Plutono ships with **built in** support for Prometheus, the open-source service monitoring system and time series database. Read more about it here: -[http://docs.grafana.org/datasources/prometheus/](http://docs.grafana.org/datasources/prometheus/) +[http://docs.plutono.org/datasources/prometheus/](http://docs.plutono.org/datasources/prometheus/) diff --git a/public/app/plugins/datasource/prometheus/add_label_to_query.test.ts b/public/app/plugins/datasource/prometheus/add_label_to_query.test.ts index e4fb6ab671..75b0988401 100644 --- a/public/app/plugins/datasource/prometheus/add_label_to_query.test.ts +++ b/public/app/plugins/datasource/prometheus/add_label_to_query.test.ts @@ -71,8 +71,8 @@ describe('addLabelToQuery()', () => { }); it('should add label to query properly with Loki datasource', () => { - expect(addLabelToQuery('{job="grafana"} |= "foo-bar"', 'filename', 'test.txt', undefined, true)).toBe( - '{filename="test.txt",job="grafana"} |= "foo-bar"' + expect(addLabelToQuery('{job="plutono"} |= "foo-bar"', 'filename', 'test.txt', undefined, true)).toBe( + '{filename="test.txt",job="plutono"} |= "foo-bar"' ); }); diff --git a/public/app/plugins/datasource/prometheus/add_label_to_query.ts b/public/app/plugins/datasource/prometheus/add_label_to_query.ts index 269479acc3..864ee16fd6 100644 --- a/public/app/plugins/datasource/prometheus/add_label_to_query.ts +++ b/public/app/plugins/datasource/prometheus/add_label_to_query.ts @@ -20,7 +20,7 @@ const builtInWords = [ // We want to extract all possible metrics and also keywords const metricsAndKeywordsRegexp = /([A-Za-z:][\w:]*)\b(?![\]{=!",])/g; // Safari currently doesn't support negative lookbehind. When it does, we should refactor this. -// We are creating 2 matching groups. (\$) is for the Grafana's variables such as ${__rate_s}. We want to ignore +// We are creating 2 matching groups. (\$) is for the Plutono's variables such as ${__rate_s}. We want to ignore // ${__rate_s} and not add variable to it. const selectorRegexp = /(\$)?{([^{]*)}/g; @@ -58,7 +58,7 @@ export function addLabelToQuery( const prefix = query.slice(lastIndex, match.index); lastIndex = match.index + match[2].length + 2; suffix = query.slice(match.index + match[0].length); - // If we matched 1st group, we know it is Grafana's variable and we don't want to add labels + // If we matched 1st group, we know it is Plutono's variable and we don't want to add labels if (match[1]) { parts.push(prefix); parts.push(match[0]); diff --git a/public/app/plugins/datasource/prometheus/components/PromCheatSheet.tsx b/public/app/plugins/datasource/prometheus/components/PromCheatSheet.tsx index a8d3e89985..4725c7d204 100644 --- a/public/app/plugins/datasource/prometheus/components/PromCheatSheet.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromCheatSheet.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { QueryEditorHelpProps, DataQuery } from '@grafana/data'; +import { QueryEditorHelpProps, DataQuery } from '@credativ/plutono-data'; const CHEAT_SHEET_ITEMS = [ { diff --git a/public/app/plugins/datasource/prometheus/components/PromExemplarField.tsx b/public/app/plugins/datasource/prometheus/components/PromExemplarField.tsx index 375d10a44c..39561006e3 100644 --- a/public/app/plugins/datasource/prometheus/components/PromExemplarField.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromExemplarField.tsx @@ -1,5 +1,5 @@ -import { GrafanaTheme } from '@grafana/data'; -import { IconButton, InlineLabel, Tooltip, useStyles } from '@grafana/ui'; +import { PlutonoTheme } from '@credativ/plutono-data'; +import { IconButton, InlineLabel, Tooltip, useStyles } from '@credativ/plutono-ui'; import { css, cx } from 'emotion'; import React, { useEffect, useState } from 'react'; import { PrometheusDatasource } from '../datasource'; @@ -50,7 +50,7 @@ export function PromExemplarField({ datasource, onChange, isEnabled }: Props) { ); } -function getStyles(theme: GrafanaTheme) { +function getStyles(theme: PlutonoTheme) { return { eyeIcon: css` margin-left: ${theme.spacing.md}; diff --git a/public/app/plugins/datasource/prometheus/components/PromExploreExtraField.tsx b/public/app/plugins/datasource/prometheus/components/PromExploreExtraField.tsx index 4391b18e95..371b574db4 100644 --- a/public/app/plugins/datasource/prometheus/components/PromExploreExtraField.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromExploreExtraField.tsx @@ -3,7 +3,7 @@ import React, { memo } from 'react'; import { css, cx } from 'emotion'; // Types -import { InlineFormLabel, RadioButtonGroup } from '@grafana/ui'; +import { InlineFormLabel, RadioButtonGroup } from '@credativ/plutono-ui'; import { PromQuery } from '../types'; import { PromExemplarField } from './PromExemplarField'; import { PrometheusDatasource } from '../datasource'; diff --git a/public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.test.tsx b/public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.test.tsx index 6501fe7f9a..a82b4e2c22 100644 --- a/public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.test.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.test.tsx @@ -4,7 +4,7 @@ import { act } from 'react-dom/test-utils'; import PromExploreQueryEditor from './PromExploreQueryEditor'; import { PrometheusDatasource } from '../datasource'; import { PromQuery } from '../types'; -import { LoadingState, PanelData, toUtc, TimeRange } from '@grafana/data'; +import { LoadingState, PanelData, toUtc, TimeRange } from '@credativ/plutono-data'; const setup = (renderMethod: any, propOverrides?: object) => { const datasourceMock: unknown = { @@ -44,7 +44,7 @@ const setup = (renderMethod: any, propOverrides?: object) => { scopedVars: {}, targets: [], timezone: 'GMT', - app: 'Grafana', + app: 'Plutono', startTime: 0, }, timeRange: { diff --git a/public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.tsx b/public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.tsx index d3aa7e0005..975b809341 100644 --- a/public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.tsx @@ -1,7 +1,7 @@ import React, { memo, FC, useEffect } from 'react'; // Types -import { ExploreQueryFieldProps } from '@grafana/data'; +import { ExploreQueryFieldProps } from '@credativ/plutono-data'; import { PrometheusDatasource } from '../datasource'; import { PromQuery, PromOptions } from '../types'; diff --git a/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx b/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx index 1f05f8a9ba..381a7b2267 100644 --- a/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { render, screen } from '@testing-library/react'; -import { PanelData } from '@grafana/data'; +import { PanelData } from '@credativ/plutono-data'; import { PromQuery } from '../types'; import { PrometheusDatasource } from '../datasource'; import PromLink from './PromLink'; diff --git a/public/app/plugins/datasource/prometheus/components/PromLink.tsx b/public/app/plugins/datasource/prometheus/components/PromLink.tsx index a2986a260a..27877f74de 100644 --- a/public/app/plugins/datasource/prometheus/components/PromLink.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromLink.tsx @@ -3,7 +3,7 @@ import React, { FC, useEffect, useState, memo } from 'react'; import { PrometheusDatasource } from '../datasource'; import { PromQuery } from '../types'; -import { DataQueryRequest, PanelData, textUtil } from '@grafana/data'; +import { DataQueryRequest, PanelData, textUtil } from '@credativ/plutono-data'; interface Props { datasource: PrometheusDatasource; diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryEditor.test.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryEditor.test.tsx index bfef5789a7..5f3e3c375b 100644 --- a/public/app/plugins/datasource/prometheus/components/PromQueryEditor.test.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromQueryEditor.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { dateTime } from '@grafana/data'; +import { dateTime } from '@credativ/plutono-data'; import { PromQueryEditor } from './PromQueryEditor'; import { PrometheusDatasource } from '../datasource'; diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx index e12f229396..dc155fab87 100644 --- a/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx @@ -2,8 +2,8 @@ import _ from 'lodash'; import React, { PureComponent } from 'react'; // Types -import { InlineFormLabel, LegacyForms, Select } from '@grafana/ui'; -import { QueryEditorProps, SelectableValue } from '@grafana/data'; +import { InlineFormLabel, LegacyForms, Select } from '@credativ/plutono-ui'; +import { QueryEditorProps, SelectableValue } from '@credativ/plutono-data'; import { PrometheusDatasource } from '../datasource'; import { PromOptions, PromQuery } from '../types'; diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryField.test.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryField.test.tsx index b50a44564f..49b09fbb5f 100644 --- a/public/app/plugins/datasource/prometheus/components/PromQueryField.test.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromQueryField.test.tsx @@ -3,7 +3,7 @@ import RCCascader from 'rc-cascader'; import React from 'react'; import PromQlLanguageProvider from '../language_provider'; import PromQueryField, { groupMetricsByPrefix, RECORDING_RULES_GROUP } from './PromQueryField'; -import { DataSourceInstanceSettings, dateTime } from '@grafana/data'; +import { DataSourceInstanceSettings, dateTime } from '@credativ/plutono-data'; import { PromOptions } from '../types'; import { fireEvent, render, screen } from '@testing-library/react'; diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx index 527df9672f..d98b6ee7e4 100644 --- a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx @@ -13,7 +13,7 @@ import { BracesPlugin, DOMUtil, SuggestionsState, -} from '@grafana/ui'; +} from '@credativ/plutono-ui'; import { LanguageMap, languages as prismLanguages } from 'prismjs'; @@ -28,7 +28,7 @@ import { toLegacyResponseData, HistoryItem, TimeRange, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { PrometheusDatasource } from '../datasource'; const HISTOGRAM_GROUP = '__histograms__'; diff --git a/public/app/plugins/datasource/prometheus/components/__snapshots__/PromExploreQueryEditor.test.tsx.snap b/public/app/plugins/datasource/prometheus/components/__snapshots__/PromExploreQueryEditor.test.tsx.snap index 24118aab03..1705acd065 100644 --- a/public/app/plugins/datasource/prometheus/components/__snapshots__/PromExploreQueryEditor.test.tsx.snap +++ b/public/app/plugins/datasource/prometheus/components/__snapshots__/PromExploreQueryEditor.test.tsx.snap @@ -29,7 +29,7 @@ exports[`PromExploreQueryEditor should render component 1`] = ` data={ Object { "request": Object { - "app": "Grafana", + "app": "Plutono", "dashboardId": 1, "interval": "1s", "intervalMs": 1000, diff --git a/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx index 93b77ceddb..b61d8aeb35 100644 --- a/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx +++ b/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { DataSourceHttpSettings } from '@grafana/ui'; -import { DataSourcePluginOptionsEditorProps } from '@grafana/data'; +import { DataSourceHttpSettings } from '@credativ/plutono-ui'; +import { DataSourcePluginOptionsEditorProps } from '@credativ/plutono-data'; import { PromSettings } from './PromSettings'; import { PromOptions } from '../types'; import { config } from 'app/core/config'; diff --git a/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx b/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx index 859b3749af..82bb124297 100644 --- a/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx +++ b/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx @@ -1,4 +1,4 @@ -import { Button, InlineField, InlineSwitch, Input } from '@grafana/ui'; +import { Button, InlineField, InlineSwitch, Input } from '@credativ/plutono-ui'; import { DataSourcePicker } from 'app/core/components/Select/DataSourcePicker'; import { css } from 'emotion'; import React, { useState } from 'react'; diff --git a/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx index 24c0466ad7..2a05e13ad3 100644 --- a/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx +++ b/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx @@ -1,4 +1,4 @@ -import { Button } from '@grafana/ui'; +import { Button } from '@credativ/plutono-ui'; import { css } from 'emotion'; import React from 'react'; import { ExemplarTraceIdDestination } from '../types'; diff --git a/public/app/plugins/datasource/prometheus/configuration/PromSettings.test.tsx b/public/app/plugins/datasource/prometheus/configuration/PromSettings.test.tsx index ae426979d3..223a703609 100644 --- a/public/app/plugins/datasource/prometheus/configuration/PromSettings.test.tsx +++ b/public/app/plugins/datasource/prometheus/configuration/PromSettings.test.tsx @@ -1,7 +1,7 @@ import React, { SyntheticEvent } from 'react'; import { render, screen } from '@testing-library/react'; -import { EventsWithValidation } from '@grafana/ui'; -import { SelectableValue } from '@grafana/data'; +import { EventsWithValidation } from '@credativ/plutono-ui'; +import { SelectableValue } from '@credativ/plutono-data'; import { getValueFromEventItem, promSettingsValidationEvents, PromSettings } from './PromSettings'; import { createDefaultConfigOptions } from './mocks'; diff --git a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx index 6a0386d636..6747b1d5fd 100644 --- a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx +++ b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx @@ -3,8 +3,8 @@ import { onUpdateDatasourceJsonDataOptionChecked, SelectableValue, updateDatasourcePluginJsonDataOption, -} from '@grafana/data'; -import { EventsWithValidation, InlineFormLabel, LegacyForms, regexValidation } from '@grafana/ui'; +} from '@credativ/plutono-data'; +import { EventsWithValidation, InlineFormLabel, LegacyForms, regexValidation } from '@credativ/plutono-ui'; import React, { SyntheticEvent } from 'react'; import { PromOptions } from '../types'; import { ExemplarsSettings } from './ExemplarsSettings'; diff --git a/public/app/plugins/datasource/prometheus/configuration/mocks.ts b/public/app/plugins/datasource/prometheus/configuration/mocks.ts index 76d9a61fa2..3a54bc5209 100644 --- a/public/app/plugins/datasource/prometheus/configuration/mocks.ts +++ b/public/app/plugins/datasource/prometheus/configuration/mocks.ts @@ -1,4 +1,4 @@ -import { DataSourceSettings } from '@grafana/data'; +import { DataSourceSettings } from '@credativ/plutono-data'; import { PromOptions } from '../types'; import { createDatasourceSettings } from '../../../../features/datasources/mocks'; diff --git a/public/app/plugins/datasource/prometheus/dashboards/grafana_stats.json b/public/app/plugins/datasource/prometheus/dashboards/plutono_stats.json similarity index 95% rename from public/app/plugins/datasource/prometheus/dashboards/grafana_stats.json rename to public/app/plugins/datasource/prometheus/dashboards/plutono_stats.json index 5dc8be2d4f..f53aa4da61 100644 --- a/public/app/plugins/datasource/prometheus/dashboards/grafana_stats.json +++ b/public/app/plugins/datasource/prometheus/dashboards/plutono_stats.json @@ -11,9 +11,9 @@ ], "__requires": [ { - "type": "grafana", - "id": "grafana", - "name": "Grafana", + "type": "plutono", + "id": "plutono", + "name": "Plutono", "version": "4.6.0" }, { @@ -52,9 +52,9 @@ }, "revision": "1.0", "version": 3, - "title": "Grafana metrics", - "tags": ["grafana", "prometheus"], - "description": "Metrics about Grafana", + "title": "Plutono metrics", + "tags": ["plutono", "prometheus"], + "description": "Metrics about Plutono", "editable": true, "gnetId": null, "graphTooltip": 0, @@ -72,7 +72,7 @@ "icon": "external link", "tags": [], "targetBlank": true, - "title": "Grafana docs", + "title": "Plutono docs", "type": "link", "url": "https://grafana.com/docs/grafana/latest/" }, @@ -144,7 +144,7 @@ "tableColumn": "", "targets": [ { - "expr": "up{job=\"grafana\"}", + "expr": "up{job=\"plutono\"}", "format": "time_series", "instant": true, "intervalFactor": 2, @@ -222,7 +222,7 @@ "tableColumn": "", "targets": [ { - "expr": "grafana_stat_totals_dashboard", + "expr": "plutono_stat_totals_dashboard", "format": "time_series", "instant": true, "intervalFactor": 2, @@ -300,7 +300,7 @@ "tableColumn": "", "targets": [ { - "expr": "grafana_stat_total_users", + "expr": "plutono_stat_total_users", "format": "time_series", "instant": true, "intervalFactor": 2, @@ -378,7 +378,7 @@ "tableColumn": "", "targets": [ { - "expr": "grafana_stat_total_playlists", + "expr": "plutono_stat_total_playlists", "format": "time_series", "instant": true, "intervalFactor": 2, @@ -441,7 +441,7 @@ ], "targets": [ { - "expr": "topk(1, grafana_info or grafana_build_info)", + "expr": "topk(1, plutono_info or plutono_build_info)", "format": "time_series", "instant": true, "intervalFactor": 2, @@ -450,7 +450,7 @@ "step": 20 } ], - "title": "Grafana version", + "title": "Plutono version", "transform": "timeseries_to_rows", "type": "table" }, @@ -500,13 +500,13 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (statuscode) (irate(http_request_total{job='grafana'}[5m]))", + "expr": "sum by (statuscode) (irate(http_request_total{job='plutono'}[5m]))", "format": "time_series", "intervalFactor": 3, "legendFormat": "{{statuscode}}", "refId": "B", "step": 15, - "target": "dev.grafana.cb-office.alerting.active_alerts" + "target": "dev.plutono.cb-office.alerting.active_alerts" } ], "thresholds": [], @@ -596,7 +596,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(irate(grafana_api_response_status_total[5m]))", + "expr": "sum(irate(plutono_api_response_status_total[5m]))", "format": "time_series", "intervalFactor": 4, "legendFormat": "api", @@ -604,7 +604,7 @@ "step": 20 }, { - "expr": "sum(irate(grafana_proxy_response_status_total[5m]))", + "expr": "sum(irate(plutono_proxy_response_status_total[5m]))", "format": "time_series", "intervalFactor": 4, "legendFormat": "proxy", @@ -612,7 +612,7 @@ "step": 20 }, { - "expr": "sum(irate(grafana_page_response_status_total[5m]))", + "expr": "sum(irate(plutono_page_response_status_total[5m]))", "format": "time_series", "intervalFactor": 4, "legendFormat": "web", @@ -704,7 +704,7 @@ ], "targets": [ { - "expr": "sort(topk(8, sum by (handler) (http_request_total{job=\"grafana\"})))", + "expr": "sort(topk(8, sum by (handler) (http_request_total{job=\"plutono\"})))", "format": "time_series", "instant": true, "intervalFactor": 10, @@ -762,7 +762,7 @@ "steppedLine": false, "targets": [ { - "expr": "increase(grafana_alerting_active_alerts[1m])", + "expr": "increase(plutono_alerting_active_alerts[1m])", "format": "time_series", "intervalFactor": 3, "legendFormat": "{{state}}", @@ -774,7 +774,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Grafana active alerts", + "title": "Plutono active alerts", "tooltip": { "shared": true, "sort": 0, @@ -918,7 +918,7 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", - "description": "Aggregated over all Grafana nodes.", + "description": "Aggregated over all Plutono nodes.", "fill": 1, "fillGradient": 0, "gridPos": { @@ -976,7 +976,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(go_goroutines{job=\"grafana\"})", + "expr": "sum(go_goroutines{job=\"plutono\"})", "format": "time_series", "hide": false, "intervalFactor": 4, @@ -987,7 +987,7 @@ "type": "timeserie" }, { - "expr": "sum(process_resident_memory_bytes{job=\"grafana\"})", + "expr": "sum(process_resident_memory_bytes{job=\"plutono\"})", "format": "time_series", "intervalFactor": 4, "legendFormat": "memory usage", @@ -999,7 +999,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Grafana performance", + "title": "Plutono performance", "tooltip": { "shared": true, "sort": 0, diff --git a/public/app/plugins/datasource/prometheus/dashboards/prometheus_2_stats.json b/public/app/plugins/datasource/prometheus/dashboards/prometheus_2_stats.json index 746f37a627..1416da1308 100644 --- a/public/app/plugins/datasource/prometheus/dashboards/prometheus_2_stats.json +++ b/public/app/plugins/datasource/prometheus/dashboards/prometheus_2_stats.json @@ -19,7 +19,7 @@ "icon": "info", "tags": [], "targetBlank": true, - "title": "Grafana Docs", + "title": "Plutono Docs", "tooltip": "", "type": "link", "url": "https://grafana.com/docs/grafana/latest/" diff --git a/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json b/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json index 14824fedfd..308810bee1 100644 --- a/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json +++ b/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json @@ -243,7 +243,7 @@ "valueName": "current" }, { - "content": "Prometheus\n\n

    You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the Grafana and Prometheus projects.

    ", + "content": "Prometheus\n\n

    You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the Plutono and Prometheus projects.

    ", "datasource": null, "editable": true, "error": false, @@ -739,7 +739,7 @@ "icon": "info", "tags": [], "targetBlank": true, - "title": "Grafana Docs", + "title": "Plutono Docs", "tooltip": "", "type": "link", "url": "https://grafana.com/docs/grafana/latest/" diff --git a/public/app/plugins/datasource/prometheus/datasource.test.ts b/public/app/plugins/datasource/prometheus/datasource.test.ts index 55e5afc36c..2e9791f7d4 100644 --- a/public/app/plugins/datasource/prometheus/datasource.test.ts +++ b/public/app/plugins/datasource/prometheus/datasource.test.ts @@ -9,7 +9,7 @@ import { getFieldDisplayName, LoadingState, toDataFrame, -} from '@grafana/data'; +} from '@credativ/plutono-data'; import { alignRange, @@ -26,9 +26,9 @@ import { QueryOptions } from 'app/types'; const fetchMock = jest.fn().mockReturnValue(of(createDefaultPromResponse())); jest.mock('./metric_find_query'); -jest.mock('@grafana/runtime', () => ({ +jest.mock('@credativ/plutono-runtime', () => ({ // @ts-ignore - ...jest.requireActual('@grafana/runtime'), + ...jest.requireActual('@credativ/plutono-runtime'), getBackendSrv: () => ({ fetch: fetchMock, }), diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts index e351c483f4..eab2d1d99a 100644 --- a/public/app/plugins/datasource/prometheus/datasource.ts +++ b/public/app/plugins/datasource/prometheus/datasource.ts @@ -12,8 +12,8 @@ import { rangeUtil, ScopedVars, TimeRange, -} from '@grafana/data'; -import { BackendSrvRequest, FetchError, getBackendSrv } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { BackendSrvRequest, FetchError, getBackendSrv } from '@credativ/plutono-runtime'; import { safeStringifyValue } from 'app/core/utils/explore'; import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv'; diff --git a/public/app/plugins/datasource/prometheus/language_provider.test.ts b/public/app/plugins/datasource/prometheus/language_provider.test.ts index 6109e2ed23..e6c944c31a 100644 --- a/public/app/plugins/datasource/prometheus/language_provider.test.ts +++ b/public/app/plugins/datasource/prometheus/language_provider.test.ts @@ -2,7 +2,7 @@ import Plain from 'slate-plain-serializer'; import { Editor as SlateEditor } from 'slate'; import LanguageProvider from './language_provider'; import { PrometheusDatasource } from './datasource'; -import { HistoryItem } from '@grafana/data'; +import { HistoryItem } from '@credativ/plutono-data'; import { PromQuery } from './types'; import Mock = jest.Mock; diff --git a/public/app/plugins/datasource/prometheus/language_provider.ts b/public/app/plugins/datasource/prometheus/language_provider.ts index d28182d7a0..8b5d771436 100644 --- a/public/app/plugins/datasource/prometheus/language_provider.ts +++ b/public/app/plugins/datasource/prometheus/language_provider.ts @@ -2,8 +2,8 @@ import _ from 'lodash'; import LRU from 'lru-cache'; import { Value } from 'slate'; -import { dateTime, HistoryItem, LanguageProvider } from '@grafana/data'; -import { CompletionItem, CompletionItemGroup, TypeaheadInput, TypeaheadOutput } from '@grafana/ui'; +import { dateTime, HistoryItem, LanguageProvider } from '@credativ/plutono-data'; +import { CompletionItem, CompletionItemGroup, TypeaheadInput, TypeaheadOutput } from '@credativ/plutono-ui'; import { fixSummariesMetadata, diff --git a/public/app/plugins/datasource/prometheus/metric_find_query.test.ts b/public/app/plugins/datasource/prometheus/metric_find_query.test.ts index 80fe8e8f6d..9b77011d37 100644 --- a/public/app/plugins/datasource/prometheus/metric_find_query.test.ts +++ b/public/app/plugins/datasource/prometheus/metric_find_query.test.ts @@ -1,15 +1,15 @@ import 'whatwg-fetch'; // fetch polyfill needed backendSrv import { of } from 'rxjs'; -import { DataSourceInstanceSettings, toUtc } from '@grafana/data'; +import { DataSourceInstanceSettings, toUtc } from '@credativ/plutono-data'; import { PrometheusDatasource } from './datasource'; import PrometheusMetricFindQuery from './metric_find_query'; import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__ import { PromOptions } from './types'; -import { FetchResponse } from '@grafana/runtime'; +import { FetchResponse } from '@credativ/plutono-runtime'; -jest.mock('@grafana/runtime', () => ({ - ...((jest.requireActual('@grafana/runtime') as unknown) as object), +jest.mock('@credativ/plutono-runtime', () => ({ + ...((jest.requireActual('@credativ/plutono-runtime') as unknown) as object), getBackendSrv: () => backendSrv, })); diff --git a/public/app/plugins/datasource/prometheus/metric_find_query.ts b/public/app/plugins/datasource/prometheus/metric_find_query.ts index f7b86f2ff7..d40f59f71f 100644 --- a/public/app/plugins/datasource/prometheus/metric_find_query.ts +++ b/public/app/plugins/datasource/prometheus/metric_find_query.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import { map } from 'rxjs/operators'; -import { MetricFindValue, TimeRange } from '@grafana/data'; +import { MetricFindValue, TimeRange } from '@credativ/plutono-data'; import { PrometheusDatasource } from './datasource'; import { PromQueryRequest } from './types'; import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv'; diff --git a/public/app/plugins/datasource/prometheus/module.ts b/public/app/plugins/datasource/prometheus/module.ts index 60d48c0b7d..5b419b2094 100644 --- a/public/app/plugins/datasource/prometheus/module.ts +++ b/public/app/plugins/datasource/prometheus/module.ts @@ -1,4 +1,4 @@ -import { DataSourcePlugin } from '@grafana/data'; +import { DataSourcePlugin } from '@credativ/plutono-data'; import { ANNOTATION_QUERY_STEP_DEFAULT, PrometheusDatasource } from './datasource'; import { PromQueryEditor } from './components/PromQueryEditor'; diff --git a/public/app/plugins/datasource/prometheus/plugin.json b/public/app/plugins/datasource/prometheus/plugin.json index 99c81484f9..fc597dda51 100644 --- a/public/app/plugins/datasource/prometheus/plugin.json +++ b/public/app/plugins/datasource/prometheus/plugin.json @@ -17,8 +17,8 @@ }, { "type": "dashboard", - "name": "Grafana Stats", - "path": "dashboards/grafana_stats.json" + "name": "Plutono Stats", + "path": "dashboards/plutono_stats.json" } ], "metrics": true, diff --git a/public/app/plugins/datasource/prometheus/promql.ts b/public/app/plugins/datasource/prometheus/promql.ts index 96cab5fed6..599e665dc5 100644 --- a/public/app/plugins/datasource/prometheus/promql.ts +++ b/public/app/plugins/datasource/prometheus/promql.ts @@ -1,5 +1,5 @@ import { Grammar } from 'prismjs'; -import { CompletionItem } from '@grafana/ui'; +import { CompletionItem } from '@credativ/plutono-ui'; export const RATE_RANGES: CompletionItem[] = [ { label: '$__interval', sortText: '$__interval' }, diff --git a/public/app/plugins/datasource/prometheus/query_hints.ts b/public/app/plugins/datasource/prometheus/query_hints.ts index 52f4867c7a..c94d575fd8 100644 --- a/public/app/plugins/datasource/prometheus/query_hints.ts +++ b/public/app/plugins/datasource/prometheus/query_hints.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { QueryHint, QueryFix } from '@grafana/data'; +import { QueryHint, QueryFix } from '@credativ/plutono-data'; import { PrometheusDatasource } from './datasource'; /** diff --git a/public/app/plugins/datasource/prometheus/result_transformer.test.ts b/public/app/plugins/datasource/prometheus/result_transformer.test.ts index 1e47b246fc..0f4567628f 100644 --- a/public/app/plugins/datasource/prometheus/result_transformer.test.ts +++ b/public/app/plugins/datasource/prometheus/result_transformer.test.ts @@ -1,7 +1,7 @@ -import { DataFrame, FieldType } from '@grafana/data'; +import { DataFrame, FieldType } from '@credativ/plutono-data'; import { transform } from './result_transformer'; -jest.mock('@grafana/runtime', () => ({ +jest.mock('@credativ/plutono-runtime', () => ({ getTemplateSrv: () => ({ replace: (str: string) => str, }), diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts index 4b67e09ce0..834e4d383d 100644 --- a/public/app/plugins/datasource/prometheus/result_transformer.ts +++ b/public/app/plugins/datasource/prometheus/result_transformer.ts @@ -13,8 +13,8 @@ import { ScopedVars, TIME_SERIES_TIME_FIELD_NAME, TIME_SERIES_VALUE_FIELD_NAME, -} from '@grafana/data'; -import { FetchResponse, getDataSourceSrv, getTemplateSrv } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { FetchResponse, getDataSourceSrv, getTemplateSrv } from '@credativ/plutono-runtime'; import { descending, deviation } from 'd3'; import { ExemplarTraceIdDestination, diff --git a/public/app/plugins/datasource/prometheus/types.ts b/public/app/plugins/datasource/prometheus/types.ts index cdf857d0b8..ccbeeac215 100644 --- a/public/app/plugins/datasource/prometheus/types.ts +++ b/public/app/plugins/datasource/prometheus/types.ts @@ -1,5 +1,5 @@ -import { DataQuery, DataSourceJsonData, QueryResultMeta, ScopedVars } from '@grafana/data'; -import { FetchError } from '@grafana/runtime'; +import { DataQuery, DataSourceJsonData, QueryResultMeta, ScopedVars } from '@credativ/plutono-data'; +import { FetchError } from '@credativ/plutono-runtime'; export interface PromQuery extends DataQuery { expr: string; diff --git a/public/app/plugins/datasource/prometheus/variables.ts b/public/app/plugins/datasource/prometheus/variables.ts index 27954f553e..155e312c53 100644 --- a/public/app/plugins/datasource/prometheus/variables.ts +++ b/public/app/plugins/datasource/prometheus/variables.ts @@ -6,8 +6,8 @@ import { rangeUtil, StandardVariableQuery, StandardVariableSupport, -} from '@grafana/data'; -import { getTemplateSrv, TemplateSrv } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { getTemplateSrv, TemplateSrv } from '@credativ/plutono-runtime'; import { PrometheusDatasource } from './datasource'; import { PromQuery } from './types'; diff --git a/public/app/plugins/datasource/tempo/ConfigEditor.tsx b/public/app/plugins/datasource/tempo/ConfigEditor.tsx index 31c0a99ecf..af22bc1e3a 100644 --- a/public/app/plugins/datasource/tempo/ConfigEditor.tsx +++ b/public/app/plugins/datasource/tempo/ConfigEditor.tsx @@ -1,5 +1,5 @@ -import { DataSourcePluginOptionsEditorProps } from '@grafana/data'; -import { DataSourceHttpSettings } from '@grafana/ui'; +import { DataSourcePluginOptionsEditorProps } from '@credativ/plutono-data'; +import { DataSourceHttpSettings } from '@credativ/plutono-ui'; import { TraceToLogsSettings } from 'app/core/components/TraceToLogsSettings'; import React from 'react'; diff --git a/public/app/plugins/datasource/tempo/QueryField.tsx b/public/app/plugins/datasource/tempo/QueryField.tsx index 57b27d6fdd..798a5a6757 100644 --- a/public/app/plugins/datasource/tempo/QueryField.tsx +++ b/public/app/plugins/datasource/tempo/QueryField.tsx @@ -1,6 +1,6 @@ -import { ExploreQueryFieldProps } from '@grafana/data'; -import { selectors } from '@grafana/e2e-selectors'; -import { LegacyForms } from '@grafana/ui'; +import { ExploreQueryFieldProps } from '@credativ/plutono-data'; +import { selectors } from '@credativ/plutono-e2e-selectors'; +import { LegacyForms } from '@credativ/plutono-ui'; import React from 'react'; import { TempoDatasource, TempoQuery } from './datasource'; diff --git a/public/app/plugins/datasource/tempo/datasource.test.ts b/public/app/plugins/datasource/tempo/datasource.test.ts index e23f2632f9..2a893b6862 100644 --- a/public/app/plugins/datasource/tempo/datasource.test.ts +++ b/public/app/plugins/datasource/tempo/datasource.test.ts @@ -1,14 +1,14 @@ -import { DataSourceInstanceSettings, FieldType, MutableDataFrame, PluginType } from '@grafana/data'; +import { DataSourceInstanceSettings, FieldType, MutableDataFrame, PluginType } from '@credativ/plutono-data'; import { backendSrv } from 'app/core/services/backend_srv'; import { of } from 'rxjs'; import { createFetchResponse } from 'test/helpers/createFetchResponse'; import { TempoDatasource } from './datasource'; -jest.mock('../../../../../packages/grafana-runtime/src/services/backendSrv.ts', () => ({ +jest.mock('../../../../../packages/plutono-runtime/src/services/backendSrv.ts', () => ({ getBackendSrv: () => backendSrv, })); -jest.mock('../../../../../packages/grafana-runtime/src/utils/queryResponse.ts', () => ({ +jest.mock('../../../../../packages/plutono-runtime/src/utils/queryResponse.ts', () => ({ toDataQueryResponse: (resp: any) => resp, })); diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts index 823542eb6a..00ae5280f4 100644 --- a/public/app/plugins/datasource/tempo/datasource.ts +++ b/public/app/plugins/datasource/tempo/datasource.ts @@ -6,8 +6,8 @@ import { DataSourceInstanceSettings, FieldType, MutableDataFrame, -} from '@grafana/data'; -import { DataSourceWithBackend } from '@grafana/runtime'; +} from '@credativ/plutono-data'; +import { DataSourceWithBackend } from '@credativ/plutono-runtime'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/public/app/plugins/datasource/tempo/module.ts b/public/app/plugins/datasource/tempo/module.ts index f8356dc424..28c8fa8e19 100644 --- a/public/app/plugins/datasource/tempo/module.ts +++ b/public/app/plugins/datasource/tempo/module.ts @@ -1,4 +1,4 @@ -import { DataSourcePlugin } from '@grafana/data'; +import { DataSourcePlugin } from '@credativ/plutono-data'; import { TempoDatasource } from './datasource'; import { TempoQueryField } from './QueryField'; import { ConfigEditor } from './ConfigEditor'; diff --git a/public/app/plugins/datasource/testdata/ConfigEditor.tsx b/public/app/plugins/datasource/testdata/ConfigEditor.tsx index 9cc333215b..c700874af7 100644 --- a/public/app/plugins/datasource/testdata/ConfigEditor.tsx +++ b/public/app/plugins/datasource/testdata/ConfigEditor.tsx @@ -1,7 +1,7 @@ // Libraries import React, { PureComponent } from 'react'; -import { DataSourcePluginOptionsEditorProps } from '@grafana/data'; +import { DataSourcePluginOptionsEditorProps } from '@credativ/plutono-data'; type Props = DataSourcePluginOptionsEditorProps; diff --git a/public/app/plugins/datasource/testdata/LogIpsum.ts b/public/app/plugins/datasource/testdata/LogIpsum.ts index a1afe7023f..b358c9fae2 100644 --- a/public/app/plugins/datasource/testdata/LogIpsum.ts +++ b/public/app/plugins/datasource/testdata/LogIpsum.ts @@ -1,4 +1,4 @@ -import { LogLevel } from '@grafana/data'; +import { LogLevel } from '@credativ/plutono-data'; let index = 0; diff --git a/public/app/plugins/datasource/testdata/QueryEditor.test.tsx b/public/app/plugins/datasource/testdata/QueryEditor.test.tsx index 84e2dd4077..272a37dc16 100644 --- a/public/app/plugins/datasource/testdata/QueryEditor.test.tsx +++ b/public/app/plugins/datasource/testdata/QueryEditor.test.tsx @@ -54,14 +54,14 @@ describe('Test Datasource Query Editor', () => { expect(screen.getByRole('textbox', { name: /string input/i })).toHaveValue('1,20,90,30,5,0'); await fireEvent.keyDown(select, { keyCode: 40 }); - await userEvent.click(screen.getByText('Grafana API')); + await userEvent.click(screen.getByText('Plutono API')); expect(mockOnChange).toHaveBeenCalledWith( - expect.objectContaining({ scenarioId: 'grafana_api', stringInput: 'datasources' }) + expect.objectContaining({ scenarioId: 'plutono_api', stringInput: 'datasources' }) ); rerender( - + ); - expect(await screen.findByText('Grafana API')).toBeInTheDocument(); + expect(await screen.findByText('Plutono API')).toBeInTheDocument(); expect(screen.getByText('Data Sources')).toBeInTheDocument(); await fireEvent.keyDown(select, { keyCode: 40 }); diff --git a/public/app/plugins/datasource/testdata/QueryEditor.tsx b/public/app/plugins/datasource/testdata/QueryEditor.tsx index f0ef67aa79..7d2ff11f30 100644 --- a/public/app/plugins/datasource/testdata/QueryEditor.tsx +++ b/public/app/plugins/datasource/testdata/QueryEditor.tsx @@ -3,9 +3,9 @@ import React, { ChangeEvent, FormEvent, useMemo } from 'react'; import { useAsync } from 'react-use'; // Components -import { selectors as editorSelectors } from '@grafana/e2e-selectors'; -import { Input, InlineFieldRow, InlineField, Select, TextArea, InlineSwitch } from '@grafana/ui'; -import { QueryEditorProps, SelectableValue } from '@grafana/data'; +import { selectors as editorSelectors } from '@credativ/plutono-e2e-selectors'; +import { Input, InlineFieldRow, InlineField, Select, TextArea, InlineSwitch } from '@credativ/plutono-ui'; +import { QueryEditorProps, SelectableValue } from '@credativ/plutono-data'; import { StreamingClientEditor, ManualEntryEditor, RandomWalkEditor } from './components'; // Types @@ -14,7 +14,7 @@ import { TestDataQuery, Scenario, NodesQuery } from './types'; import { PredictablePulseEditor } from './components/PredictablePulseEditor'; import { CSVWaveEditor } from './components/CSVWaveEditor'; import { defaultQuery } from './constants'; -import { GrafanaLiveEditor } from './components/GrafanaLiveEditor'; +import { PlutonoLiveEditor } from './components/PlutonoLiveEditor'; import { NodeGraphEditor } from './components/NodeGraphEditor'; const showLabelsFor = ['random_walk', 'predictable_pulse', 'predictable_csv_wave']; @@ -64,7 +64,7 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props) update.stringInput = scenario.stringInput; } - if (scenario.id === 'grafana_api') { + if (scenario.id === 'plutono_api') { update.stringInput = 'datasources'; } else if (scenario.id === 'streaming_client') { update.stringInput = ''; @@ -191,7 +191,7 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props) {scenarioId === 'manual_entry' && } {scenarioId === 'random_walk' && } {scenarioId === 'streaming_client' && } - {scenarioId === 'live' && } + {scenarioId === 'live' && } {scenarioId === 'logs' && ( @@ -210,7 +210,7 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props) )} - {scenarioId === 'grafana_api' && ( + {scenarioId === 'plutono_api' && (
    		HELLO GRAFANAHELLO PLUTONO
    @@ -352,7 +352,7 @@

    - Sent by Grafana v{{.BuildVersion}} + Sent by Plutono v{{.BuildVersion}}
    © 2021 Grafana Labs

    diff --git a/public/emails/alert_notification_example.html b/public/emails/alert_notification_example.html index 3843f90f83..8872194d43 100644 --- a/public/emails/alert_notification_example.html +++ b/public/emails/alert_notification_example.html @@ -191,7 +191,7 @@
    - +
    @@ -218,7 +218,7 @@
    - +
    -

    [CRITICAL] Imaginary timeseries alert

    +

    [CRITICAL] Imaginary timeseries alert
    @@ -287,7 +287,7 @@

    - + @@ -340,8 +340,8 @@

    - Sent by Grafana v{{.BuildVersion}} -
    © 2016 Grafana and raintank + Sent by Plutono v{{.BuildVersion}} +
    © 2016 Plutono and raintank

    diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html index d2e7fa78e7..464870fc78 100644 --- a/public/emails/invited_to_org.html +++ b/public/emails/invited_to_org.html @@ -183,7 +183,7 @@ @@ -231,7 +231,7 @@

    @@ -265,7 +265,7 @@

    - Sent by Grafana v{{.BuildVersion}} + Sent by Plutono v{{.BuildVersion}}
    © 2021 Grafana Labs

    diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html index 4bbb35c97e..4d9f8e6c14 100644 --- a/public/emails/new_user_invite.html +++ b/public/emails/new_user_invite.html @@ -183,7 +183,7 @@

    - +
    -

    {{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana. +

    {{.InvitedBy}} has added you to the {{.OrgName}} organization in Plutono.

    Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.
    @@ -206,7 +206,7 @@
    - +
    -{{Subject .Subject "{{.InvitedBy}} has invited you to join Grafana"}} +{{Subject .Subject "{{.InvitedBy}} has invited you to join Plutono"}} @@ -266,7 +266,7 @@

    - Sent by Grafana v{{.BuildVersion}} + Sent by Plutono v{{.BuildVersion}}
    © 2021 Grafana Labs

    diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index 58f92a246a..72b649ff78 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -183,7 +183,7 @@

    @@ -204,7 +204,7 @@
    - +
    - {{Subject .Subject "Reset your Grafana password - {{.Name}}"}} + {{Subject .Subject "Reset your Plutono password - {{.Name}}"}} @@ -260,7 +260,7 @@

    - Sent by Grafana v{{.BuildVersion}} + Sent by Plutono v{{.BuildVersion}}
    © 2021 Grafana Labs

    diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html index 394e10df9b..6d3d8218c8 100644 --- a/public/emails/signup_started.html +++ b/public/emails/signup_started.html @@ -183,7 +183,7 @@

    @@ -204,7 +204,7 @@
    - +
    - {{Subject .Subject "Welcome to Grafana, please complete your sign up!"}} + {{Subject .Subject "Welcome to Plutono, please complete your sign up!"}} @@ -264,7 +264,7 @@

    - Sent by Grafana v{{.BuildVersion}} + Sent by Plutono v{{.BuildVersion}}
    © 2021 Grafana Labs

    diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html index e9e63b6fd8..f38618652f 100644 --- a/public/emails/welcome_on_signup.html +++ b/public/emails/welcome_on_signup.html @@ -183,7 +183,7 @@

    @@ -204,7 +204,7 @@
    - +
    - {{Subject .Subject "Welcome to Grafana"}} + {{Subject .Subject "Welcome to Plutono"}} @@ -235,7 +235,7 @@

    @@ -244,7 +244,7 @@

    Thank you for joining our community.
    -

    The Grafana Team

    +

    The Plutono Team

    - If you are new to Grafana please read the Getting Started guide. + If you are new to Plutono please read the Getting Started guide.

    @@ -267,7 +267,7 @@

    - Sent by Grafana v{{.BuildVersion}} + Sent by Plutono v{{.BuildVersion}}
    © 2021 Grafana Labs

    diff --git a/public/fonts/grafana-icons.eot b/public/fonts/plutono-icons.eot similarity index 100% rename from public/fonts/grafana-icons.eot rename to public/fonts/plutono-icons.eot diff --git a/public/fonts/grafana-icons.svg b/public/fonts/plutono-icons.svg similarity index 99% rename from public/fonts/grafana-icons.svg rename to public/fonts/plutono-icons.svg index e8cbc10d72..84a0644658 100644 --- a/public/fonts/grafana-icons.svg +++ b/public/fonts/plutono-icons.svg @@ -3,7 +3,7 @@ Generated by IcoMoon - + @@ -43,15 +43,15 @@ - + - + - + diff --git a/public/fonts/grafana-icons.ttf b/public/fonts/plutono-icons.ttf similarity index 100% rename from public/fonts/grafana-icons.ttf rename to public/fonts/plutono-icons.ttf diff --git a/public/fonts/grafana-icons.woff b/public/fonts/plutono-icons.woff similarity index 100% rename from public/fonts/grafana-icons.woff rename to public/fonts/plutono-icons.woff diff --git a/public/img/grafana_com_auth_icon.svg b/public/img/plutono_com_auth_icon.svg similarity index 100% rename from public/img/grafana_com_auth_icon.svg rename to public/img/plutono_com_auth_icon.svg diff --git a/public/img/grafana_icon.svg b/public/img/plutono_icon.svg similarity index 98% rename from public/img/grafana_icon.svg rename to public/img/plutono_icon.svg index 989f71165e..de38d82e5c 100644 --- a/public/img/grafana_icon.svg +++ b/public/img/plutono_icon.svg @@ -11,7 +11,7 @@ viewBox="0 0 351 365" style="enable-background:new 0 0 351 365;" xml:space="preserve" - sodipodi:docname="grafana_icon.svg" + sodipodi:docname="plutono_icon.svg" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" diff --git a/public/img/grafana_mask_icon.svg b/public/img/plutono_mask_icon.svg similarity index 95% rename from public/img/grafana_mask_icon.svg rename to public/img/plutono_mask_icon.svg index a55feefcbd..401a1b6809 100644 --- a/public/img/grafana_mask_icon.svg +++ b/public/img/plutono_mask_icon.svg @@ -5,7 +5,7 @@ viewBox="0 0 16 16" version="1.1" id="svg11" - sodipodi:docname="grafana_mask_icon.svg" + sodipodi:docname="plutono_mask_icon.svg" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -32,7 +32,7 @@ inkscape:current-layer="svg11" /> grafana_mask_icon + id="title2">plutono_mask_icon Created with Sketch. grafana_mask_icon + id="title235">plutono_mask_icon Created with Sketch. - grafana_mask_icon + plutono_mask_icon diff --git a/public/sass/_grafana.scss b/public/sass/_plutono.scss similarity index 97% rename from public/sass/_grafana.scss rename to public/sass/_plutono.scss index 392310d631..4990f656f2 100644 --- a/public/sass/_grafana.scss +++ b/public/sass/_plutono.scss @@ -91,8 +91,8 @@ @import 'components/popover-box'; @import 'components/panel_header'; -// LOAD @grafana/ui components -@import '../../packages/grafana-ui/src/index'; +// LOAD @credativ/plutono-ui components +@import '../../packages/plutono-ui/src/index'; // PAGES @import 'pages/login'; diff --git a/public/sass/_variables.dark.generated.scss b/public/sass/_variables.dark.generated.scss index 63afd6fddf..64e19763b3 100644 --- a/public/sass/_variables.dark.generated.scss +++ b/public/sass/_variables.dark.generated.scss @@ -2,8 +2,8 @@ * !!! THIS FILE WAS GENERATED AUTOMATICALLY !!! * * Do not modify this file! - * - Edit grafana-ui/src/themes/dark.ts to regenerate - * - Edit grafana-ui/src/themes/_variables.dark.scss.tmpl.ts to update template + * - Edit plutono-ui/src/themes/dark.ts to regenerate + * - Edit plutono-ui/src/themes/_variables.dark.scss.tmpl.ts to update template * * !!! THIS FILE WAS GENERATED AUTOMATICALLY !!! */ diff --git a/public/sass/_variables.generated.scss b/public/sass/_variables.generated.scss index 1a8117341b..f97ff4933e 100644 --- a/public/sass/_variables.generated.scss +++ b/public/sass/_variables.generated.scss @@ -2,8 +2,8 @@ * !!! THIS FILE WAS GENERATED AUTOMATICALLY !!! * * Do not modify this file! - * - Edit grafana-ui/src/themes/default.ts to regenerate - * - Edit grafana-ui/src/themes/_variables.scss.tmpl.ts to update template + * - Edit plutono-ui/src/themes/default.ts to regenerate + * - Edit plutono-ui/src/themes/_variables.scss.tmpl.ts to update template * * !!! THIS FILE WAS GENERATED AUTOMATICALLY !!! */ @@ -221,7 +221,7 @@ $external-services: ( borderColor: #2f2f2f, icon: '', ), - grafanacom: ( + plutonocom: ( bgColor: #262628, borderColor: #393939, icon: '', diff --git a/public/sass/_variables.light.generated.scss b/public/sass/_variables.light.generated.scss index 9eaf954bea..2ea938bafc 100644 --- a/public/sass/_variables.light.generated.scss +++ b/public/sass/_variables.light.generated.scss @@ -2,8 +2,8 @@ * !!! THIS FILE WAS GENERATED AUTOMATICALLY !!! * * Do not modify this file! - * - Edit grafana-ui/src/themes/light.ts to regenerate - * - Edit grafana-ui/src/themes/_variable.light.scss.tmpl.ts to update template + * - Edit plutono-ui/src/themes/light.ts to regenerate + * - Edit plutono-ui/src/themes/_variable.light.scss.tmpl.ts to update template * * !!! THIS FILE WAS GENERATED AUTOMATICALLY !!! */ diff --git a/public/sass/base/_fonts.scss b/public/sass/base/_fonts.scss index 020e317a68..8dde1a26bf 100644 --- a/public/sass/base/_fonts.scss +++ b/public/sass/base/_fonts.scss @@ -1,5 +1,5 @@ @import 'font_awesome'; -@import 'grafana_icons'; +@import 'plutono_icons'; /* cyrillic-ext */ @font-face { diff --git a/public/sass/base/_icons.scss b/public/sass/base/_icons.scss index ac1deda711..a76655f2bd 100644 --- a/public/sass/base/_icons.scss +++ b/public/sass/base/_icons.scss @@ -100,7 +100,7 @@ } .gicon-branding { - background-image: url('../img/grafana_icon.svg'); + background-image: url('../img/plutono_icon.svg'); } .gicon-cog { diff --git a/public/sass/base/_grafana_icons.scss b/public/sass/base/_plutono_icons.scss similarity index 84% rename from public/sass/base/_grafana_icons.scss rename to public/sass/base/_plutono_icons.scss index 40fc44da40..4581c2a600 100644 --- a/public/sass/base/_grafana_icons.scss +++ b/public/sass/base/_plutono_icons.scss @@ -1,17 +1,17 @@ @font-face { - font-family: 'grafana-icons'; - src: url('../fonts/grafana-icons.eot?okx5td'); - src: url('../fonts/grafana-icons.eot?okx5td#iefix') format('embedded-opentype'), - url('../fonts/grafana-icons.ttf?okx5td') format('truetype'), - url('../fonts/grafana-icons.woff?okx5td') format('woff'), - url('../fonts/grafana-icons.svg?okx5td#grafana-icons') format('svg'); + font-family: 'plutono-icons'; + src: url('../fonts/plutono-icons.eot?okx5td'); + src: url('../fonts/plutono-icons.eot?okx5td#iefix') format('embedded-opentype'), + url('../fonts/plutono-icons.ttf?okx5td') format('truetype'), + url('../fonts/plutono-icons.woff?okx5td') format('woff'), + url('../fonts/plutono-icons.svg?okx5td#plutono-icons') format('svg'); font-weight: normal; font-style: normal; } .icon-gf { /* use !important to prevent issues with browser extensions that change fonts */ - font-family: 'grafana-icons' !important; + font-family: 'plutono-icons' !important; speak: none; font-style: normal; font-weight: normal; @@ -126,10 +126,10 @@ .icon-gf-snapshot:before { content: '\e61e'; } -.icon-gf-play-grafana-icon:before { +.icon-gf-play-plutono-icon:before { content: '\e629'; } -.icon-gf-grafana-icon:before { +.icon-gf-plutono-icon:before { content: '\e625'; } .icon-gf-email:before { diff --git a/public/sass/components/_buttons.scss b/public/sass/components/_buttons.scss index 9856e103c5..d253313864 100644 --- a/public/sass/components/_buttons.scss +++ b/public/sass/components/_buttons.scss @@ -207,9 +207,9 @@ $btn-service-icon-width: 35px; } } -.btn-service--grafanacom { +.btn-service--plutonocom { .btn-service-icon { - background-image: url(../img/grafana_mask_icon_white.svg); + background-image: url(../img/plutono_mask_icon_white.svg); background-repeat: no-repeat; background-position: 50%; background-size: 60%; diff --git a/public/sass/components/_code_editor.scss b/public/sass/components/_code_editor.scss index 45b7ffdaf5..d6d366aa57 100644 --- a/public/sass/components/_code_editor.scss +++ b/public/sass/components/_code_editor.scss @@ -22,7 +22,7 @@ @include font-family-monospace(); font-size: $font-size-md; - // Ace editor adds , after grafana.css, so !important + // Ace editor adds @@ -27,7 +27,7 @@

    - Grafana / Server Error + Plutono / Server Error

    Sadly something went wrong
    @@ -49,7 +49,7 @@

    Error details

    [[end]]
    -

    Check the Grafana server logs for the detailed error message.

    +

    Check the Plutono server logs for the detailed error message.

    diff --git a/public/views/index-template.html b/public/views/index-template.html index e32f1a7727..92c55be7da 100644 --- a/public/views/index-template.html +++ b/public/views/index-template.html @@ -31,8 +31,8 @@ - - + +