percona · matejkubinec · Jul 9, 2025 · Mar 17, 2025 · Mar 24, 2025 · Mar 24, 2025
@@ -79,7 +79,7 @@ enabled = true
 
 [plugins]
 # Enter a comma-separated list of plugin identifiers to identify plugins that are allowed to be loaded even if they lack a valid signature.
-allow_loading_unsigned_plugins = grafana-polystat-panel,pmm-app,pmm-check-panel-home,pmm-update,pmm-qan-app-panel,pmm-pt-summary-panel,pmm-pt-summary-datasource
+allow_loading_unsigned_plugins = pmm-app,pmm-check-panel-home,pmm-update,pmm-qan-app-panel,pmm-pt-summary-panel,pmm-pt-summary-datasource,pmm-compat-app
 
 [feature_toggles]
 # there are currently two ways to enable feature toggles in the `grafana.ini`.
@@ -111,6 +111,10 @@ angularDeprecationUI = false
 # Hide "Migrate to Grafana Cloud" option
 onPremToCloudMigrations = false
 
+[security]
+# Enable inclusion of grafana into an iframe
+allow_embedding = true
+
 #################################### Support Bundles #####################################
 [support_bundles]
 # Enable support bundle creation (default: true)

@@ -3,3 +3,6 @@ apiVersion: 1
 apps:
   - type: pmm-app
     uid: pmm-app
