Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pentaho 9.1 compatibility #24

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,8 @@ impl.title=Pentaho CE Audit Plugin
project.description=Pentaho CE Audit Plugin
testsrc.dir=test
dependency.bi-platform.revision=TRUNK-SNAPSHOT
#Properties for Pentaho 5.0
#Properties for Pentaho 9.1
cpk.pentaho.artifact=cpk-pentaho5
cpf.pentaho.artifact=cpf-pentaho5
cpf.pentaho.artifact=cpf-pentaho
dependency.cpk.revision=TRUNK-SNAPSHOT
dependency.cpf.revision=TRUNK-SNAPSHOT
#Properties for Pentaho 4.x
#cpk.pentaho.artifact=cpk-pentaho
#cpf.pentaho.artifact=cpf-pentaho
#dependency.cpk.revision=TRUNK-SNAPSHOT
#dependency.cpf.revision=REFACTOR-SNAPSHOT
dependency.cpf.revision=TRUNK-SNAPSHOT
66 changes: 35 additions & 31 deletions dashboards/admin/dashboard.cda
Original file line number Diff line number Diff line change
Expand Up @@ -30,50 +30,52 @@
<Jndi>Hibernate</Jndi>
</Connection>
</DataSources>
<DataAccess access="public" cache="false" cacheDuration="3600"
connection="mdxQueryTop10UsersByExecution"
<DataAccess access="public" connection="mdxQueryTop10UsersByExecution"
id="mdxQueryTop10UsersByExecution"
type="mdx">
<Name>mdxQueryTop10UsersByExecution</Name>
<BandedMode>compact</BandedMode>
<Cache duration="3600" enabled="false"/>
<Columns/>
<Parameters>
<Parameter default="" name="filterYearParameter" type="String"/>
</Parameters>
<Query>WITH
<Query><![CDATA[WITH
SET [~ROWS] AS
TopCount({[User].[User].Members}, 10, [Measures].[Quantity])
SELECT
NON EMPTY {[Measures].[Quantity]} ON COLUMNS,
NON EMPTY [~ROWS] ON ROWS
FROM [Pentaho CE Audit]
WHERE CrossJoin({${filterYearParameter}}, {[Type].[execution]})</Query>
WHERE CrossJoin({${filterYearParameter}}, {[Type].[execution]})]]></Query>
</DataAccess>
<DataAccess access="public" cache="false" cacheDuration="3600"
connection="mdxQueryTop10UsersByLogin"
<DataAccess access="public" connection="mdxQueryTop10UsersByLogin"
id="mdxQueryTop10UsersByLogin"
type="mdx">
<Name>mdxQueryTop10UsersByLogin</Name>
<BandedMode>compact</BandedMode>
<Cache duration="3600" enabled="false"/>
<Columns/>
<Parameters>
<Parameter default="" name="filterYearParameter" type="String"/>
</Parameters>
<Query>WITH
<Query><![CDATA[WITH
SET [~ROWS] AS
TopCount({[User].[User].Members}, 10, [Measures].[Quantity])
SELECT
NON EMPTY {[Measures].[Quantity]} ON COLUMNS,
NON EMPTY [~ROWS] ON ROWS
FROM [Pentaho CE Audit]
WHERE CrossJoin({${filterYearParameter}}, {[Type].[login]})</Query>
WHERE CrossJoin({${filterYearParameter}}, {[Type].[login]})]]></Query>
</DataAccess>
<DataAccess access="public" cache="false" cacheDuration="3600"
connection="mdxQueryAccessByHour"
id="mdxQueryAccessByHour"
<DataAccess access="public" connection="mdxQueryAccessByHour" id="mdxQueryAccessByHour"
type="mdx">
<Name>mdxQueryAccessByHour</Name>
<BandedMode>compact</BandedMode>
<Cache duration="3600" enabled="false"/>
<Columns/>
<Parameters/>
<Query>WITH
<Query><![CDATA[WITH
SET [~FILTER] AS
{[Type].[login]}
SET [~ROWS] AS
Expand All @@ -82,29 +84,29 @@ SELECT
NON EMPTY {[Measures].[Quantity]} ON COLUMNS,
NON EMPTY [~ROWS] ON ROWS
FROM [Pentaho CE Audit]
WHERE [~FILTER]</Query>
WHERE [~FILTER]]]></Query>
</DataAccess>
<DataAccess access="public" cache="false" cacheDuration="3600" connection="filterYearQuery"
id="filterYearQuery"
type="mdx">
<DataAccess access="public" connection="filterYearQuery" id="filterYearQuery" type="mdx">
<Name>filterYearQuery</Name>
<BandedMode>compact</BandedMode>
<Cache duration="3600" enabled="false"/>
<Columns/>
<Output indexes="1,0" mode="include"/>
<Parameters/>
<Query>with member [Measures].[Name] as '[Year].CurrentMember.UniqueName'
<Query><![CDATA[with member [Measures].[Name] as '[Year].CurrentMember.UniqueName'
select TopCount( filter({Descendants([Year].members)}, not isempty(([Year].CurrentMember)) ) , 50) on ROWS,
{[Measures].[Name]} on Columns
from [Pentaho CE Audit]</Query>
from [Pentaho CE Audit]]]></Query>
</DataAccess>
<DataAccess access="public" cache="false" cacheDuration="3600" connection="mdxQueryFiles"
id="mdxQueryFiles"
type="mdx">
<DataAccess access="public" connection="mdxQueryFiles" id="mdxQueryFiles" type="mdx">
<Name>mdxQueryFiles</Name>
<BandedMode>compact</BandedMode>
<Cache duration="3600" enabled="false"/>
<Columns/>
<Parameters>
<Parameter default="" name="filterYearParameter" type="String"/>
</Parameters>
<Query>WITH
<Query><![CDATA[WITH
SET [~ROWS_User.User] AS
{[User].[User].Members}
SET [~ROWS_File.File] AS
Expand All @@ -115,42 +117,44 @@ SELECT
NON EMPTY {[Measures].[Quantity]} ON COLUMNS,
NON EMPTY ([~ROWS_User.User] * [~ROWS_File.File] * [~ROWS_Plugin.Plugin]) ON ROWS
FROM [Pentaho CE Audit]
WHERE CrossJoin({${filterYearParameter}}, {[Type].[execution]})</Query>
WHERE CrossJoin({${filterYearParameter}}, {[Type].[execution]})]]></Query>
</DataAccess>
<DataAccess access="public" cache="false" cacheDuration="3600"
connection="mdxQueryExecutionByHours"
<DataAccess access="public" connection="mdxQueryExecutionByHours"
id="mdxQueryExecutionByHours"
type="mdx">
<Name>mdxQueryExecutionByHours</Name>
<BandedMode>compact</BandedMode>
<Cache duration="3600" enabled="false"/>
<Columns/>
<Parameters>
<Parameter default="" name="filterYearParameter" type="String"/>
</Parameters>
<Query>WITH
<Query><![CDATA[WITH
SET [~ROWS] AS
{[Time].[Hour].Members}
SELECT
NON EMPTY {[Measures].[Quantity]} ON COLUMNS,
NON EMPTY [~ROWS] ON ROWS
FROM [Pentaho CE Audit]
WHERE CrossJoin({${filterYearParameter}}, {[Type].[execution]})</Query>
WHERE CrossJoin({${filterYearParameter}}, {[Type].[execution]})]]></Query>
</DataAccess>
<DataAccess access="public" cache="false" cacheDuration="3600"
connection="mdxQueryExecByDayOfWeek"
<DataAccess access="public" connection="mdxQueryExecByDayOfWeek"
id="mdxQueryExecByDayOfWeek"
type="mdx">
<Name>mdxQueryExecByDayOfWeek</Name>
<BandedMode>compact</BandedMode>
<Cache duration="3600" enabled="false"/>
<Columns/>
<Parameters>
<Parameter default="" name="filterYearParameter" type="String"/>
</Parameters>
<Query>WITH
<Query><![CDATA[WITH
SET [~ROWS] AS
{[Period].[Day of Week].Members}
SELECT
NON EMPTY {[Measures].[Quantity]} ON COLUMNS,
NON EMPTY [~ROWS] ON ROWS
FROM [Pentaho CE Audit]
WHERE CrossJoin({${filterYearParameter}}, {[Type].[execution]})</Query>
WHERE CrossJoin({${filterYearParameter}}, {[Type].[execution]})]]></Query>
</DataAccess>
</CDADescriptor>
14,974 changes: 7,922 additions & 7,052 deletions dashboards/admin/dashboard.cdfde

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dashboards/admin/dashboard.wcdf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<cdf><title>dashboard</title><description>Sparkl Default</description><author>IT4biz</author><style>Clean</style><rendererType>bootstrap</rendererType><widget>false</widget><widgetName></widgetName><widgetParameters></widgetParameters></cdf>
<cdf><title>dashboard</title><description>Sparkl Default</description><author>Ibrahim Bolarinwa</author><style>Clean</style><rendererType>bootstrap</rendererType><require>false</require><widget>false</widget><widgetName></widgetName><widgetParameters></widgetParameters></cdf>
Loading