diff --git a/di/grafana/grafana.md b/di/grafana/grafana.md
new file mode 100644
index 00000000..ccf06823
--- /dev/null
+++ b/di/grafana/grafana.md
@@ -0,0 +1,147 @@
+# `grafana.q` – Grafana JSON datasource adaptor for kdb-x
+
+A library that lets a [Grafana](https://grafana.com/) server query a kdb+
+process directly, using the
+[SimPod JSON datasource](https://github.com/simPod/GrafanaJsonDatasource) API.
+
+Once initialised, the module installs HTTP handlers on the process so that
+requests carrying the `X-Grafana-Org-Id` header are intercepted and answered
+with Grafana-shaped JSON, while all other HTTP requests fall through to any
+existing handler. Point a SimPod JSON datasource at the process's HTTP port and
+its tables become available as Grafana panels.
+
+---
+
+## :sparkles: Features
+
+- Serves the `/search` endpoint – populates Grafana's metric dropdowns from the
+  tables in the process.
+- Serves the `/query` endpoint – returns either **timeseries** or **table**
+  panel data.
+- Answers the Grafana test-connection `GET` with a `200 OK`.
+- Wraps any pre-existing `.z.pp`/`.z.ph` handlers rather than overwriting them.
+- No connection to other modules required – loads standalone with an injected
+  logger.
+
+---
+
+## :inbox_tray: Import
+
+```q
+q)grafana:use`di.grafana
+```
+
+Only `init` is exported; everything else runs automatically via the installed
+HTTP handlers.
+
+---
+
+## :electric_plug: Dependencies
+
+| Dependency | Required | Description |
+|---|---|---|
+| `log` | yes | A dictionary of `` `info`warn`error `` logging functions, each with the `{[c;m]}` signature (context symbol; message string). |
+
+The logger is **mandatory** – `init` errors immediately if it is not supplied.
+A ready-made logger can be taken from `di.log`, or you can pass your own:
+
+```q
+/ custom logger
+mylog:`info`warn`error!(
+  {[c;m] -1 "INFO  [",string[c],"] ",m;};
+  {[c;m] -1 "WARN  [",string[c],"] ",m;};
+  {[c;m] -2 "ERROR [",string[c],"] ",m;});
+```
+
+---
+
+## :gear: Configuration
+
+Configuration is optional and passed to `init` under the `config` key. Any
+omitted value keeps its default.
+
+| Key | Type | Default | Description |
+|---|---|---|---|
+| `timecol` | symbol | `` `time `` | Name of the time column used for timeseries queries. |
+| `sym` | symbol | `` `sym `` | Name of the column used to split data by instrument. |
+| `timebackdate` | timespan | `2D` | How far back to look when finding distinct syms for the dropdowns. |
+| `ticks` | long | `1000` | Number of rows returned for a table request. |
+| `del` | char | `"."` | Delimiter separating the arguments within a query target. |
+
+---
+
+## :memo: Initialisation
+
+`init` takes a single dictionary of dependencies (and optional config), then
+installs the HTTP handlers. The handlers are installed only once, so `init` may
+be called again to update the logger or configuration without re-wrapping.
+
+```q
+/ logger only, defaults for everything else
+q)grafana.init[enlist[`log]!enlist mylog]
+
+/ logger plus configuration overrides
+q)grafana.init[`log`config!(mylog;`timecol`ticks!(`ts;500))]
+```
+
+---
+
+## :wrench: Exported functions
+
+### `init`
+
+```
+init[deps]
+```
+
+- `deps` – a dictionary, one of:
+  - `` enlist[`log]!enlist logdict `` – inject the logger, use config defaults.
+  - `` `log`config!(logdict;configdict) `` – inject the logger and override config.
+- `logdict` – `` `info`warn`error `` ! three `{[c;m]}` functions (required).
+- `configdict` – any subset of the keys in the [configuration](#gear-configuration) table.
+
+Errors if no logger is supplied. Returns nothing; its effect is wiring the
+logger, applying configuration, and installing the `.z.pp`/`.z.ph` handlers.
+
+---
+
+## :mag: Query target syntax
+
+The Grafana metric strings produced by `/search` encode the table, panel type
+and arguments, separated by `del` (default `"."`):
+
+| Prefix | Meaning |
+|---|---|
+| `t.<table>` | table panel for the whole table |
+| `t.<table>.<sym>` | table panel filtered to one sym |
+| `g.<table>` | graph panel, one series per numeric column |
+| `g.<table>.<col>` | graph panel, one series per sym for a column |
+| `o.<table>...` | "other" panels (single-stat, gauge, etc.) |
+| `f.<...>` | the target is a function call rather than a table |
+
+---
+
+## :rocket: Example usage
+
+```q
+q)grafana:use`di.grafana
+q)log:use`di.log                       / or define your own logger
+q)grafana.init[enlist[`log]!enlist `info`warn`error!(log.info;log.warn;log.error)]
+
+q)trade:([]time:.z.p-0D00:00:01*til 100;sym:100#`a`b`c;price:100?100f)
+```
+
+Add a SimPod JSON datasource in Grafana pointing at this process's HTTP port,
+then build panels using the metrics offered in the dropdowns (`t.trade`,
+`g.trade.price`, …).
+
+---
+
+## :test_tube: Tests
+
+Tests are written for k4unit and run with:
+
+```q
+q)k4unit:use`di.k4unit
+q)k4unit.moduletest`di.grafana
+```
diff --git a/di/grafana/grafana.q b/di/grafana/grafana.q
new file mode 100644
index 00000000..c960d5ee
--- /dev/null
+++ b/di/grafana/grafana.q
@@ -0,0 +1,259 @@
+/ grafana json datasource adaptor for kdb-x
+/ implements the simpod json datasource api so a grafana server can query
+/ kdb+ tables and timeseries data over http - the /search endpoint populates
+/ the grafana dropdowns and the /query endpoint returns timeseries or table data
+
+/ -----------------------------------------------------------------------------
+/ configuration - defaults applied here, overridden via the config dict in init
+/ -----------------------------------------------------------------------------
+
+/ name of the time column used for timeseries queries
+timecol:`time;
+/ name of the sym column used to split data by instrument
+sym:`sym;
+/ how far back to look when finding distinct syms
+timebackdate:2D;
+/ number of ticks to return for table requests
+ticks:1000;
+/ delimiter separating the arguments within a query target
+del:".";
+
+/ json type for each kdb datatype, keyed by .Q.t character
+types:.Q.t!`array`boolean,(3#`null),(5#`number),11#`string;
+/ milliseconds between 1970.01.01 and 2000.01.01
+epoch:946684800000;
+
+/ -----------------------------------------------------------------------------
+/ request handling
+/ -----------------------------------------------------------------------------
+
+zpp:{[x]
+  / parse a grafana http post request and dispatch to the matching handler
+  / cut at the first whitespace to isolate the api url from any function params
+  r:(0;n?" ")cut n:first x;
+  rqt:.j.k r 1;
+  .z.m.loginfo[`grafana;"received ",(r 0)," request"];
+  handler:$["query"~r 0;query;"search"~r 0;search;annotation];
+  :.[handler;enlist rqt;{[e].z.m.logerr[`grafana;"failed to process request: ",e];'e}];
+  };
+
+annotation:{[rqt]
+  / annotation endpoint is not yet implemented
+  .z.m.logwarn[`grafana;"annotation url not yet implemented"];
+  :`$"Annotation url nyi";
+  };
+
+query:{[rqt]
+  / dispatch a /query request to the timeseries or table builder by target type
+  rqtype:raze rqt[`targets]`type;
+  :.h.hy[`json]$[rqtype~"timeserie";tsfunc rqt;tbfunc rqt];
+  };
+
+search:{[rqt]
+  / build the grafana dropdown options from the tables available in the process
+  tabs:tables[];
+  symtabs:tabs where sym in'cols each tabs;
+  timetabs:tabs where timecol in'cols each tabs;
+  rsp:string tabs;
+  if[count timetabs;
+    rsp,:s1:prefix["t";string timetabs];
+    rsp,:s2:prefix["g";string timetabs];
+    / suffix the numeric columns for the graph and other panel options
+    rsp,:raze(s2,'del),/:'c1:string {cols[x] where`number=types(0!meta x)`t}each timetabs;
+    rsp,:raze(prefix["o";string timetabs],'del),/:'c1;
+    if[count symtabs;
+      / suffix the distinct syms for the timeseries and other panel options
+      rsp,:raze(s1,'del),/:'c2:string each finddistinctsyms'[timetabs];
+      rsp,:raze(prefix["o";string timetabs],'del),/:'{x[0]cross del,'string finddistinctsyms x 1}each(enlist each c1),'timetabs;
+     ];
+   ];
+  :.h.hy[`json].j.j rsp;
+  };
+
+finddistinctsyms:{[x]
+  / distinct syms seen in table x within the configured lookback window
+  :?[x;enlist(>;timecol;(-;.z.p;timebackdate));1b;{x!x}enlist sym]sym;
+  };
+
+prefix:{[c;s]
+  / prefix string c and the delimiter to each string in s
+  :(c,del),/:s;
+  };
+
+/ -----------------------------------------------------------------------------
+/ fetching the last n ticks
+/ -----------------------------------------------------------------------------
+
+diskvals:{[x]
+  / last `ticks` rows of an on-disk partitioned table
+  c:(count[x]-ticks)+til ticks;
+  :get'[.Q.ind[x;c]];
+  };
+
+memvals:{[x]
+  / last `ticks` rows of an in-memory table
+  :get'[?[x;enlist(within;`i;count[x]-ticks,0);0b;()]];
+  };
+
+catchvals:{[x]
+  / try the on-disk path first, fall back to the in-memory path on error
+  :@[diskvals;x;{[x;y]memvals x}[x]];
+  };
+
+/ -----------------------------------------------------------------------------
+/ target parsing helpers
+/ -----------------------------------------------------------------------------
+
+istype:{[targ;char]
+  / test whether the target is prefixed with char followed by the delimiter
+  :(char,del)~2#targ;
+  };
+isfunc:istype[;"f"];
+istab:istype[;"t"];
+
+/ -----------------------------------------------------------------------------
+/ building json responses
+/ -----------------------------------------------------------------------------
+
+tabresponse:{[colname;coltype;rqt]
+  / build a table response in the json datasource schema
+  :.j.j enlist`columns`rows`type!(flip`text`type!(colname;coltype);catchvals rqt;`table);
+  };
+
+tbfunc:{[rqt]
+  / process a table request and return the json datasource table response
+  rqt:raze rqt[`targets]`target;
+  symname:0b;
+  / strip the type prefix: f.t.func drops 4, f.func drops 2, t.tab leaves the
+  / table name plus an optional sym
+  rqt:0!value $[isfunc[rqt]&istab 2_rqt;4_rqt;
+                isfunc rqt;2_rqt;
+                istab rqt;[rqt:`$del vs rqt;if[2<count rqt;symname:rqt 2];rqt 1];
+                rqt];
+  colname:cols rqt;
+  coltype:types(0!meta rqt)`t;
+  / filter to a single sym if one was supplied in the target
+  if[-11h=type symname;rqt:?[rqt;enlist(=;sym;enlist symname);0b;()]];
+  :tabresponse[colname;coltype;rqt];
+  };
+
+tsfunc:{[x]
+  / process a timeseries request and route to the correct panel/sym builder
+  targ:raze x[`targets]`target;
+  / split the target into its delimited arguments
+  numargs:count args:$[isfunc targ;(0;1+targ?del)cut targ:2_targ;`$del vs targ];
+  tyargs:$[10h=abs type args 0;`$1#;]args 0;
+  coln:cols rqt:0!value args 1;
+  / convert a timestamp to milliseconds since the unix epoch
+  mil:{floor epoch+(`long$x)%1000000};
+  / ensure the time column is a timestamp
+  if["p"<>meta[rqt][timecol;`t];rqt:@[rqt;timecol;+;.z.D]];
+  / restrict to the time range requested by grafana
+  range:"P"$-1_'x[`range]`from`to;
+  rqt:?[rqt;enlist(within;timecol;range);0b;()];
+  / add the milliseconds-since-epoch column grafana expects
+  rqt:@[rqt;`msec;:;mil rqt timecol];
+  / dispatch on the number of arguments and the panel type
+  $[(2<numargs)and`g~tyargs;graphsym[args 2;rqt];
+    (2<numargs)and`t~tyargs;tablesym[coln;rqt;args 2];
+    (2=numargs)and`g~tyargs;graphnosym[coln;rqt];
+    (2=numargs)and`t~tyargs;tablenosym[coln;rqt];
+    (4=numargs)and`o~tyargs;othersym[args;rqt];
+    (3=numargs)and`o~tyargs;othernosym[args 2;rqt];
+    (2=numargs)and`o~tyargs;othernosym[coln except timecol;rqt];
+    `$"Wrong input"]
+  };
+
+buildnosym:{[x;y;z]
+  / append one column's datapoints to the response accumulator
+  :y,`target`datapoints!(z 0;value each ?[x;();0b;z!z]);
+  };
+
+nosymresponse:{[rqt;colname]
+  / build a no-sym datapoints response across all requested columns
+  :.j.j buildnosym[rqt]\[();colname];
+  };
+
+othernosym:{[coln;rqt]
+  / timeseries response for a non-specific panel with no sym split
+  colname:coln cross`msec;
+  :nosymresponse[rqt;colname];
+  };
+
+graphnosym:{[coln;rqt]
+  / timeseries response for a graph panel with no sym split (numeric columns only)
+  coln:-1_coln where`number=types(0!meta rqt)`t;
+  colname:coln cross`msec;
+  :nosymresponse[rqt;colname];
+  };
+
+tablenosym:{[coln;rqt]
+  / timeseries response for a table panel with no sym split
+  coltype:types -1_(0!meta rqt)`t;
+  :tabresponse[coln;coltype;rqt];
+  };
+
+othersym:{[args;rqt]
+  / timeseries response for a non-specific panel returning a single sym's data
+  outcol:args[2],`msec;
+  data:flip value flip?[rqt;enlist(=;sym;enlist args 3);0b;outcol!outcol];
+  :.j.j enlist`target`datapoints!(args 3;data);
+  };
+
+graphsym:{[colname;rqt]
+  / timeseries response for a graph panel returning each sym's data
+  syms:`$string ?[rqt;();1b;{x!x}enlist sym]sym;
+  outcol:colname,`msec;
+  build:{[outcol;rqt;x;y]data:flip value flip?[rqt;enlist(=;sym;enlist y);0b;outcol!outcol];:x,`target`datapoints!(y;data)};
+  :.j.j build[outcol;rqt]\[();syms];
+  };
+
+tablesym:{[coln;rqt;symname]
+  / timeseries response for a table panel filtered to a single sym
+  coltype:types -1_(0!meta rqt)`t;
+  rqt:?[rqt;enlist(=;sym;enlist symname);0b;()];
+  :tabresponse[coln;coltype;rqt];
+  };
+
+/ -----------------------------------------------------------------------------
+/ initialisation
+/ -----------------------------------------------------------------------------
+
+sethandlers:{
+  / wrap any existing .z.pp/.z.ph so grafana requests are intercepted and every
+  / other request falls through to the original handler
+  .z.m.prevpp:$[@[{value x;1b};`.z.pp;0b];.z.pp;{[x]}];
+  .z.pp:{[x]$[(`$"X-Grafana-Org-Id")in key last x;.z.m.zpp x;.z.m.prevpp x]};
+  .z.m.prevph:$[@[{value x;1b};`.z.ph;0b];.z.ph;{[x]}];
+  .z.ph:{[x]$[(`$"X-Grafana-Org-Id")in key last x;"HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n";.z.m.prevph x]};
+  .z.m.wired:1b;
+  };
+
+init:{[deps]
+  / wire the logging dependency and any configuration, then install the handlers
+  / deps - `log!enlist logdict or `log`config!(logdict;configdict)
+  /   logdict    - `info`warn`error!({[c;m]};{[c;m]};{[c;m]}) - required
+  /   configdict - optional overrides for `timecol`sym`timebackdate`ticks`del
+  / examples:
+  /   grafana.init[enlist[`log]!enlist mylog]
+  /   grafana.init[`log`config!(mylog;enlist[`ticks]!enlist 500)]
+  logdict:$[99h=type deps;$[(`log in key deps)and not(::)~deps`log;deps`log;()!()];()!()];
+  if[not count logdict;'"di.grafana: log dependency is required; pass `info`warn`error functions - see di.log for a default implementation"];
+  .z.m.loginfo:logdict`info;
+  .z.m.logwarn:logdict`warn;
+  .z.m.logerr:logdict`error;
+  / overlay any supplied configuration onto the defaults
+  config:$[99h=type deps;$[(`config in key deps)and not(::)~deps`config;deps`config;()!()];()!()];
+  if[count config;
+    vars:`timecol`sym`timebackdate`ticks`del inter key config;
+    (.Q.dd[.z.M]each vars)set'config vars;
+   ];
+  / install the http handlers once, preserving any existing definitions
+  if[not`wired in key .z.M;sethandlers[]];
+  .z.m.loginfo[`grafana;"initialised grafana json datasource adaptor"];
+  };
+
+getconfig:{
+  / return the currently active configuration
+  :`timecol`sym`timebackdate`ticks`del!(timecol;sym;timebackdate;ticks;del);
+  };
diff --git a/di/grafana/init.q b/di/grafana/init.q
new file mode 100644
index 00000000..daaae423
--- /dev/null
+++ b/di/grafana/init.q
@@ -0,0 +1,3 @@
+\l ::grafana.q
+
+export:([init;getconfig])
diff --git a/di/grafana/test.csv b/di/grafana/test.csv
new file mode 100644
index 00000000..bb64c3ba
--- /dev/null
+++ b/di/grafana/test.csv
@@ -0,0 +1,52 @@
+action,ms,bytes,lang,code,repeat,minver,comment
+comment,,,,,,,Setup
+before,0,0,q,grafana:use`di.grafana,1,,load module into session
+before,0,0,q,mocklog:`info`warn`error!({[c;m]};{[c;m]};{[c;m]}),1,,mock logger for injection
+
+comment,,,,,,,Export surface and required dependency
+true,0,0,q,(asc key grafana)~`getconfig`init,1,,only init and getconfig are exported
+fail,0,0,q,grafana.init[(::)],1,,init errors when no log dependency is supplied
+fail,0,0,q,grafana.init[enlist[`log]!enlist(::)],1,,init errors when log dependency is null
+
+comment,,,,,,,Initialisation wires handlers and applies defaults
+run,0,0,q,grafana.init[enlist[`log]!enlist mocklog],1,,initialise with mock logger
+true,0,0,q,.m.di.0grafana.wired,1,,handlers wired after init
+true,0,0,q,1000=.m.di.0grafana.ticks,1,,ticks default applied
+true,0,0,q,(`timecol`sym`timebackdate`ticks`del)~key grafana.getconfig[],1,,getconfig exposes the config keys
+
+comment,,,,,,,Target parsing helpers
+true,0,0,q,.m.di.0grafana.isfunc "f.x",1,,isfunc detects function prefix
+true,0,0,q,.m.di.0grafana.istab "t.x",1,,istab detects table prefix
+true,0,0,q,not .m.di.0grafana.isfunc "t.x",1,,isfunc rejects non-function prefix
+true,0,0,q,.m.di.0grafana.istype["o.x";"o"],1,,istype matches arbitrary prefix
+true,0,0,q,(("t.trade";"t.quote"))~.m.di.0grafana.prefix["t";("trade";"quote")],1,,prefix prepends char and delimiter
+
+comment,,,,,,,Build a recent test table in root
+run,0,0,q,trade:([]time:.z.p-0D00:00:01*til 10;sym:10#`a`b;price:10?100f),1,,create test trade table with recent timestamps
+true,0,0,q,(`a`b)~asc .m.di.0grafana.finddistinctsyms trade,1,,distinct syms found within lookback
+true,0,0,q,10=count .m.di.0grafana.memvals trade,1,,memvals returns last ticks rows from memory
+true,0,0,q,0<count .m.di.0grafana.catchvals trade,1,,catchvals returns rows
+
+comment,,,,,,,Table request
+run,0,0,q,.test.tbrqt:enlist[`targets]!enlist (enlist[`target]!enlist "t.trade"),1,,build a table request
+run,0,0,q,.test.tb:.m.di.0grafana.tbfunc .test.tbrqt,1,,run the table builder
+true,0,0,q,.test.tb like "*columns*",1,,table response carries column metadata
+true,0,0,q,.test.tb like "*table*",1,,table response declares table type
+
+comment,,,,,,,Timeseries request
+run,0,0,q,.test.tsrqt:`targets`range!((enlist `target`type!("g.trade";"timeserie"));`from`to!(("" sv (string .z.p-1D;enlist"Z"));("" sv (string .z.p+1D;enlist"Z")))),1,,build a graph timeseries request
+run,0,0,q,.test.ts:.m.di.0grafana.tsfunc .test.tsrqt,1,,run the timeseries builder
+true,0,0,q,.test.ts like "*price*",1,,timeseries response returns numeric column datapoints
+
+comment,,,,,,,Handlers route grafana requests
+run,0,0,q,.test.sr:.z.pp (("search {}");(enlist `$"X-Grafana-Org-Id")!enlist ""),1,,post routed through installed .z.pp to search
+true,0,0,q,.test.sr like "*trade*",1,,search response lists the test table
+run,0,0,q,.m.di.0grafana.prevpp:{"fellthrough"},1,,install a sentinel as the pre-existing post handler
+true,0,0,q,.z.pp[(("ignored");()!())]~"fellthrough",1,,non-grafana post falls through to the pre-existing handler
+run,0,0,q,.test.ph:.z.ph (`;(enlist `$"X-Grafana-Org-Id")!enlist ""),1,,get routed through installed .z.ph
+true,0,0,q,.test.ph~"HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n",1,,get returns an alive response
+
+comment,,,,,,,Configuration override
+run,0,0,q,grafana.init[`log`config!(mocklog;enlist[`ticks]!enlist 5)],1,,re-init with a config override
+true,0,0,q,5=.m.di.0grafana.ticks,1,,ticks config overridden
+true,0,0,q,5=grafana.getconfig[][`ticks],1,,getconfig reflects the overridden ticks