Issue 2280 missing kpi fields

@kparlante, this builds on #3495 to ensure all the expected KPIs are there.

That should be reviewed before this, but I would like to get feedback if possible.