jblu/Inex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases 8 Wiki Activity

dev-add-daysTopull #19

Merged
jblu merged 3 commits from dev-add-daysTopull into main 2024-08-14 15:21:01 -05:00
Conversation 0 Commits 3 Files Changed 4 +7 -3
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit de3a3fd03d - Show all commits

2
README.md
View File

@@ -49,12 +49,14 @@ You will need a *config.toml* file in the same directory where *inex.py* or inex
| logging | Set if, where and level of logging | | logging | Set if, where and level of logging |
The following settings are not obvious as to how they affect the application. The following settings are not obvious as to how they affect the application.
> Note the #comments
``` ```
[fortraPlatform] [fortraPlatform]
selectedPlatform = "dev" # This will modify which environment the data is pushed to. The tenant_id and secret must be manually modified. selectedPlatform = "dev" # This will modify which environment the data is pushed to. The tenant_id and secret must be manually modified.
[database] [database]
overrideEmbeddedquery = true # Choose if embedded query should be overridden. overrideEmbeddedquery = true # Choose if embedded query should be overridden.
daysTopull = 30 # This setting is only related to the embedded query. Please note this will not affect query provided in config.toml
driver = "ODBC Driver 18 for SQL Server" # Select which windows driver should be used. This one is recommended. driver = "ODBC Driver 18 for SQL Server" # Select which windows driver should be used. This one is recommended.
[output] [output]

1
config.toml.example
View File

@@ -24,6 +24,7 @@ secret = ""
[database] [database]
overrideEmbeddedquery = false overrideEmbeddedquery = false
daysTopull = 30
driver = "ODBC Driver 18 for SQL Server" driver = "ODBC Driver 18 for SQL Server"
server = "192.168.x.x" server = "192.168.x.x"
database = "EFTDB" database = "EFTDB"

3
inex.py
View File

@@ -52,6 +52,7 @@ class Inex:
self.writeJsonfile = self.config["output"]["dumpTojson"] self.writeJsonfile = self.config["output"]["dumpTojson"]
self.pushToplatform = self.config["output"]["pushToplatform"] self.pushToplatform = self.config["output"]["pushToplatform"]
self.queryOverride = self.config["database"]["overrideEmbeddedquery"] self.queryOverride = self.config["database"]["overrideEmbeddedquery"]
self.queryDaystopull = self.config["database"]["daysTopull"]
except: except:
print("No config.toml. Please use example file and configure appropriately") print("No config.toml. Please use example file and configure appropriately")
exit(1) exit(1)
@@ -70,7 +71,7 @@ class Inex:
self.cursor = self.ic.inexSql.connectDatabase(self, self.db, self.dbDriver, self.dbServer, self.dbDatabase, self.dbUser, self.dbPassword) self.cursor = self.ic.inexSql.connectDatabase(self, self.db, self.dbDriver, self.dbServer, self.dbDatabase, self.dbUser, self.dbPassword)
self.data = self.ic.inexSql.databaseQuery(self, self.cursor, self.sq.sqlQuerymodel.queryData(self.queryOverride,self.dbQuery)) self.data = self.ic.inexSql.databaseQuery(self, self.cursor, self.sq.sqlQuerymodel.queryData(self.queryOverride,self.dbQuery, self.queryDaystopull))
self.modifiedData = processData(self.data, dataTemplate, prd_instance_id=self.prdInstanceID,\ self.modifiedData = processData(self.data, dataTemplate, prd_instance_id=self.prdInstanceID,\
product_guid=self.productGUID,product_name=self.productName,product_version=self.productVersion) product_guid=self.productGUID,product_name=self.productName,product_version=self.productVersion)

4
inexSqlquery.py
View File

@@ -1,5 +1,5 @@
class sqlQuerymodel: class sqlQuerymodel:
def queryData(overRideflag, configQuery): def queryData(overRideflag, configQuery, daysTopull):
"""Embedded query data""" """Embedded query data"""
q ="""DECLARE @stopTime DATETIME2 q ="""DECLARE @stopTime DATETIME2
SET @stopTime=DATEADD(DAY, -30, GETDATE()) SET @stopTime=DATEADD(DAY, -30, GETDATE())
@@ -7,5 +7,5 @@ class sqlQuerymodel:
FROM tbl_Transactions t FROM tbl_Transactions t
Full JOIN tbl_ProtocolCommands p ON(t.TransactionID=p.TransactionID) Full JOIN tbl_ProtocolCommands p ON(t.TransactionID=p.TransactionID)
Full join tbl_Authentications a ON(t.TransactionID=a.TransactionID) Full join tbl_Authentications a ON(t.TransactionID=a.TransactionID)
WHERE p.Time_stamp>@stopTime AND p.Command IS NOT NULL""" WHERE p.Time_stamp>@stopTime AND p.Command IS NOT NULL""".replace("30", daysTopull)
return configQuery if overRideflag else q return configQuery if overRideflag else q