Skip to content

Conversation

@jarroyomorales
Copy link

Migration to 12.0 of nsca_client.

@etobella

Copy link
Member

@etobella etobella left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
Could you split the readme?

@jarroyomorales jarroyomorales force-pushed the 12.0-mig-nsca_client branch from 88f3a72 to cecd55f Compare July 2, 2019 11:23
@jarroyomorales
Copy link
Author

@etobella Done!

Copy link
Member

@etobella etobella left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jarroyomorales jarroyomorales force-pushed the 12.0-mig-nsca_client branch 2 times, most recently from b2b14d4 to 2fd7c35 Compare July 2, 2019 14:10
@jarroyomorales
Copy link
Author

ping @aheficent

@jarroyomorales jarroyomorales force-pushed the 12.0-mig-nsca_client branch 2 times, most recently from 329fb42 to cb8c85f Compare March 10, 2020 15:54
@etobella etobella force-pushed the 12.0-mig-nsca_client branch from cb8c85f to 1fd0688 Compare March 11, 2020 14:22
@etobella etobella force-pushed the 12.0-mig-nsca_client branch from 1fd0688 to 6213525 Compare January 21, 2021 14:43
@github-actions
Copy link

github-actions bot commented Feb 4, 2024

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days.
If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

@github-actions github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Feb 4, 2024
@thomaspaulb
Copy link

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@thomaspaulb The rebase process failed, because command git rebase origin/12.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: [ADD] Module 'nsca_client' - Send passive alerts to a NSCA daemon
Applying: [IMP] Module 'nsca_client' - Review + Default NSCA server added + Configuration file path added on the NSCA server (each server can require a different password)
Applying: [IMP] Module 'nsca_client' - External dependency on '/usr/sbin/nsca_send' removed, replaced by a check at the runtime
Applying: [IMP] Module 'nsca_client' - Translations updated
Applying: [IMP] nsca_client - Configure the node hostname at the NSCA server level
Applying: [IMP] nsca_client - A check method could not return, and as such no message will be sent to the NSCA server instead of a CRITICAL one
Applying: [IMP] nsca_client - Auto-create the configuration file used by the 'send_nsca' binary, password and encryption method are set in 'nsca.server' records
Applying: [IMP] nsca_client - Translations updated
Applying: [IMP] nsca_client - README and screenshots updated
Applying: [FIX] nsca_client - Fix XML data
Applying: [FIX] nsca_client - Add the database as a subfolder for the configuration file path in order to be compatible with a multi-databases instance
Applying: [MIG] nsca_client
Applying: [IMP] nsca_client: Pass nsca code to server, in order to allow other integrations, not only checks
Applying: [UPD] Update nsca_client.pot
Applying: Update translation files
Applying: [12.0][MIG] nsca_client
.git/rebase-apply/patch:49: trailing whitespace.
|badge1| |badge2| |badge3| |badge4| |badge5| 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	.travis.yml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): .travis.yml deleted in HEAD and modified in [12.0][MIG] nsca_client. Version [12.0][MIG] nsca_client of .travis.yml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0016 [12.0][MIG] nsca_client
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

@thomaspaulb
Copy link

@jarroyomorales Recently CI was migrated from Travis to Github, could you modify the PR

etobella and others added 3 commits February 16, 2024 23:40
Updated by Update PO files to match POT (msgmerge) hook in Weblate.
@etobella etobella force-pushed the 12.0-mig-nsca_client branch 2 times, most recently from 0c5fc77 to a9172f6 Compare February 16, 2024 22:46
@etobella etobella force-pushed the 12.0-mig-nsca_client branch from a9172f6 to edf30a8 Compare February 16, 2024 22:48
@thomaspaulb
Copy link

@etobella Tests failing because of #2850, maybe a review

@etobella
Copy link
Member

Well, I just rebased the module because you asked. but we are no longer maintaining this version. Also, the error seems unrelated 🤔

image

@github-actions github-actions bot removed the stale PR/Issue without recent activity, it'll be soon closed automatically. label Feb 18, 2024
@thomaspaulb
Copy link

@etobella That's why I added a link to the PR that fixes that test, and asked you to review ;-)

@thomaspaulb
Copy link

/ocabot merge nobump

/ocabot migration nsca_client

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 12.0-ocabot-merge-pr-1616-by-thomaspaulb-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot added this to the 12.0 milestone Feb 21, 2024
@OCA-git-bot OCA-git-bot mentioned this pull request Feb 21, 2024
32 tasks
@OCA-git-bot OCA-git-bot merged commit 3bd4167 into OCA:12.0 Feb 21, 2024
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at efc0abd. Thanks a lot for contributing to OCA. ❤️

SiesslPhillip pushed a commit to grueneerde/OCA-server-tools that referenced this pull request Nov 20, 2024
Syncing from upstream OCA/server-tools (16.0)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants