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.

Sign up for GitHub

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

Jump to bottom

Fixes #13432: Git merge issue between Rudder 4.3 and Rudder 5.0 #2027

Merged
merged 3 commits into from
Sep 10, 2018
Merged

Fixes #13432: Git merge issue between Rudder 4.3 and Rudder 5.0 #2027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
465166a
Issue #12621: Experiment with postgresql composite type.
fanf May 13, 2018
328ff1d
Issue #13432: upmerge missing commit beb105c9b4558002347a4326624caf02…
fanf Sep 7, 2018
d221e22
Fixes #13432: Git merge issue between Rudder 4.3 and Rudder 5.0
fanf Sep 7, 2018
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
119 changes: 77 additions & 42 deletions rudder-core/src/main/resources/reportsSchema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
*************************************************************************************
*
* This file is part of Rudder.
*
*
* Rudder is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
*
* In accordance with the terms of section 7 (7. Additional Terms.) of
* the GNU General Public License version 3, the copyright holders add
* the following Additional permissions:
Expand All @@ -22,12 +22,12 @@
* documentation that, without modification of the Source Code, enables
* supplementary functions or services in addition to those offered by
* the Software.
*
*
* Rudder is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with Rudder. If not, see <http://www.gnu.org/licenses/>.

Expand All @@ -47,14 +47,14 @@ ALTER database rudder SET standard_conforming_strings=true;

/*
*************************************************************************************
* The following tables are used as input from agent
* action.
* The following tables are used as input from agent
* action.
* We store execution reports, historize them, and
* also store each run in a dedicated tables.
*
* also store each run in a dedicated tables.
*
* These tables are (should) be independant from
* rudder-the-webapp and should be directly
* feeded by syslog.
* rudder-the-webapp and should be directly
* feeded by syslog.
*************************************************************************************
*/

