-
Notifications
You must be signed in to change notification settings - Fork 32
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
Unify Process Values #5500
Merged
Merged
Unify Process Values #5500
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
a21ace0
feat: add method to unify process values
rafabailon 854660f
feat: modify conditional
rafabailon 01333c0
feat: fix linter errors
rafabailon 4f12863
feat: rename unify variable
rafabailon 0c04723
feat: change in the conditional to unify
rafabailon 76c2ea9
feat: modify the logic of unification
rafabailon 91ad2fe
feat: Improvement of the unification logic
rafabailon 5757bb6
feat: change the argument information to unify
rafabailon ee85a1d
feat: change conditional, argument and docstring
rafabailon 90d45d9
feat: update changelog
rafabailon 548d189
Merge branch '4.8.1' into enhancement/5479-unify-process-values
rafabailon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -32,7 +32,7 @@ class DataVisualizer: | |||||||||
base_name (str, optional): base name used to store the images. | ||||||||||
""" | ||||||||||
def __init__(self, dataframes, target, compare=False, store_path=gettempdir(), x_ticks_granularity='minutes', | ||||||||||
x_ticks_interval=1, base_name=None, columns_path=None): | ||||||||||
x_ticks_interval=1, base_name=None, columns_path=None, unify=False): | ||||||||||
self.dataframes_paths = dataframes | ||||||||||
self.dataframe = None | ||||||||||
self.compare = compare | ||||||||||
|
@@ -48,6 +48,9 @@ def __init__(self, dataframes, target, compare=False, store_path=gettempdir(), x | |||||||||
if target in ['binary', 'analysis', 'remote', 'agent', 'logcollector', 'wazuhdb']: | ||||||||||
self.columns_to_plot = self._load_columns_to_plot(columns_path) | ||||||||||
|
||||||||||
if unify.lower() in ["true"]: | ||||||||||
self._unify_dataframes() | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Solved in 4f12863 |
||||||||||
|
||||||||||
@staticmethod | ||||||||||
def _color_palette(size): | ||||||||||
"""Create a list of different colors. | ||||||||||
|
@@ -87,6 +90,17 @@ def _load_dataframes(self): | |||||||||
new_csv = pd.read_csv(df_path, index_col="Timestamp", parse_dates=True) | ||||||||||
self.dataframe = pd.concat([self.dataframe, new_csv]) | ||||||||||
|
||||||||||
def _unify_dataframes(self): | ||||||||||
"""Unify dataframe values.""" | ||||||||||
Rebits marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||
df_row = self.dataframe.iloc[0] | ||||||||||
df_names = [df_row['Daemon'], df_row['Version'], df_row['PID']] | ||||||||||
columns_to_drop = ['Daemon', 'Version', 'PID'] | ||||||||||
columns_to_sum = self.dataframe.columns.drop(columns_to_drop) | ||||||||||
self.dataframe = self.dataframe.groupby('Timestamp')[columns_to_sum].sum().reset_index(drop=False) | ||||||||||
|
||||||||||
for index, value in enumerate(df_names): | ||||||||||
self.dataframe.insert(index, columns_to_drop[index], value) | ||||||||||
|
||||||||||
def _set_x_ticks_interval(self, ax): | ||||||||||
"""Set the number of labels that will appear in the X axis and their format. | ||||||||||
|
||||||||||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Solved in 4f12863