+# Don't enable by default until new navigation is ready
+#  - type: pmm-compat-app
+#    uid: pmm-compat-app
@@ -46,7 +46,7 @@ http {
 
     ## TODO https://jira.percona.com/browse/PMM-4670
     # CWE-693, CWE-16
-    add_header X-Frame-Options DENY;
+    add_header X-Frame-Options SAMEORIGIN;
     add_header X-Content-Type-Options nosniff;
     # TODO X-XSS-Protection useless for modern browsers which support CSP. We need to implement CSP instead.
     add_header X-XSS-Protection "1; mode=block";

@@ -50,14 +50,16 @@ install -d -p %{buildroot}%{_bindir}
 install -d -p %{buildroot}%{_sbindir}
 install -d -p %{buildroot}%{_datadir}/%{name}
 install -d -p %{buildroot}%{_datadir}/pmm-ui
+install -d -p %{buildroot}%{_datadir}/percona-dashboards/panels/pmm-compat-app
 install -p -m 0755 bin/pmm-managed %{buildroot}%{_sbindir}/pmm-managed
 install -p -m 0755 bin/pmm-encryption-rotation %{buildroot}%{_sbindir}/pmm-encryption-rotation
 install -p -m 0755 bin/pmm-managed-init %{buildroot}%{_sbindir}/pmm-managed-init
 install -p -m 0755 bin/pmm-managed-starlark %{buildroot}%{_sbindir}/pmm-managed-starlark
 
 cd src/github.com/percona/pmm
 cp -pa ./api/swagger %{buildroot}%{_datadir}/%{name}
-cp -pa ./ui/dist/. %{buildroot}%{_datadir}/pmm-ui
+cp -pa ./ui/apps/pmm/dist/. %{buildroot}%{_datadir}/pmm-ui
+cp -pa ./ui/apps/pmm-compat/dist/. %{buildroot}%{_datadir}/percona-dashboards/panels/pmm-compat-app
 
 %files
 %license src/%{provider}/LICENSE
@@ -68,8 +70,12 @@ cp -pa ./ui/dist/. %{buildroot}%{_datadir}/pmm-ui
 %{_sbindir}/pmm-managed-starlark
 %{_datadir}/%{name}
 %{_datadir}/pmm-ui
+%{_datadir}/percona-dashboards/panels/pmm-compat-app
 
 %changelog
+* Thu Apr 24 2024 Matej Kubinec <[email protected]> - 3.2.0-1
+- PMM-13722 add pmm compat plugin
+
 * Mon Sep 23 2024 Jiri Ctvrtka <[email protected]> - 3.0.0-1
 - PMM-13132 add PMM encryption rotation tool
 

@@ -1,26 +1,38 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
+# Dependencies
 node_modules
+.pnp
+.pnp.js
+
+# Local env files
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# Testing
+coverage
+
+# Turbo
+.turbo
+
+# Vercel
+.vercel
+
+# Build Outputs
+.next/
+out/
+build
 dist
-dist-ssr
-*.local
 
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
 
-testdata/*
+# Debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Misc
+.DS_Store
+*.pem
@@ -0,0 +1,7 @@
+{
+  "eslint.workingDirectories": [
+    {
+      "mode": "auto"
+    }
+  ]
+}
@@ -13,12 +13,12 @@ test: setup
 	yarn test
 
 setup:
-	yarn install --frozen-lockfile
+	yarn install
 
 build: setup
 	yarn build
 
 release: build
 
 clean:
-	rm -r dist
+	yarn clean
@@ -20,7 +20,8 @@ Make sure you have the following installed:
 
 This repo uses the following stack across its packages:
 
-- Yarn to manage packages (https://yarnpkg.com/)
+- Yarn (https://yarnpkg.com/)
+- Turborepo (https://turborepo.com/)
 - Typescript (https://www.typescriptlang.org/);
 - React (https://react.dev/);
 - Rollup to bundle the different common packages (https://rollupjs.org/);
@@ -44,3 +45,12 @@ make dev
 ```bash
 make build
 ```
+
+## Apps
+
+- **pmm** - main PMM UI application
+- **pmm-compat** - Grafana plugin that handles communication between Grafana and PMM UI
+
+## Packages
+
+- **shared** - common code between applications
@@ -0,0 +1,3 @@
+{
+  "version": "5.19.0"
+}
@@ -0,0 +1,31 @@
+/*
+ * ⚠️⚠️⚠️ THIS FILE WAS SCAFFOLDED BY `@grafana/create-plugin`. DO NOT EDIT THIS FILE DIRECTLY. ⚠️⚠️⚠️
+ *
+ * In order to extend the configuration follow the steps in
+ * https://grafana.com/developers/plugin-tools/get-started/set-up-development-environment#extend-the-eslint-config
+ */
+{
+  "extends": ["@grafana/eslint-config"],
+  "root": true,
+  "rules": {
+    "react/prop-types": "off"
+  },
+  "overrides": [
+    {
+      "plugins": ["deprecation"],
+      "files": ["src/**/*.{ts,tsx}"],
+      "rules": {
+        "deprecation/deprecation": "warn"
+      },
+      "parserOptions": {
+        "project": "./tsconfig.json"
+      }
+    },
+    {
+      "files": ["./tests/**/*"],
+      "rules": {
+        "react-hooks/rules-of-hooks": "off"
+      }
+    }
+  ]
+}
@@ -0,0 +1,16 @@
+/*
+ * ⚠️⚠️⚠️ THIS FILE WAS SCAFFOLDED BY `@grafana/create-plugin`. DO NOT EDIT THIS FILE DIRECTLY. ⚠️⚠️⚠️
+ *
+ * In order to extend the configuration follow the steps in .config/README.md
+ */
+
+module.exports = {
+  endOfLine: 'auto',
+  printWidth: 120,
+  trailingComma: 'es5',
+  semi: true,
+  jsxSingleQuote: false,
+  singleQuote: true,
+  useTabs: false,
+  tabWidth: 2,
+};
@@ -0,0 +1,54 @@
+ARG grafana_version=latest
+ARG grafana_image=oss
+
+FROM grafana/${grafana_image}:${grafana_version}
+
+ARG anonymous_auth_enabled=true
+ARG development=false
+ARG TARGETARCH
+
+
+ENV DEV="${development}"
+
+# Make it as simple as possible to access the grafana instance for development purposes
+# Do NOT enable these settings in a public facing / production grafana instance
+ENV GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+ENV GF_AUTH_ANONYMOUS_ENABLED="${anonymous_auth_enabled}"
+ENV GF_AUTH_BASIC_ENABLED=false
+# Set development mode so plugins can be loaded without the need to sign
+ENV GF_DEFAULT_APP_MODE=development
+
+
+LABEL maintainer="Grafana Labs <[email protected]>"
+
+ENV GF_PATHS_HOME="/usr/share/grafana"
+WORKDIR $GF_PATHS_HOME
+
+USER root
+
+# Installing supervisor and inotify-tools
+RUN if [ "${development}" = "true" ]; then \
+    if grep -i -q alpine /etc/issue; then \
+    apk add supervisor inotify-tools git; \
+    elif grep -i -q ubuntu /etc/issue; then \
+    DEBIAN_FRONTEND=noninteractive && \
+    apt-get update && \
+    apt-get install -y supervisor inotify-tools git && \
+    rm -rf /var/lib/apt/lists/*; \
+    else \
+    echo 'ERROR: Unsupported base image' && /bin/false; \
+    fi \
+    fi
+
+COPY supervisord/supervisord.conf /etc/supervisor.d/supervisord.ini
+COPY supervisord/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+
+
+# Inject livereload script into grafana index.html
+RUN sed -i 's|</body>|<script src="http://localhost:35729/livereload.js"></script></body>|g' /usr/share/grafana/public/views/index.html
+
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]