diff --git a/pkgs/servers/monitoring/grafana/missing-hashes.json b/pkgs/by-name/gr/grafana/missing-hashes.json
similarity index 100%
rename from pkgs/servers/monitoring/grafana/missing-hashes.json
rename to pkgs/by-name/gr/grafana/missing-hashes.json
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/by-name/gr/grafana/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/grafana/default.nix
rename to pkgs/by-name/gr/grafana/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dacde93898d8..626f4a9110c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8150,7 +8150,6 @@ with pkgs;
   freshrss = callPackage ../servers/web-apps/freshrss { };
   freshrss-extensions = recurseIntoAttrs (callPackage ../servers/web-apps/freshrss/extensions { });
 
-  grafana = callPackage ../servers/monitoring/grafana { };
   grafanaPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/grafana/plugins { });
 
   inherit (callPackage ../servers/hbase { })