Expand Down Expand Up @@ -90,7 +90,7 @@ CREATE INDEX changes_executionTimeStamp_idx ON RudderSysEvents (executionTimeSta


/*
* The table used to store archived agent execution reports.
* The table used to store archived agent execution reports.
*/
CREATE TABLE ArchivedRudderSysEvents (
id bigint PRIMARY KEY
Expand All @@ -110,10 +110,10 @@ CREATE TABLE ArchivedRudderSysEvents (
CREATE INDEX executionTimeStamp_archived_idx ON ArchivedRudderSysEvents (executionTimeStamp);

/*
* That table store the agent execution times for each nodes.
* We keep the starting time of the given run and the fact
* that the run completed (we got an "execution END" report)
* or not.
* That table store the agent execution times for each nodes.
* We keep the starting time of the given run and the fact
* that the run completed (we got an "execution END" report)
* or not.
*/
CREATE TABLE ReportsExecution (
nodeId text NOT NULL
Expand All @@ -140,18 +140,18 @@ CREATE TABLE ArchivedReportsExecution (
, PRIMARY KEY(nodeId, date)
);

/*
/*
*************************************************************************************
* The following tables store what Rudder expects from agent.
* The are used to store rules versions and corresponding expected datas.
* The following tables store what Rudder expects from agent.
* The are used to store rules versions and corresponding expected datas.
*************************************************************************************
*/


/*
* We also have a table of the list of node with configId / generationDate
* so what we can answer the question: what is the last config id for that node ?
* The date helps now if we should have received report for that node.
* The date helps now if we should have received report for that node.
*/
CREATE TABLE nodes_info (
node_id text PRIMARY KEY CHECK (node_id <> '')
Expand All @@ -161,17 +161,17 @@ CREATE TABLE nodes_info (

-- Create the table for the node configuration
CREATE TABLE nodeConfigurations (
nodeId text NOT NULL CHECK (nodeId <> '')
nodeId text NOT NULL CHECK (nodeId <> '')
, nodeConfigId text NOT NULL CHECK (nodeConfigId <> '')
, beginDate timestamp with time zone NOT NULL
, endDate timestamp with time zone

-- here, I'm using text but with valid JSON in it, because for now we can't impose postgres > 9.2,
-- here, I'm using text but with valid JSON in it, because for now we can't impose postgres > 9.2,
-- and interesting function are on 9.3/9.4. we will be able to migrate with:
-- ALTER TABLE table1 ALTER COLUMN col1 TYPE JSON USING col1::JSON;
-- or if version == 9.2, we need to do a several steps script like:
-- or if version == 9.2, we need to do a several steps script like:
-- https://github.com/airblade/paper_trail/issues/600#issuecomment-136279154
-- and then garbage collect space with:
-- and then garbage collect space with:
-- vacuum full nodecompliance;

, configuration text NOT NULL CHECK (configuration <> '' )
Expand All @@ -189,18 +189,18 @@ CREATE INDEX nodeConfigurations_nodeConfigId ON nodeConfigurations (nodeConfigId

-- Create the table for the archived node configurations
CREATE TABLE archivedNodeConfigurations (
nodeId text NOT NULL CHECK (nodeId <> '')
nodeId text NOT NULL CHECK (nodeId <> '')
, nodeConfigId text NOT NULL CHECK (nodeConfigId <> '')
, beginDate timestamp with time zone NOT NULL
, endDate timestamp with time zone
, configuration text NOT NULL CHECK (configuration <> '' )
, PRIMARY KEY (nodeId, nodeConfigId, beginDate)
);

/*
/*
*************************************************************************************
* The following tables stores "node compliance", i.e all the interesting information
* about what was the compliance of a node FOR A GIVEN RUN.
* about what was the compliance of a node FOR A GIVEN RUN.
* That table *only* store information for runs, and does not track (non exaustively):
* - when the node expected configuration is updated - only a new run will check,
* - node not sending runs - only the fact that we don't have data can be observed
Expand All @@ -210,12 +210,12 @@ CREATE TABLE archivedNodeConfigurations (

-- Create the table for the node compliance
CREATE TABLE nodeCompliance (
nodeId text NOT NULL CHECK (nodeId <> '')
nodeId text NOT NULL CHECK (nodeId <> '')
, runTimestamp timestamp with time zone NOT NULL

-- endOfList is the date until which the compliance information
-- are relevant. After that date/time, the node must have sent
-- a more recent run, this one is not valide anymore.
-- a more recent run, this one is not valide anymore.
, endOfLife timestamp with time zone

-- all information about the run and what lead to that compliance:
Expand All @@ -236,7 +236,7 @@ CREATE TABLE nodeCompliance (
, details text NOT NULL CHECK (details <> '' )

-- Primary key is given by a run timestamp and the node id. We could
-- have duplicate if node clock change, but it would need to have
-- have duplicate if node clock change, but it would need to have
-- exact same timestamp down to the millis, quite improbable.

, PRIMARY KEY (nodeId, runTimestamp)
Expand All @@ -246,9 +246,11 @@ CREATE INDEX nodeCompliance_nodeId ON nodeCompliance (nodeId);
CREATE INDEX nodeCompliance_runTimestamp ON nodeCompliance (runTimestamp);
CREATE INDEX nodeCompliance_endOfLife ON nodeCompliance (endOfLife);



-- Create the table for the archived node compliance
CREATE TABLE archivedNodeCompliance (
nodeId text NOT NULL CHECK (nodeId <> '')
nodeId text NOT NULL CHECK (nodeId <> '')
, runTimestamp timestamp with time zone NOT NULL
, endOfLife timestamp with time zone
, runAnalysis text NOT NULL CHECK (runAnalysis <> '' )
Expand All @@ -257,12 +259,45 @@ CREATE TABLE archivedNodeCompliance (
, PRIMARY KEY (nodeId, runTimestamp)
);

-- Create a table of only (nodeid, ruleid, directiveid) -> complianceLevel
-- for all runs. That table is amendable to postgresql-side processing,
-- in particular to allow aggregation of compliance by rule / node / directive,
-- but with a much more reasonable space until all our supported server versions
-- have at least PostgreSQL 9.4.
CREATE TABLE nodecompliancelevels (
nodeId text NOT NULL CHECK (nodeId <> '')
, runTimestamp timestamp with time zone NOT NULL
, ruleId text NOT NULL CHECK (nodeId <> '')
, directiveId text NOT NULL CHECK (nodeId <> '')
, pending int DEFAULT 0
, success int DEFAULT 0
, repaired int DEFAULT 0
, error int DEFAULT 0
, unexpected int DEFAULT 0
, missing int DEFAULT 0
, noAnswer int DEFAULT 0
, notApplicable int DEFAULT 0
, reportsDisabled int DEFAULT 0
, compliant int DEFAULT 0
, auditNotApplicable int DEFAULT 0
, nonCompliant int DEFAULT 0
, auditError int DEFAULT 0
, badPolicyMode int DEFAULT 0
, PRIMARY KEY (nodeId, runTimestamp, ruleId, directiveId)
);

CREATE INDEX nodecompliancelevels_nodeId ON nodecompliancelevels (nodeId);
CREATE INDEX nodecompliancelevels_ruleId ON nodecompliancelevels (nodeId);
CREATE INDEX nodecompliancelevels_directiveId ON nodecompliancelevels (nodeId);
CREATE INDEX nodecompliancelevels_runTimestamp ON nodecompliancelevels (runTimestamp);



/*
/*
*************************************************************************************
* The following tables stores "event logs", i.e logs action about user and
* The following tables stores "event logs", i.e logs action about user and
* system event that can leads to configuration changes and are needed to allows
* audit track logs.
* audit track logs.
*************************************************************************************
*/

Expand All @@ -278,24 +313,24 @@ CREATE TABLE EventLog (
, reason text
, eventType text
, data xml
);
);

CREATE INDEX eventType_idx ON EventLog (eventType);
CREATE INDEX creationDate_idx ON EventLog (creationDate);
CREATE INDEX eventlog_fileFormat_idx ON eventlog (((((xpath('/entry//@fileFormat',data))[1])::text)));


/*
* That table is used when a migration between
* event log format is needed.
* That table is used when a migration between
* event log format is needed.
*/
CREATE SEQUENCE MigrationEventLogId start 1;
CREATE TABLE MigrationEventLog (
id integer PRIMARY KEY default(nextval('MigrationEventLogId'))
, detectionTime timestamp with time zone NOT NULL
, detectedFileFormat integer
, migrationStartTime timestamp with time zone
, migrationEndTime timestamp with time zone
, migrationEndTime timestamp with time zone
, migrationFileFormat integer
, description text
);
Expand All @@ -304,8 +339,8 @@ CREATE TABLE MigrationEventLog (
/*
*************************************************************************************
* A table used to store generic properties related to the database and that could not
* go the the LDAP backend. Typically, that's property that must be updated during a
* transaction or are really frequently written.
* go the the LDAP backend. Typically, that's property that must be updated during a
* transaction or are really frequently written.
*************************************************************************************
*/

Expand All @@ -319,7 +354,7 @@ CREATE TABLE RudderProperties(
/*
*************************************************************************************
* The following tables are used to manage
* validation workflows and change requests
* validation workflows and change requests
*************************************************************************************
*/

Expand Down Expand Up @@ -351,10 +386,10 @@ CREATE TABLE StatusUpdate (
);


/*
/*
*************************************************************************************
* The following tables stores names about object to be able to historize them
* and present them back to the user in a meaningful way.
* and present them back to the user in a meaningful way.
*************************************************************************************
*/

Expand Down
Loading