Skip to content

Commit e1c4677

Browse files
authored
Merge pull request #3403 from MikeScalise/UpdateMarkdownVisuals
#3401 sp_Blitz: Improve Markdown output alias and spacing
2 parents 1178364 + 81af402 commit e1c4677

1 file changed

Lines changed: 16 additions & 14 deletions

File tree

sp_Blitz.sql

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9839,20 +9839,22 @@ IF @ProductVersionMajor >= 10 AND NOT EXISTS ( SELECT 1
98399839
FROM #BlitzResults
98409840
WHERE Priority > 0 AND Priority < 255 AND FindingsGroup IS NOT NULL AND Finding IS NOT NULL
98419841
AND FindingsGroup <> 'Security' /* Specifically excluding security checks for public exports */)
9842-
SELECT
9843-
CASE
9844-
WHEN r.Priority <> COALESCE(rPrior.Priority, 0) OR r.FindingsGroup <> rPrior.FindingsGroup THEN @crlf + N'**Priority ' + CAST(COALESCE(r.Priority,N'') AS NVARCHAR(5)) + N': ' + COALESCE(r.FindingsGroup,N'') + N'**:' + @crlf + @crlf
9845-
ELSE N''
9846-
END
9847-
+ CASE WHEN r.Finding <> COALESCE(rPrior.Finding,N'') AND r.Finding <> COALESCE(rNext.Finding,N'') THEN N'- ' + COALESCE(r.Finding,N'') + N' ' + COALESCE(r.DatabaseName, N'') + N' - ' + COALESCE(r.Details,N'') + @crlf
9848-
WHEN r.Finding <> COALESCE(rPrior.Finding,N'') AND r.Finding = rNext.Finding AND r.Details = rNext.Details THEN N'- ' + COALESCE(r.Finding,N'') + N' - ' + COALESCE(r.Details,N'') + @crlf + @crlf + N' * ' + COALESCE(r.DatabaseName, N'') + @crlf
9849-
WHEN r.Finding <> COALESCE(rPrior.Finding,N'') AND r.Finding = rNext.Finding THEN N'- ' + COALESCE(r.Finding,N'') + @crlf + CASE WHEN r.DatabaseName IS NULL THEN N'' ELSE N' * ' + COALESCE(r.DatabaseName,N'') END + CASE WHEN r.Details <> rPrior.Details THEN N' - ' + COALESCE(r.Details,N'') + @crlf ELSE '' END
9850-
ELSE CASE WHEN r.DatabaseName IS NULL THEN N'' ELSE N' * ' + COALESCE(r.DatabaseName,N'') END + CASE WHEN r.Details <> rPrior.Details THEN N' - ' + COALESCE(r.Details,N'') + @crlf ELSE N'' + @crlf END
9851-
END + @crlf
9852-
FROM Results r
9853-
LEFT OUTER JOIN Results rPrior ON r.rownum = rPrior.rownum + 1
9854-
LEFT OUTER JOIN Results rNext ON r.rownum = rNext.rownum - 1
9855-
ORDER BY r.rownum FOR XML PATH(N'');
9842+
SELECT
9843+
Markdown = CONVERT(XML, STUFF((SELECT
9844+
CASE
9845+
WHEN r.Priority <> COALESCE(rPrior.Priority, 0) OR r.FindingsGroup <> rPrior.FindingsGroup THEN @crlf + N'**Priority ' + CAST(COALESCE(r.Priority,N'') AS NVARCHAR(5)) + N': ' + COALESCE(r.FindingsGroup,N'') + N'**:' + @crlf + @crlf
9846+
ELSE N''
9847+
END
9848+
+ CASE WHEN r.Finding <> COALESCE(rPrior.Finding,N'') AND r.Finding <> COALESCE(rNext.Finding,N'') THEN N'- ' + COALESCE(r.Finding,N'') + N' ' + COALESCE(r.DatabaseName, N'') + N' - ' + COALESCE(r.Details,N'') + @crlf
9849+
WHEN r.Finding <> COALESCE(rPrior.Finding,N'') AND r.Finding = rNext.Finding AND r.Details = rNext.Details THEN N'- ' + COALESCE(r.Finding,N'') + N' - ' + COALESCE(r.Details,N'') + @crlf + @crlf + N' * ' + COALESCE(r.DatabaseName, N'') + @crlf
9850+
WHEN r.Finding <> COALESCE(rPrior.Finding,N'') AND r.Finding = rNext.Finding THEN N'- ' + COALESCE(r.Finding,N'') + @crlf + @crlf + CASE WHEN r.DatabaseName IS NULL THEN N'' ELSE N' * ' + COALESCE(r.DatabaseName,N'') END + CASE WHEN r.Details <> rPrior.Details THEN N' - ' + COALESCE(r.Details,N'') + @crlf ELSE '' END
9851+
ELSE CASE WHEN r.DatabaseName IS NULL THEN N'' ELSE N' * ' + COALESCE(r.DatabaseName,N'') END + CASE WHEN r.Details <> rPrior.Details THEN N' - ' + COALESCE(r.Details,N'') + @crlf ELSE N'' + @crlf END
9852+
END + @crlf
9853+
FROM Results r
9854+
LEFT OUTER JOIN Results rPrior ON r.rownum = rPrior.rownum + 1
9855+
LEFT OUTER JOIN Results rNext ON r.rownum = rNext.rownum - 1
9856+
ORDER BY r.rownum FOR XML PATH(N''), ROOT('Markdown'), TYPE).value('/Markdown[1]','VARCHAR(MAX)'), 1, 2, '')
9857+
+ '<style>p { margin: 0 0 0.5em }</style>');
98569858
END;
98579859
ELSE IF @OutputType = 'XML'
98589860
BEGIN

0 commit comments

Comments
 (0)